Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration

* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (48 commits)
  Remove the use of the QtTest baseline feature I reverted
  Revert "Add a feature to QTestLib to correct benchmark results."
  Use the ARM version of UTF-8 detection in the Neon code
  Update the data files for the QString benchmark test
  Fix a bug in the SSE2 UTF-8 decoder.
  Add ARM Neon versions of fromLatin1 and fromUtf8
  Make this compile on Atom/Core2 (no SSE4) and on ARM (no SSE)
  Add baselines and zeros to the benchmarks.
  Add an UTF-8 conversion on trusted data and no BOM.
  Make it easier to write a UTF-8 conversion on trusted data
  Add the missing tests and 4-byte UTF-8 sequences
  Improve the code and avoid unnecessary stores
  Add an UTF-8 conversion optimised for ASCII using SSE2
  Add an UTF-8 conversion code that is optimised for ASCII
  Add a stateless copy of the Qt 4.7 UTF-8 codec.
  Add UTF-8 code benchmarks
  Improve a little more the core loop and propagate to the other code
  Reduce the number of operations in the main loop
  Add an SSE4 version using PMOVZXBW and PSRLDQ
  Attempt to improve the epilog code
  ...

2 files changed, 11 insertions, 0 deletions

diff --git a/src/plugins/bearer/connman/qofonoservice_linux.cpp b/src/plugins/bearer/connman/qofonoservice_linux.cpp
index 2a22280..e3fb2c6 100644
--- a/src/plugins/bearer/connman/qofonoservice_linux.cpp
+++ b/src/plugins/bearer/connman/qofonoservice_linux.cpp
@@ -53,6 +53,8 @@
 
 #include "qofonoservice_linux_p.h"
 
+#ifndef QT_NO_BEARERMANAGEMENT
+#ifndef QT_NO_DBUS
 
 QT_BEGIN_NAMESPACE
 static QDBusConnection dbusConnection = QDBusConnection::systemBus();
@@ -938,3 +940,6 @@ void QOfonoSmsInterface::sendMessage(const QString &to, const QString &message)
 }
 
 QT_END_NAMESPACE
+
+#endif // QT_NO_DBUS
+#endif // QT_NO_BEARERMANAGEMENT
diff --git a/src/plugins/bearer/connman/qofonoservice_linux_p.h b/src/plugins/bearer/connman/qofonoservice_linux_p.h
index 4db08f5..af54ba0 100644
--- a/src/plugins/bearer/connman/qofonoservice_linux_p.h
+++ b/src/plugins/bearer/connman/qofonoservice_linux_p.h
@@ -65,6 +65,9 @@
 #include <QtDBus/QDBusContext>
 #include <QMap>
 
+#ifndef QT_NO_BEARERMANAGEMENT
+#ifndef QT_NO_DBUS
+
 #define OFONO_SERVICE	                         "org.ofono"
 #define OFONO_MANAGER_INTERFACE                  "org.ofono.Manager"
 #define OFONO_MANAGER_PATH                       "/"
@@ -331,4 +334,7 @@ Q_SIGNALS:
 
 QT_END_NAMESPACE
 
+#endif // QT_NO_DBUS
+#endif // QT_NO_BEARERMANAGEMENT
+
 #endif //QOFONOSERVICE_H