mirror of
https://invent.kde.org/system/dolphin
synced 2024-09-20 08:51:24 +00:00
Allow konq to build with Qt > beta5
svn path=/trunk/kdebase/konqueror/; revision=115255
This commit is contained in:
parent
99f6730814
commit
d3aeb5ee5c
|
@ -42,9 +42,14 @@
|
|||
#include <qapplication.h>
|
||||
#include <qmetaobject.h>
|
||||
#include <qobjectlist.h>
|
||||
#include <config.h>
|
||||
#if QT_VERSION >= 300
|
||||
#ifdef HAVE_PRIVATE_QUCOMEXTRA_P_H
|
||||
#include <private/qucomextra_p.h>
|
||||
#else
|
||||
#include <qucom.h>
|
||||
#endif
|
||||
#endif
|
||||
|
||||
#include <kparts/factory.h>
|
||||
|
||||
|
@ -783,7 +788,11 @@ bool KonqView::callExtensionBoolMethod( const char *methodName, bool value )
|
|||
return false;
|
||||
QUObject o[ 2 ];
|
||||
|
||||
#ifdef HAVE_PRIVATE_QUCOMEXTRA_P_H
|
||||
static_QUType_bool.set( o + 1, value );
|
||||
#else
|
||||
pQUType_bool->set( o + 1, value );
|
||||
#endif
|
||||
|
||||
obj->qt_invoke( id, o );
|
||||
return true;
|
||||
|
@ -814,7 +823,11 @@ bool KonqView::callExtensionStringMethod( const char *methodName, QString value
|
|||
return false;
|
||||
QUObject o[ 2 ];
|
||||
|
||||
#ifdef HAVE_PRIVATE_QUCOMEXTRA_P_H
|
||||
static_QUType_QString.set( o + 1, value );
|
||||
#else
|
||||
pQUType_QString->set( o + 1, value );
|
||||
#endif
|
||||
|
||||
obj->qt_invoke( id, o );
|
||||
return true;
|
||||
|
|
Loading…
Reference in a new issue