summaryrefslogtreecommitdiffstats
path: root/examples
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 /examples
parent0f31f63e11d4fcb2b399979de28368a89275b911 (diff)
downloadQt-aedf9f81641ba4a85b15e35e6ac8ff457265133a.zip
Qt-aedf9f81641ba4a85b15e35e6ac8ff457265133a.tar.gz
Qt-aedf9f81641ba4a85b15e35e6ac8ff457265133a.tar.bz2
Make compile.
Diffstat (limited to 'examples')
-rw-r--r--examples/network/bearercloud/bearercloud.h2
-rw-r--r--examples/network/bearercloud/bearercloud.pro18
-rw-r--r--examples/network/bearercloud/cloud.h2
-rw-r--r--examples/network/bearermonitor/bearermonitor.h2
-rw-r--r--examples/network/bearermonitor/bearermonitor.pro24
-rw-r--r--examples/network/bearermonitor/sessionwidget.h2
-rw-r--r--examples/network/network.pro4
7 files changed, 14 insertions, 40 deletions
diff --git a/examples/network/bearercloud/bearercloud.h b/examples/network/bearercloud/bearercloud.h
index c18ffd3..79b441f 100644
--- a/examples/network/bearercloud/bearercloud.h
+++ b/examples/network/bearercloud/bearercloud.h
@@ -45,7 +45,7 @@
#include <QMap>
#include <QHash>
-QTM_USE_NAMESPACE
+QT_USE_NAMESPACE
class Cloud;
diff --git a/examples/network/bearercloud/bearercloud.pro b/examples/network/bearercloud/bearercloud.pro
index 308ddda..c45d62a 100644
--- a/examples/network/bearercloud/bearercloud.pro
+++ b/examples/network/bearercloud/bearercloud.pro
@@ -10,21 +10,3 @@ RESOURCES = icons.qrc
TARGET = bearercloud
QT = core gui network svg
-
-INCLUDEPATH += ../../src/bearer
-
-include(../examples.pri)
-
-qtAddLibrary(QtBearer)
-
-CONFIG += console
-
-include(../examples.pri)
-
-
-macx: {
- contains(QT_CONFIG,qt_framework):LIBS += -framework QtBearer
- INCLUDEPATH += ../../
- contains(CONFIG, debug) {
- }
-}
diff --git a/examples/network/bearercloud/cloud.h b/examples/network/bearercloud/cloud.h
index 4ce43df..f844725 100644
--- a/examples/network/bearercloud/cloud.h
+++ b/examples/network/bearercloud/cloud.h
@@ -43,7 +43,7 @@
#include <qnetworksession.h>
#include <QGraphicsItem>
-QTM_USE_NAMESPACE
+QT_USE_NAMESPACE
class QGraphicsTextItem;
class QGraphicsSvgItem;
diff --git a/examples/network/bearermonitor/bearermonitor.h b/examples/network/bearermonitor/bearermonitor.h
index d1f4601..9306d90 100644
--- a/examples/network/bearermonitor/bearermonitor.h
+++ b/examples/network/bearermonitor/bearermonitor.h
@@ -50,7 +50,7 @@
#include "ui_bearermonitor_640_480.h"
#endif
-QTM_USE_NAMESPACE
+QT_USE_NAMESPACE
class SessionWidget;
diff --git a/examples/network/bearermonitor/bearermonitor.pro b/examples/network/bearermonitor/bearermonitor.pro
index c8fb3c2..a854b55 100644
--- a/examples/network/bearermonitor/bearermonitor.pro
+++ b/examples/network/bearermonitor/bearermonitor.pro
@@ -4,7 +4,7 @@ HEADERS = sessionwidget.h \
SOURCES = main.cpp \
bearermonitor.cpp \
sessionwidget.cpp
-
+
FORMS = bearermonitor_240_320.ui \
bearermonitor_640_480.ui \
sessionwidget.ui
@@ -13,20 +13,10 @@ TARGET = bearermonitor
QT = core gui network
-INCLUDEPATH += ../../src/bearer
-
-include(../examples.pri)
-
-qtAddLibrary(QtBearer)
-win32:!wince*:LIBS += -lWs2_32
-wince*:LIBS += -lWs2
-
-CONFIG += console
-
-include(../examples.pri)
-
-macx: {
- contains(QT_CONFIG,qt_framework):LIBS += -framework QtBearer
- contains(CONFIG, debug) {
- }
+win32 {
+ !wince* {
+ LIBS += -lWs2_32
+ } else {
+ LIBS += -lWs2
+ }
}
diff --git a/examples/network/bearermonitor/sessionwidget.h b/examples/network/bearermonitor/sessionwidget.h
index cb6591e..8bc60e4 100644
--- a/examples/network/bearermonitor/sessionwidget.h
+++ b/examples/network/bearermonitor/sessionwidget.h
@@ -46,7 +46,7 @@
#include <qnetworksession.h>
-QTM_USE_NAMESPACE
+QT_USE_NAMESPACE
class SessionWidget : public QWidget, public Ui_SessionWidget
{
diff --git a/examples/network/network.pro b/examples/network/network.pro
index c5a97fb..bd632b8 100644
--- a/examples/network/network.pro
+++ b/examples/network/network.pro
@@ -11,7 +11,9 @@ SUBDIRS = blockingfortuneclient \
loopback \
threadedfortuneserver \
googlesuggest \
- torrent
+ torrent \
+ bearercloud \
+ bearermonitor
# no QProcess
!vxworks:!qnx:SUBDIRS += network-chat