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

6 files changed, 22 insertions, 5 deletions

diff --git a/tools/assistant/tools/assistant/helpviewer_qtb.cpp b/tools/assistant/tools/assistant/helpviewer_qtb.cpp
index 3aafe67..1e439dc 100644
--- a/tools/assistant/tools/assistant/helpviewer_qtb.cpp
+++ b/tools/assistant/tools/assistant/helpviewer_qtb.cpp
@@ -38,11 +38,11 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-#if defined(QT_NO_WEBKIT)
-
 #include "helpviewer_qtb.h"
 #include "helpviewer_qwv.h"
 
+#if defined(QT_NO_WEBKIT)
+
 #include "centralwidget.h"
 #include "helpenginewrapper.h"
 #include "tracer.h"
diff --git a/tools/assistant/tools/assistant/helpviewer_qtb.h b/tools/assistant/tools/assistant/helpviewer_qtb.h
index e927b34..9a9a8fd 100644
--- a/tools/assistant/tools/assistant/helpviewer_qtb.h
+++ b/tools/assistant/tools/assistant/helpviewer_qtb.h
@@ -38,6 +38,9 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
+
+#include <QtCore/qglobal.h>
+
 #if defined(QT_NO_WEBKIT)
 
 #ifndef HELPVIEWERQTB_H
diff --git a/tools/assistant/tools/assistant/helpviewer_qwv.cpp b/tools/assistant/tools/assistant/helpviewer_qwv.cpp
index 4857e00..eec5a35 100644
--- a/tools/assistant/tools/assistant/helpviewer_qwv.cpp
+++ b/tools/assistant/tools/assistant/helpviewer_qwv.cpp
@@ -38,10 +38,10 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-#if !defined(QT_NO_WEBKIT)
-
 #include "helpviewer_qwv.h"
 
+#if !defined(QT_NO_WEBKIT)
+
 #include "centralwidget.h"
 #include "helpenginewrapper.h"
 #include "tracer.h"
diff --git a/tools/assistant/tools/assistant/helpviewer_qwv.h b/tools/assistant/tools/assistant/helpviewer_qwv.h
index 3f2e537..f326f8a 100644
--- a/tools/assistant/tools/assistant/helpviewer_qwv.h
+++ b/tools/assistant/tools/assistant/helpviewer_qwv.h
@@ -38,6 +38,9 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
+
+#include <QtCore/qglobal.h>
+
 #if !defined(QT_NO_WEBKIT)
 
 #ifndef HELPVIEWERQWV_H
diff --git a/tools/designer/src/components/formeditor/formwindow.cpp b/tools/designer/src/components/formeditor/formwindow.cpp
index 631ca7c..15775f6 100644
--- a/tools/designer/src/components/formeditor/formwindow.cpp
+++ b/tools/designer/src/components/formeditor/formwindow.cpp
@@ -1436,6 +1436,14 @@ struct ArrowKeyOperation {
     int arrowKey;
 };
 
+} // namespace
+
+QT_END_NAMESPACE
+Q_DECLARE_METATYPE(qdesigner_internal::ArrowKeyOperation)
+QT_BEGIN_NAMESPACE
+
+namespace qdesigner_internal {
+
 QRect ArrowKeyOperation::apply(const QRect &rect) const
 {
     QRect r = rect;
@@ -2964,4 +2972,3 @@ QUndoStack *FormWindow::commandHistory() const
 
 QT_END_NAMESPACE
 
-Q_DECLARE_METATYPE(qdesigner_internal::ArrowKeyOperation)
diff --git a/tools/qmlviewer/qmlviewer.cpp b/tools/qmlviewer/qmlviewer.cpp
index e2073dc..f4f04be 100644
--- a/tools/qmlviewer/qmlviewer.cpp
+++ b/tools/qmlviewer/qmlviewer.cpp
@@ -40,6 +40,10 @@
 ****************************************************************************/
 
 #include <qmlview.h>
+
+#ifdef hz
+#undef hz
+#endif
 #include "ui_recopts.h"
 
 #include "qmlviewer.h"