Changeset 846 for trunk/src/plugins/script

Timestamp:

May 5, 2011, 5:36:53 AM (14 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.7.2 sources from branches/vendor/nokia/qt.

Location:

trunk

Files:

• . (modified) (1 prop)
• src/plugins/script/qtdbus/main.cpp (modified) (3 diffs)
• src/plugins/script/qtdbus/main.h (modified) (3 diffs)

trunk/src/plugins/script/qtdbus/main.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
@@ -44 +44 @@
 #include <QMetaMethod>
 #include <QScriptExtensionPlugin>
+
+#ifndef QT_NO_DBUS
 
 QT_USE_NAMESPACE
@@ -395 +397 @@
 Q_EXPORT_STATIC_PLUGIN(QtDBusScriptPlugin)
 Q_EXPORT_PLUGIN2(qtscriptdbus, QtDBusScriptPlugin)
+
+#endif // QT_NO_DBUS

trunk/src/plugins/script/qtdbus/main.h

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
@@ -46 +46 @@
 #include <QtScript/qscriptable.h>
 #include <QtScript/qscriptengine.h>
+
+#ifndef QT_NO_DBUS
 
 class QDBusConnectionConstructor : public QObject,
@@ -174 +176 @@
 };
 
+#endif // QT_NO_DBUS
 #endif // QDBUSBINDING_H