diff options
| author | Aaron McCarthy <aaron.mccarthy@nokia.com> | 2010-01-29 00:43:36 (GMT) |
|---|---|---|
| committer | Aaron McCarthy <aaron.mccarthy@nokia.com> | 2010-01-29 00:43:36 (GMT) |
| commit | e4625e53aa893f7c59407913e743951294c7dafe (patch) | |
| tree | ed6fd93a3610a0d8e7bd9074fcd0796d1a3bc6f0 /config.tests/unix | |
| parent | d3b580fe8b2b0c185f0eadbf794156058496eff3 (diff) | |
| parent | 1e06b5e995c6df715da8db53c8375d458277144d (diff) | |
| download | Qt-e4625e53aa893f7c59407913e743951294c7dafe.zip Qt-e4625e53aa893f7c59407913e743951294c7dafe.tar.gz Qt-e4625e53aa893f7c59407913e743951294c7dafe.tar.bz2 | |
Merge commit 'BearerIntegration-4' into bearermanagement/integration-4
Conflicts:
config.tests/unix/networkmanager/networkmanager.pro
src/network/bearer/bearer.pro
src/network/bearer/qnetworkconfiguration_s60_p.cpp
tests/auto/qnetworksession/tst_qnetworksession/tst_qnetworksession.pro
Diffstat (limited to 'config.tests/unix')
| -rw-r--r-- | config.tests/unix/networkmanager/main.cpp | 3 | ||||
| -rw-r--r-- | config.tests/unix/networkmanager/networkmanager.pro | 4 |
2 files changed, 7 insertions, 0 deletions
diff --git a/config.tests/unix/networkmanager/main.cpp b/config.tests/unix/networkmanager/main.cpp index 27e6bd1..f8b3d3c 100644 --- a/config.tests/unix/networkmanager/main.cpp +++ b/config.tests/unix/networkmanager/main.cpp @@ -39,6 +39,9 @@ ** ****************************************************************************/ +#if defined(QT_NO_DBUS) +sjkp //error is no QtDBus +#endif #include <NetworkManager/NetworkManager.h> int main(int argc, char** argv) diff --git a/config.tests/unix/networkmanager/networkmanager.pro b/config.tests/unix/networkmanager/networkmanager.pro index c41204f..686286d 100644 --- a/config.tests/unix/networkmanager/networkmanager.pro +++ b/config.tests/unix/networkmanager/networkmanager.pro @@ -1,3 +1,7 @@ SOURCES = main.cpp CONFIG -= qt dylib mac:CONFIG -= app_bundle + +!contains(QT_CONFIG,dbus): { + DEFINES += QT_NO_DBUS +}
\ No newline at end of file |