diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-04-15 15:50:15 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-04-15 15:50:15 (GMT) |
| commit | d03c27040c08827eddbb086f70a50f8b908f97cc (patch) | |
| tree | b95e1f0da0af171ebc0ace99919a9a3251738a4c /src/plugins/bearer/icd/main.cpp | |
| parent | 07f724cd5abd0548fb32ed3469bde113daf028c4 (diff) | |
| parent | afb54fe253ded94152575b23539552aa8f4ad384 (diff) | |
| download | Qt-d03c27040c08827eddbb086f70a50f8b908f97cc.zip Qt-d03c27040c08827eddbb086f70a50f8b908f97cc.tar.gz Qt-d03c27040c08827eddbb086f70a50f8b908f97cc.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: (31 commits)
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
Revert "Doc: Updating design files."
Remove statically allocated pixmaps through the post routine
qdoc: Checked for empty title.
...
Diffstat (limited to 'src/plugins/bearer/icd/main.cpp')
| -rw-r--r-- | src/plugins/bearer/icd/main.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/plugins/bearer/icd/main.cpp b/src/plugins/bearer/icd/main.cpp index ad1a918..491112b 100644 --- a/src/plugins/bearer/icd/main.cpp +++ b/src/plugins/bearer/icd/main.cpp @@ -45,6 +45,8 @@ #include <QtCore/qdebug.h> +#ifndef QT_NO_BEARERMANAGEMENT + QT_BEGIN_NAMESPACE class QIcdEnginePlugin : public QBearerEnginePlugin @@ -82,3 +84,5 @@ Q_EXPORT_STATIC_PLUGIN(QIcdEnginePlugin) Q_EXPORT_PLUGIN2(qicdbearer, QIcdEnginePlugin) QT_END_NAMESPACE + +#endif |