diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-04-06 01:09:18 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-04-06 01:09:18 (GMT) |
| commit | af60a29d79bca27dde9441b6b8fc0eae185f08d5 (patch) | |
| tree | 880665c4b49db6d6c3ba66670825962d69382e39 /src | |
| parent | db9bfd3653de23693db67ec5a0534e4d4ac97f7d (diff) | |
| parent | 3155d38a5fa83301d08a777c254c1afbbe4bcc22 (diff) | |
| download | Qt-af60a29d79bca27dde9441b6b8fc0eae185f08d5.zip Qt-af60a29d79bca27dde9441b6b8fc0eae185f08d5.tar.gz Qt-af60a29d79bca27dde9441b6b8fc0eae185f08d5.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Empty commit to trigger rebuilding in the CI system.
Make it possible to build QtDBus and its tools on Windows CE.
Reapply 69e873e2bfae3fc028c21d93112a75008c3bb58b now that QLibrary is fixed
Diffstat (limited to 'src')
| -rw-r--r-- | src/corelib/plugin/qplugin.h | 2 | ||||
| -rw-r--r-- | src/dbus/dbus.pro | 3 | ||||
| -rw-r--r-- | src/src.pro | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/src/corelib/plugin/qplugin.h b/src/corelib/plugin/qplugin.h index b798437..7f541f1 100644 --- a/src/corelib/plugin/qplugin.h +++ b/src/corelib/plugin/qplugin.h @@ -110,7 +110,7 @@ void Q_CORE_EXPORT qRegisterStaticPluginInstanceFunction(QtPluginInstanceFunctio # define QPLUGIN_DEBUG_STR "true" # endif # define Q_PLUGIN_VERIFICATION_DATA \ - static const char *qt_plugin_verification_data = \ + static const char qt_plugin_verification_data[] = \ "pattern=""QT_PLUGIN_VERIFICATION_DATA""\n" \ "version="QT_VERSION_STR"\n" \ "debug="QPLUGIN_DEBUG_STR"\n" \ diff --git a/src/dbus/dbus.pro b/src/dbus/dbus.pro index 9ab3920..7c59808 100644 --- a/src/dbus/dbus.pro +++ b/src/dbus/dbus.pro @@ -20,7 +20,8 @@ unix { QtXml } win32 { - LIBS_PRIVATE += -lws2_32 \ + wince*:LIBS_PRIVATE += -lws2 + else:LIBS_PRIVATE += -lws2_32 \ -ladvapi32 \ -lnetapi32 \ -luser32 diff --git a/src/src.pro b/src/src.pro index c2ed59d..6ccd955 100644 --- a/src/src.pro +++ b/src/src.pro @@ -14,10 +14,10 @@ wince*:{ SRC_SUBDIRS += src_corelib src_xml src_network src_gui src_sql src_testlib !vxworks:contains(QT_CONFIG, qt3support): SRC_SUBDIRS += src_qt3support include(tools/tools.pro) - contains(QT_CONFIG, dbus):SRC_SUBDIRS += src_dbus } win32:SRC_SUBDIRS += src_activeqt +!symbian:contains(QT_CONFIG, dbus):SRC_SUBDIRS += src_dbus contains(QT_CONFIG, opengl)|contains(QT_CONFIG, opengles1)|contains(QT_CONFIG, opengles2): SRC_SUBDIRS += src_opengl contains(QT_CONFIG, openvg): SRC_SUBDIRS += src_openvg contains(QT_CONFIG, xmlpatterns): SRC_SUBDIRS += src_xmlpatterns |