From 7140e4975cd30a2f2ec63a86fafd268a55a573b5 2012-09-12 12:21:11
From: Marek Rosa <marek.rosa@digia.com>
Date: 2012-09-12 12:21:11
Subject: [PATCH] Qt5: declarative fix part1
- disabled demos examples and tests
- disabled error on warning (QVector compilation issue: warning: dereferencing pointer '<anonymous>' does break strict-aliasing rules
- disabled designer plugin
- fixed the include files in plugins/declarative folder

---

diff --git a/charts.pro b/charts.pro
index 8e3e3eb..3610981 100644
--- a/charts.pro
+++ b/charts.pro
@@ -3,7 +3,8 @@
 }
 
 TEMPLATE = subdirs
-SUBDIRS = src plugins examples demos tests
+SUBDIRS = src plugins
+#examples demos tests
 
 development_build: message('Development build')
 
diff --git a/config.pri b/config.pri
index 9312d6d..d82dcde 100644
--- a/config.pri
+++ b/config.pri
@@ -85,6 +85,8 @@ linux-arm*: {
     DEFINES+=QT_ON_ARM
 }
 
+greaterThan(QT_MAJOR_VERSION, 4): DEFINES += QT5_QUICK_1
+
 ##################### INCLUDES ############################################################
 
 
diff --git a/plugins/declarative/declarativebarseries.h b/plugins/declarative/declarativebarseries.h
index 6206089..8c4599a 100644
--- a/plugins/declarative/declarativebarseries.h
+++ b/plugins/declarative/declarativebarseries.h
@@ -28,8 +28,13 @@
 #include "qhorizontalstackedbarseries.h"
 #include "qhorizontalpercentbarseries.h"
 #include "qbarset.h"
-#include <QDeclarativeItem>
-#include <QDeclarativeParserStatus>
+#ifdef QT5_QUICK_1
+    #include <QtQuick1/QDeclarativeItem>
+    #include <QtQuick1/QDeclarativeParserStatus>
+#else
+    #include <QtDeclarative/QDeclarativeItem>
+    #include <QtDeclarative/QDeclarativeParserStatus>
+#endif
 
 QTCOMMERCIALCHART_BEGIN_NAMESPACE
 
diff --git a/plugins/declarative/declarativecategoryaxis.h b/plugins/declarative/declarativecategoryaxis.h
index 7d934a5..f720c97 100644
--- a/plugins/declarative/declarativecategoryaxis.h
+++ b/plugins/declarative/declarativecategoryaxis.h
@@ -22,8 +22,13 @@
 #define DECLARATIVECATEGORYAXIS_H
 
 #include "qcategoryaxis.h"
-#include <QDeclarativeParserStatus>
-#include <QDeclarativeListProperty>
+#ifdef QT5_QUICK_1
+    #include <QtQuick1/QDeclarativeListProperty>
+    #include <QtQuick1/QDeclarativeParserStatus>
+#else
+    #include <QtDeclarative/QDeclarativeListProperty>
+    #include <QtDeclarative/QDeclarativeParserStatus>
+#endif
 
 QTCOMMERCIALCHART_BEGIN_NAMESPACE
 
diff --git a/plugins/declarative/declarativechart.h b/plugins/declarative/declarativechart.h
index a20a6cc..f0076ff 100644
--- a/plugins/declarative/declarativechart.h
+++ b/plugins/declarative/declarativechart.h
@@ -22,7 +22,11 @@
 #define DECLARATIVECHART_H
 
 #include <QtCore/QtGlobal>
-#include <QDeclarativeItem>
+#ifdef QT5_QUICK_1
+    #include <QtQuick1/QDeclarativeItem>
+#else
+    #include <QtDeclarative/QDeclarativeItem>
+#endif
 #include "qchart.h"
 
 QTCOMMERCIALCHART_BEGIN_NAMESPACE
diff --git a/plugins/declarative/declarativelineseries.h b/plugins/declarative/declarativelineseries.h
index 698047f..3365000 100644
--- a/plugins/declarative/declarativelineseries.h
+++ b/plugins/declarative/declarativelineseries.h
@@ -23,8 +23,13 @@
 
 #include "qlineseries.h"
 #include "declarativexyseries.h"
-#include <QDeclarativeListProperty>
-#include <QDeclarativeParserStatus>
+#ifdef QT5_QUICK_1
+    #include <QtQuick1/QDeclarativeListProperty>
+    #include <QtQuick1/QDeclarativeParserStatus>
+#else
+    #include <QtDeclarative/QDeclarativeListProperty>
+    #include <QtDeclarative/QDeclarativeParserStatus>
+#endif
 
 QTCOMMERCIALCHART_BEGIN_NAMESPACE
 
diff --git a/plugins/declarative/declarativepieseries.h b/plugins/declarative/declarativepieseries.h
index 3a26bb6..5a7d5cb 100644
--- a/plugins/declarative/declarativepieseries.h
+++ b/plugins/declarative/declarativepieseries.h
@@ -22,8 +22,13 @@
 #define DECLARATIVEPIESERIES_H
 
 #include "qpieseries.h"
