diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2017-12-13 10:07:52 +0100 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2017-12-14 07:21:41 +0000 |
| commit | f8b5a1f4b9da32a8599d1f4e545ae32476de9b78 (patch) | |
| tree | dd31e9e9e8e65864721dc2e831fb3e559e6e6346 | |
| parent | b63be08367fb7fbd1eb7b48d0ab3d584ff1bcea1 (diff) | |
Qt D-Bus: Fix compilation on Windows Embedded 2013
Exclude the code introduced by fecaa6aae83a3ffa8f1fd41c5aa8275a1bfa7c9b
for Windows Embedded 2013.
Task-number: QTBUG-54726
Change-Id: Iff9d174f798110d2aa28761da7e364ed7bb245f1
Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
| -rw-r--r-- | src/dbus/qdbusconnection.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/dbus/qdbusconnection.cpp b/src/dbus/qdbusconnection.cpp index c88cf89897..8e5e47b813 100644 --- a/src/dbus/qdbusconnection.cpp +++ b/src/dbus/qdbusconnection.cpp @@ -62,7 +62,7 @@ QT_BEGIN_NAMESPACE -#ifdef Q_OS_WIN +#if defined(Q_OS_WIN) && !defined(Q_OS_WINCE) static void preventDllUnload(); #endif @@ -136,7 +136,7 @@ QDBusConnectionManager::QDBusConnectionManager() this, &QDBusConnectionManager::createServer, Qt::BlockingQueuedConnection); moveToThread(this); // ugly, don't do this in other projects -#ifdef Q_OS_WIN +#if defined(Q_OS_WIN) && !defined(Q_OS_WINCE) // prevent the library from being unloaded on Windows. See comments in the function. preventDllUnload(); #endif @@ -1263,7 +1263,7 @@ QByteArray QDBusConnection::localMachineId() QT_END_NAMESPACE -#ifdef Q_OS_WIN +#if defined(Q_OS_WIN) && !defined(Q_OS_WINCE) # include <qt_windows.h> QT_BEGIN_NAMESPACE |