summaryrefslogtreecommitdiffstats
path: root/tests/manual
diff options
context:
space:
mode:
authorAaron McCarthy <aaron.mccarthy@nokia.com>2009-12-22 03:54:49 (GMT)
committerAaron McCarthy <aaron.mccarthy@nokia.com>2009-12-22 03:54:49 (GMT)
commitaedf9f81641ba4a85b15e35e6ac8ff457265133a (patch)
tree1556ecc30ff39e84d46ef69131342abe8eb7967a /tests/manual
parent0f31f63e11d4fcb2b399979de28368a89275b911 (diff)
downloadQt-aedf9f81641ba4a85b15e35e6ac8ff457265133a.zip
Qt-aedf9f81641ba4a85b15e35e6ac8ff457265133a.tar.gz
Qt-aedf9f81641ba4a85b15e35e6ac8ff457265133a.tar.bz2
Make compile.
Diffstat (limited to 'tests/manual')
-rw-r--r--tests/manual/bearerex/bearerex.h2
-rw-r--r--tests/manual/bearerex/bearerex.pro16
-rw-r--r--tests/manual/networkmanager/networkmanager.pro10
-rw-r--r--tests/manual/networkmanager/nmview.cpp2
-rw-r--r--tests/manual/networkmanager/nmview.h2
5 files changed, 3 insertions, 29 deletions
diff --git a/tests/manual/bearerex/bearerex.h b/tests/manual/bearerex/bearerex.h
index f18180e..04da6ca 100644
--- a/tests/manual/bearerex/bearerex.h
+++ b/tests/manual/bearerex/bearerex.h
@@ -54,7 +54,7 @@
class QHttp;
class SessionTab;
-QTM_USE_NAMESPACE
+QT_USE_NAMESPACE
class BearerEx : public QMainWindow, public Ui::BearerExMainWindow
{
diff --git a/tests/manual/bearerex/bearerex.pro b/tests/manual/bearerex/bearerex.pro
index a870eb1..476e87c 100644
--- a/tests/manual/bearerex/bearerex.pro
+++ b/tests/manual/bearerex/bearerex.pro
@@ -8,13 +8,6 @@ QT += core \
FORMS += sessiondialog.ui \
bearerex.ui \
detailedinfodialog.ui
-include(../../common.pri)
-#not really a test case but deployment happens same way
-CONFIG += testcase
-
-DEPENDPATH += .
-INCLUDEPATH += . \
- ../../src/bearer
# Example headers and sources
HEADERS += bearerex.h \
@@ -23,12 +16,3 @@ HEADERS += bearerex.h \
SOURCES += bearerex.cpp \
main.cpp \
xqlistwidget.cpp
-
-symbian: {
- bearerex.sources = Qtbearer.dll
- bearerex.path = /sys/bin
- DEPLOYMENT += bearerex
-
- TARGET.CAPABILITY = NetworkServices NetworkControl ReadUserData
-}
-qtAddLibrary(QtBearer)
diff --git a/tests/manual/networkmanager/networkmanager.pro b/tests/manual/networkmanager/networkmanager.pro
index 31b2af1..84289d3 100644
--- a/tests/manual/networkmanager/networkmanager.pro
+++ b/tests/manual/networkmanager/networkmanager.pro
@@ -4,16 +4,6 @@ TARGET = tst_networkmanagertest
QT = core network dbus gui
-#not really a test case but deployment happens same way
-CONFIG += testcase
-
requires(contains(QT_CONFIG,dbus))
-INCLUDEPATH += ../../src/bearer
-include(../../common.pri)
-
-qtAddLibrary(QtBearer)
-
-#MOC_DIR = .moc
-#OBJECTS_DIR = .obj
FORMS += dialog.ui
diff --git a/tests/manual/networkmanager/nmview.cpp b/tests/manual/networkmanager/nmview.cpp
index ca9d907..35a0204 100644
--- a/tests/manual/networkmanager/nmview.cpp
+++ b/tests/manual/networkmanager/nmview.cpp
@@ -68,7 +68,7 @@
#include <qnetworkconfiguration.h>
#include <qnetworkconfigmanager.h>
#include <qnetworksession.h>
-#include <qnetworkmanagerservice_p.h>
+#include <QtNetwork/private/qnetworkmanagerservice_p.h>
//static QDBusConnection dbc = QDBusConnection::systemBus();
//typedef QMap< QString, QMap<QString,QVariant> > SettingsMap;
diff --git a/tests/manual/networkmanager/nmview.h b/tests/manual/networkmanager/nmview.h
index 641385e..7db56d4 100644
--- a/tests/manual/networkmanager/nmview.h
+++ b/tests/manual/networkmanager/nmview.h
@@ -47,7 +47,7 @@
#include "ui_dialog.h"
-QTM_USE_NAMESPACE
+QT_USE_NAMESPACE
class QListWidget;
class QTreeWidget;