summaryrefslogtreecommitdiffstats
path: root/config.tests/unix
diff options
context:
space:
mode:
authorAaron McCarthy <aaron.mccarthy@nokia.com>2010-02-05 03:59:49 (GMT)
committerAaron McCarthy <aaron.mccarthy@nokia.com>2010-02-08 07:48:46 (GMT)
commitc470f8d1523ec974a7f0e1cb61ef13f0e953c500 (patch)
tree111474f95460134cbb1858e692e6a73b316dfc3b /config.tests/unix
parentb1029a6bd7131d540f76ead8783ed0978f7163aa (diff)
downloadQt-c470f8d1523ec974a7f0e1cb61ef13f0e953c500.zip
Qt-c470f8d1523ec974a7f0e1cb61ef13f0e953c500.tar.gz
Qt-c470f8d1523ec974a7f0e1cb61ef13f0e953c500.tar.bz2
Fix Network Manager and CoreWlan config tests.
Diffstat (limited to 'config.tests/unix')
-rw-r--r--config.tests/unix/networkmanager/main.cpp5
-rw-r--r--config.tests/unix/networkmanager/networkmanager.pro4
2 files changed, 3 insertions, 6 deletions
diff --git a/config.tests/unix/networkmanager/main.cpp b/config.tests/unix/networkmanager/main.cpp
index f8b3d3c..7b91ae0 100644
--- a/config.tests/unix/networkmanager/main.cpp
+++ b/config.tests/unix/networkmanager/main.cpp
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
** All rights reserved.
** Contact: Nokia Corporation (qt-info@nokia.com)
**
@@ -40,8 +40,9 @@
****************************************************************************/
#if defined(QT_NO_DBUS)
-sjkp //error is no QtDBus
+#error Qt is not configured with DBus support.
#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 686286d..c41204f 100644
--- a/config.tests/unix/networkmanager/networkmanager.pro
+++ b/config.tests/unix/networkmanager/networkmanager.pro
@@ -1,7 +1,3 @@
SOURCES = main.cpp
CONFIG -= qt dylib
mac:CONFIG -= app_bundle
-
-!contains(QT_CONFIG,dbus): {
- DEFINES += QT_NO_DBUS
-} \ No newline at end of file