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)
  Fix compilation with Sun CC: no semi-colon after Q_ENUM.
  Remove the "Insert unicode control character" menu entry on X11.
  adds a timeout option to QThreadPool::waitForDone();
  Remove leading whitespace from Qt header macros.
  Rename the xxxMsecsSinceEpoch functions to xxxMSecsSinceEpoch.
  Add QDateTime members that operate on 64-bit milliseconds.
  Fix compilation on WinCE and MinGW by memsetting the OVERLAPPED struct.
  qdoc: Added <div> elements to some html output for class references.
  Fix compile error on mingw.
  MONILITY-645
  Do not override alternate background color in Plastique
  Fix QComboBox ignoring foreground role in some styles
  Fix compilation on HP-UXi: _SC_MONOTONIC_CLOCK isn't defined
  Fix compilation with Sun CC:
  Ensure that we return QPair<long,long> in all cases.
  Update PLATFORM(SPARC64) to CPU(SPARC64)
  jui files are no c++ ...
  scan some more file types by default
  Support EtchDisabledText with spin box on Windows style
  QNAM HTTP: Fix invoking a method when being destructed right now
  ...

1 files changed, 21 insertions, 3 deletions

diff --git a/src/network/bearer/qnetworkconfiguration.h b/src/network/bearer/qnetworkconfiguration.h
index dad6198..dce39eb 100644
--- a/src/network/bearer/qnetworkconfiguration.h
+++ b/src/network/bearer/qnetworkconfiguration.h
@@ -42,19 +42,33 @@
 #ifndef QNETWORKCONFIGURATION_H
 #define QNETWORKCONFIGURATION_H
 
-#include <QtCore/qglobal.h>
+#ifndef QT_MOBILITY_BEARER
+# include <QtCore/qglobal.h>
+#else
+# include "qmobilityglobal.h"
+#endif
+
 #include <QtCore/qshareddata.h>
 #include <QtCore/qstring.h>
 #include <QtCore/qlist.h>
 
+#if defined(Q_OS_WIN) && defined(interface)
+#undef interface
+#endif
+
 QT_BEGIN_HEADER
 
+#ifndef QT_MOBILITY_BEARER
 QT_BEGIN_NAMESPACE
-
 QT_MODULE(Network)
+#define QNetworkConfigurationExport Q_NETWORK_EXPORT
+#else
+QTM_BEGIN_NAMESPACE
+#define QNetworkConfigurationExport Q_BEARER_EXPORT
+#endif
 
 class QNetworkConfigurationPrivate;
-class Q_NETWORK_EXPORT QNetworkConfiguration
+class QNetworkConfigurationExport QNetworkConfiguration
 {
 public:
     QNetworkConfiguration();
@@ -108,7 +122,11 @@ private:
     QExplicitlySharedDataPointer<QNetworkConfigurationPrivate> d;
 };
 
+#ifndef QT_MOBILITY_BEARER
 QT_END_NAMESPACE
+#else
+QTM_END_NAMESPACE
+#endif
 
 QT_END_HEADER