-#include <QDeclarativeItem>
-#include <QDeclarativeParserStatus>
+#ifdef QT5_QUICK_1
+    #include <QtQuick1/QDeclarativeItem>
+    #include <QtQuick1/QDeclarativeParserStatus>
+#else
+    #include <QtDeclarative/QDeclarativeItem>
+    #include <QtDeclarative/QDeclarativeParserStatus>
+#endif
 
 QTCOMMERCIALCHART_BEGIN_NAMESPACE
 class QPieSlice;
diff --git a/plugins/declarative/declarativescatterseries.h b/plugins/declarative/declarativescatterseries.h
index ea28ecb..4188f2f 100644
--- a/plugins/declarative/declarativescatterseries.h
+++ b/plugins/declarative/declarativescatterseries.h
@@ -23,8 +23,13 @@
 
 #include "qscatterseries.h"
 #include "declarativexyseries.h"
-#include <QDeclarativeListProperty>
-#include <QDeclarativeParserStatus>
+#ifdef QT5_QUICK_1
+    #include <QtQuick1/QDeclarativeListProperty>
+    #include <QtQuick1/QDeclarativeParserStatus>
+#else
+    #include <QtDeclarative/QDeclarativeListProperty>
+    #include <QtDeclarative/QDeclarativeParserStatus>
+#endif
 
 QTCOMMERCIALCHART_BEGIN_NAMESPACE
 
diff --git a/plugins/declarative/declarativesplineseries.h b/plugins/declarative/declarativesplineseries.h
index 9ac5b7a..6c198d1 100644
--- a/plugins/declarative/declarativesplineseries.h
+++ b/plugins/declarative/declarativesplineseries.h
@@ -23,8 +23,13 @@
 
 #include "qsplineseries.h"
 #include "declarativexyseries.h"
-#include <QDeclarativeParserStatus>
-#include <QDeclarativeListProperty>
+#ifdef QT5_QUICK_1
+    #include <QtQuick1/QDeclarativeListProperty>
+    #include <QtQuick1/QDeclarativeParserStatus>
+#else
+    #include <QtDeclarative/QDeclarativeListProperty>
+    #include <QtDeclarative/QDeclarativeParserStatus>
+#endif
 
 QTCOMMERCIALCHART_BEGIN_NAMESPACE
 
diff --git a/plugins/declarative/plugin.cpp b/plugins/declarative/plugin.cpp
index 9a6861f..9ee067d 100644
--- a/plugins/declarative/plugin.cpp
+++ b/plugins/declarative/plugin.cpp
@@ -18,8 +18,13 @@
 **
 ****************************************************************************/
 
-#include <QtDeclarative/qdeclarativeextensionplugin.h>
-#include <QtDeclarative/qdeclarative.h>
+#ifdef QT5_QUICK_1
+    #include <QtQuick1/qdeclarativeextensionplugin.h>
+    #include <QtQuick1/qdeclarative.h>
+#else
+    #include <QtDeclarative/qdeclarativeextensionplugin.h>
+    #include <QtDeclarative/qdeclarative.h>
+#endif
 #include "qchart.h"
 #include "qabstractaxis.h"
 #include "qvalueaxis.h"
@@ -51,6 +56,11 @@ QTCOMMERCIALCHART_BEGIN_NAMESPACE
 class ChartQmlPlugin : public QDeclarativeExtensionPlugin
 {
     Q_OBJECT
+
+#ifdef QT5_QUICK_1
+    Q_PLUGIN_METADATA(IID "org.qt-project.foo")
+#endif
+
     public:
     virtual void registerTypes(const char *uri)
     {
@@ -162,4 +172,6 @@ QTCOMMERCIALCHART_END_NAMESPACE
 
 QTCOMMERCIALCHART_USE_NAMESPACE
 
-Q_EXPORT_PLUGIN2(qtcommercialchartqml, QT_PREPEND_NAMESPACE(ChartQmlPlugin))
+#ifndef QT5_QUICK_1
+    Q_EXPORT_PLUGIN2(qtcommercialchartqml, QT_PREPEND_NAMESPACE(ChartQmlPlugin))
+#endif
diff --git a/plugins/plugins.pro b/plugins/plugins.pro
index 1fd7a9b..fc5cf27 100644
--- a/plugins/plugins.pro
+++ b/plugins/plugins.pro
@@ -11,6 +11,6 @@ contains(QT_VERSION, ^4\\.[0-7]\\.[0-3]\\s*$) | contains(QT_VERSION, ^4\\.[0-6]\
 }
 
 !linux-arm*: {
-    SUBDIRS += \
-            designer
+#    SUBDIRS += \
+#            designer
 }
diff --git a/src/src.pro b/src/src.pro
index 40268a3..74e8dad 100644
--- a/src/src.pro
+++ b/src/src.pro
@@ -13,7 +13,7 @@ win32:CONFIG += create_prl
 win32-msvc*: {
     QMAKE_CXXFLAGS += /WX
 } else {
-    QMAKE_CXXFLAGS += -Werror 
+#    QMAKE_CXXFLAGS += -Werror
 }
 
 unix:{