QML stuff: Fix compilation for namespaced Qt.

src/libs/qmljs/parser/qmljslexer.cpp

@@ -56,9 +56,11 @@
 #include <stdio.h>
 #include <string.h>
 
-QT_QML_BEGIN_NAMESPACE
-
+QT_BEGIN_NAMESPACE
 extern double qstrtod(const char *s00, char const **se, bool *ok);
+QT_END_NAMESPACE
+
+QT_QML_BEGIN_NAMESPACE
 
 #define shiftWindowsLineBreak() \
     do { \

src/plugins/qmldesigner/components/formeditor/abstractformeditortool.h

@@ -32,7 +32,9 @@
 
 #include "formeditoritem.h"
 
+QT_BEGIN_NAMESPACE
 class QGraphicsItem;
+QT_END_NAMESPACE
 
 namespace QmlDesigner {
 

src/plugins/qmldesigner/components/formeditor/formeditoritem.h

@@ -35,7 +35,9 @@
 #include <qmlitemnode.h>
 #include "snappinglinecreator.h"
 
+QT_BEGIN_NAMESPACE
 class QTimeLine;
+QT_END_NAMESPACE
 
 namespace QmlDesigner {
 

src/plugins/qmldesigner/components/formeditor/formeditorscene.h

@@ -37,8 +37,9 @@
 #include <qmlitemnode.h>
 #include "abstractformeditortool.h"
 
-
+QT_BEGIN_NAMESPACE
 class QGraphicsSceneMouseEvent;
+QT_END_NAMESPACE
 
 namespace QmlDesigner {
 

src/plugins/qmldesigner/components/formeditor/formeditorview.h

@@ -32,8 +32,10 @@
 
 #include <qmlmodelview.h>
 
+QT_BEGIN_NAMESPACE
 class QGraphicsScene;
 class QGraphicsSceneMouseEvent;
+QT_END_NAMESPACE
 
 namespace QmlDesigner {
 

src/plugins/qmldesigner/components/formeditor/formeditorwidget.h

@@ -32,7 +32,9 @@
 
 #include <QWidget>
 
+QT_BEGIN_NAMESPACE
 class QActionGroup;
+QT_END_NAMESPACE
 
 namespace QmlDesigner {
 

src/plugins/qmldesigner/components/formeditor/numberseriesaction.h

@@ -32,7 +32,9 @@
 
 #include <QWidgetAction>
 
+QT_BEGIN_NAMESPACE
 class QStandardItemModel;
+QT_END_NAMESPACE
 
 namespace QmlDesigner {
 

src/plugins/qmldesigner/components/formeditor/snapper.h

@@ -32,7 +32,9 @@
 
 #include "formeditoritem.h"
 
+QT_BEGIN_NAMESPACE
 class QLineF;
+QT_END_NAMESPACE
 
 namespace QmlDesigner {
 

src/plugins/qmldesigner/components/formeditor/toolbox.h

@@ -32,7 +32,9 @@
 
 #include <QWidget>
 
+QT_BEGIN_NAMESPACE
 class QToolBar;
+QT_END_NAMESPACE
 
 namespace QmlDesigner {
 

src/plugins/qmldesigner/components/formeditor/zoomaction.h

@@ -32,7 +32,9 @@
 
 #include <QWidgetAction>
 
+QT_BEGIN_NAMESPACE
 class QAbstractItemModel;
+QT_END_NAMESPACE
 
 namespace QmlDesigner {
 

src/plugins/qmldesigner/components/integration/componentaction.h

@@ -33,7 +33,9 @@
 #include <QWidgetAction>
 #include <QWeakPointer>
 
+QT_BEGIN_NAMESPACE
 class QComboBox;
+QT_END_NAMESPACE
 
 namespace QmlDesigner {
 

src/plugins/qmldesigner/components/integration/componentview.h

@@ -35,7 +35,9 @@
 
 #include <QStringList>
 
+QT_BEGIN_NAMESPACE
 class QStandardItemModel;
+QT_END_NAMESPACE
 
 namespace QmlDesigner {
 

src/plugins/qmldesigner/components/integration/designdocumentcontroller.h

@@ -35,12 +35,14 @@
 #include <QtCore/QObject>
 #include <QtCore/QString>
 
+QT_BEGIN_NAMESPACE
 class QUndoStack;
 class QWidget;
 class QIODevice;
 class QProcess;
 class QPlainTextEdit;
 class QmlError;
+QT_END_NAMESPACE
 
 namespace QmlDesigner {
 

src/plugins/qmldesigner/components/integration/integrationcore.h

@@ -32,8 +32,10 @@
 
 #include <QtCore/QObject>
 
+QT_BEGIN_NAMESPACE
 class QWidget;
 class QDialog;
+QT_END_NAMESPACE
 
 namespace QmlDesigner {
 

src/plugins/qmldesigner/components/itemlibrary/customdraganddrop.h

@@ -32,7 +32,9 @@
 #include <QTimeLine>
 #include <QDrag>
 
+QT_BEGIN_NAMESPACE
 class QMimeData;
+QT_END_NAMESPACE
 
 namespace QmlDesigner {
 

src/plugins/qmldesigner/components/itemlibrary/itemlibrary.h

@@ -32,9 +32,11 @@
 
 #include <QtGui/QFrame>
 
+QT_BEGIN_NAMESPACE
 class QGraphicsItem;
 class QPixmap;
 class QMimeData;
+QT_END_NAMESPACE
 
 namespace QmlDesigner {
 

src/plugins/qmldesigner/components/itemlibrary/itemlibrarymodel.h

@@ -36,7 +36,9 @@
 #include <QDebug>
 #include <QTimeLine>
 
+QT_BEGIN_NAMESPACE
 class QLabel;
+QT_END_NAMESPACE
 
 namespace QmlDesigner {
 

src/plugins/qmldesigner/components/navigator/navigatortreeview.h

@@ -37,10 +37,12 @@
 
 #include <QPainter>
 
+QT_BEGIN_NAMESPACE
 class QTreeView;
 class QStandardItem;
 class QItemSelection;
 class QModelIndex;
+QT_END_NAMESPACE
 
 namespace QmlDesigner {
 

src/plugins/qmldesigner/components/navigator/navigatorview.h

@@ -34,10 +34,12 @@
 
 #include <QWeakPointer>
 
+QT_BEGIN_NAMESPACE
 class QTreeView;
 class QStandardItem;
 class QItemSelection;
 class QModelIndex;
+QT_END_NAMESPACE
 
 namespace QmlDesigner {
 

src/plugins/qmldesigner/components/pluginmanager/iplugin.h

@@ -51,6 +51,8 @@ public:
 
 } // namespace QmlDesigner
 
+QT_BEGIN_NAMESPACE
 Q_DECLARE_INTERFACE(QmlDesigner::IPlugin, QMLDESIGNER_PLUGIN_INTERFACE)
+QT_END_NAMESPACE
 
 #endif // IPLUGIN_H