diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-04-16 03:50:31 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-04-16 03:50:31 (GMT) |
| commit | ac0fc4e9b0ed314e7d49e8dc0e9ded0922aab8e9 (patch) | |
| tree | 58eb9feaa85fb02c3c15980f58964b112ca9d02d /src/plugins/bearer/generic | |
| parent | 140a96d0b860b045c18d53c1ac96e77b3893d31c (diff) | |
| parent | 551d704cdafae46cdccc6217bb7f36da7e84be2d (diff) | |
| download | Qt-ac0fc4e9b0ed314e7d49e8dc0e9ded0922aab8e9.zip Qt-ac0fc4e9b0ed314e7d49e8dc0e9ded0922aab8e9.tar.gz Qt-ac0fc4e9b0ed314e7d49e8dc0e9ded0922aab8e9.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (34 commits)
Fix duplicate project entry in visual studio solution file.
Doc
qdoc: Added the index and fixed images in the extra files list.
Speed up qsTr() by caching the translation context
Crash while printing from the portedcanvas example on Mac Cocoa.
qdoc: Fixed .qdocconf files for assistant.
Disable debug-only framework builds on Mac.
Compile (with -no-pch)
Add missing QT_NO_BEARERMANAGEMENT ifdefs.
Introduce a qconfig feature for Bearer Management
Fix MOBILITY-404
Remove holes in bearer management data structures.
Don't link bearer plugins against QtGui unnecessarily.
Added missing newline after warning message when using -L with qml
Doc: updating scripts
Fixed a crash on embedded due to uninitialized pointer.
Fix a race where QThread::exit() is "lost" when called after start()
qdoc: Removed all <table> attributes in favor of using css.
Autotest failure: dialogModality test fails on cocoa (macgui)
Force the bic test to compile in 32-bit mode on Mac
...
Diffstat (limited to 'src/plugins/bearer/generic')
| -rw-r--r-- | src/plugins/bearer/generic/generic.pro | 2 | ||||
| -rw-r--r-- | src/plugins/bearer/generic/main.cpp | 4 | ||||
| -rw-r--r-- | src/plugins/bearer/generic/qgenericengine.cpp | 3 | ||||
| -rw-r--r-- | src/plugins/bearer/generic/qgenericengine.h | 4 |
4 files changed, 12 insertions, 1 deletions
diff --git a/src/plugins/bearer/generic/generic.pro b/src/plugins/bearer/generic/generic.pro index 1d141fd..c967f8c 100644 --- a/src/plugins/bearer/generic/generic.pro +++ b/src/plugins/bearer/generic/generic.pro @@ -1,7 +1,7 @@ TARGET = qgenericbearer include(../../qpluginbase.pri) -QT += network +QT = core network HEADERS += qgenericengine.h \ ../qnetworksession_impl.h \ diff --git a/src/plugins/bearer/generic/main.cpp b/src/plugins/bearer/generic/main.cpp index ba85d93..ec1b689 100644 --- a/src/plugins/bearer/generic/main.cpp +++ b/src/plugins/bearer/generic/main.cpp @@ -45,6 +45,8 @@ #include <QtCore/qdebug.h> +#ifndef QT_NO_BEARERMANAGEMENT + QT_BEGIN_NAMESPACE class QGenericEnginePlugin : public QBearerEnginePlugin @@ -82,3 +84,5 @@ Q_EXPORT_STATIC_PLUGIN(QGenericEnginePlugin) Q_EXPORT_PLUGIN2(qgenericbearer, QGenericEnginePlugin) QT_END_NAMESPACE + +#endif // QT_NO_BEARERMANAGEMENT diff --git a/src/plugins/bearer/generic/qgenericengine.cpp b/src/plugins/bearer/generic/qgenericengine.cpp index d65025b..41ff3e0 100644 --- a/src/plugins/bearer/generic/qgenericengine.cpp +++ b/src/plugins/bearer/generic/qgenericengine.cpp @@ -64,6 +64,8 @@ #include <unistd.h> #endif +#ifndef QT_NO_BEARERMANAGEMENT + QT_BEGIN_NAMESPACE #ifndef QT_NO_NETWORKINTERFACE @@ -349,3 +351,4 @@ bool QGenericEngine::requiresPolling() const QT_END_NAMESPACE +#endif // QT_NO_BEARERMANAGEMENT diff --git a/src/plugins/bearer/generic/qgenericengine.h b/src/plugins/bearer/generic/qgenericengine.h index 616a3fd..82d22af 100644 --- a/src/plugins/bearer/generic/qgenericengine.h +++ b/src/plugins/bearer/generic/qgenericengine.h @@ -47,6 +47,8 @@ #include <QMap> #include <QTimer> +#ifndef QT_NO_BEARERMANAGEMENT + QT_BEGIN_NAMESPACE class QNetworkConfigurationPrivate; @@ -89,5 +91,7 @@ private: QT_END_NAMESPACE +#endif // QT_NO_BEARERMANAGEMENT + #endif |