From dbf35e498db723ae9850686e462ec4f45bc7b67c Mon Sep 17 00:00:00 2001 From: Matthew Vogt Date: Tue, 31 Jan 2012 11:22:08 +1000 Subject: Modify QtQuick1 to build in Qt5 Change-Id: I1c5ccaef420e8f119e761f50b969127f430df7ba Reviewed-by: Martin Jones --- .../qdeclarativemoduleplugin/plugin.2.1/plugin.2.1.pro | 2 +- .../declarative/qdeclarativemoduleplugin/plugin.2.1/plugin.cpp | 4 ++-- .../declarative/qdeclarativemoduleplugin/plugin.2/plugin.2.pro | 2 +- .../auto/declarative/qdeclarativemoduleplugin/plugin.2/plugin.cpp | 4 ++-- tests/auto/declarative/qdeclarativemoduleplugin/plugin/plugin.cpp | 4 ++-- tests/auto/declarative/qdeclarativemoduleplugin/plugin/plugin.pro | 2 +- .../declarative/qdeclarativemoduleplugin/pluginMixed/plugin.cpp | 4 ++-- .../qdeclarativemoduleplugin/pluginMixed/pluginMixed.pro | 2 +- .../declarative/qdeclarativemoduleplugin/pluginVersion/plugin.cpp | 4 ++-- .../qdeclarativemoduleplugin/pluginVersion/pluginVersion.pro | 2 +- .../qdeclarativemoduleplugin/pluginWithQmlFile/plugin.cpp | 4 ++-- .../pluginWithQmlFile/pluginWithQmlFile.pro | 2 +- .../qdeclarativemoduleplugin/pluginWrongCase/plugin.cpp | 4 ++-- .../qdeclarativemoduleplugin/pluginWrongCase/pluginWrongCase.pro | 2 +- .../qdeclarativemoduleplugin/qdeclarativemoduleplugin.pro | 2 +- .../qdeclarativemoduleplugin/tst_qdeclarativemoduleplugin.cpp | 5 ++--- .../qdeclarativemoduleplugin/tst_qdeclarativemoduleplugin.pro | 8 +++++--- 17 files changed, 29 insertions(+), 28 deletions(-) (limited to 'tests/auto/declarative/qdeclarativemoduleplugin') diff --git a/tests/auto/declarative/qdeclarativemoduleplugin/plugin.2.1/plugin.2.1.pro b/tests/auto/declarative/qdeclarativemoduleplugin/plugin.2.1/plugin.2.1.pro index 661675ae..e9dcb87f 100644 --- a/tests/auto/declarative/qdeclarativemoduleplugin/plugin.2.1/plugin.2.1.pro +++ b/tests/auto/declarative/qdeclarativemoduleplugin/plugin.2.1/plugin.2.1.pro @@ -1,7 +1,7 @@ TEMPLATE = lib CONFIG += plugin SOURCES = plugin.cpp -QT = core declarative +QT = core quick1 DESTDIR = ../imports/com/nokia/AutoTestQmlPluginType.2.1 symbian: { diff --git a/tests/auto/declarative/qdeclarativemoduleplugin/plugin.2.1/plugin.cpp b/tests/auto/declarative/qdeclarativemoduleplugin/plugin.2.1/plugin.cpp index 4774c329..fd349c3d 100644 --- a/tests/auto/declarative/qdeclarativemoduleplugin/plugin.2.1/plugin.cpp +++ b/tests/auto/declarative/qdeclarativemoduleplugin/plugin.2.1/plugin.cpp @@ -39,8 +39,8 @@ ** ****************************************************************************/ #include -#include -#include +#include +#include #include class MyPluginType : public QObject diff --git a/tests/auto/declarative/qdeclarativemoduleplugin/plugin.2/plugin.2.pro b/tests/auto/declarative/qdeclarativemoduleplugin/plugin.2/plugin.2.pro index d2546429..ff667b80 100644 --- a/tests/auto/declarative/qdeclarativemoduleplugin/plugin.2/plugin.2.pro +++ b/tests/auto/declarative/qdeclarativemoduleplugin/plugin.2/plugin.2.pro @@ -1,7 +1,7 @@ TEMPLATE = lib CONFIG += plugin SOURCES = plugin.cpp -QT = core declarative +QT = core quick1 DESTDIR = ../imports/com/nokia/AutoTestQmlPluginType.2 symbian: { diff --git a/tests/auto/declarative/qdeclarativemoduleplugin/plugin.2/plugin.cpp b/tests/auto/declarative/qdeclarativemoduleplugin/plugin.2/plugin.cpp index 271c59e5..cf0ce7de 100644 --- a/tests/auto/declarative/qdeclarativemoduleplugin/plugin.2/plugin.cpp +++ b/tests/auto/declarative/qdeclarativemoduleplugin/plugin.2/plugin.cpp @@ -39,8 +39,8 @@ ** ****************************************************************************/ #include -#include -#include +#include +#include #include class MyPluginType : public QObject diff --git a/tests/auto/declarative/qdeclarativemoduleplugin/plugin/plugin.cpp b/tests/auto/declarative/qdeclarativemoduleplugin/plugin/plugin.cpp index f023963b..355e085e 100644 --- a/tests/auto/declarative/qdeclarativemoduleplugin/plugin/plugin.cpp +++ b/tests/auto/declarative/qdeclarativemoduleplugin/plugin/plugin.cpp @@ -39,8 +39,8 @@ ** ****************************************************************************/ #include -#include -#include +#include +#include #include class MyPluginType : public QObject diff --git a/tests/auto/declarative/qdeclarativemoduleplugin/plugin/plugin.pro b/tests/auto/declarative/qdeclarativemoduleplugin/plugin/plugin.pro index 173a3026..5ccaf8d3 100644 --- a/tests/auto/declarative/qdeclarativemoduleplugin/plugin/plugin.pro +++ b/tests/auto/declarative/qdeclarativemoduleplugin/plugin/plugin.pro @@ -1,7 +1,7 @@ TEMPLATE = lib CONFIG += plugin SOURCES = plugin.cpp -QT = core declarative +QT = core quick1 DESTDIR = ../imports/com/nokia/AutoTestQmlPluginType symbian: { diff --git a/tests/auto/declarative/qdeclarativemoduleplugin/pluginMixed/plugin.cpp b/tests/auto/declarative/qdeclarativemoduleplugin/pluginMixed/plugin.cpp index 460bcf87..aeff685e 100644 --- a/tests/auto/declarative/qdeclarativemoduleplugin/pluginMixed/plugin.cpp +++ b/tests/auto/declarative/qdeclarativemoduleplugin/pluginMixed/plugin.cpp @@ -39,8 +39,8 @@ ** ****************************************************************************/ #include -#include -#include +#include +#include #include class BarPluginType : public QObject diff --git a/tests/auto/declarative/qdeclarativemoduleplugin/pluginMixed/pluginMixed.pro b/tests/auto/declarative/qdeclarativemoduleplugin/pluginMixed/pluginMixed.pro index 9766003e..d83ab1e0 100644 --- a/tests/auto/declarative/qdeclarativemoduleplugin/pluginMixed/pluginMixed.pro +++ b/tests/auto/declarative/qdeclarativemoduleplugin/pluginMixed/pluginMixed.pro @@ -1,7 +1,7 @@ TEMPLATE = lib CONFIG += plugin SOURCES = plugin.cpp -QT = core declarative +QT = core quick1 DESTDIR = ../imports/com/nokia/AutoTestQmlMixedPluginType symbian: { diff --git a/tests/auto/declarative/qdeclarativemoduleplugin/pluginVersion/plugin.cpp b/tests/auto/declarative/qdeclarativemoduleplugin/pluginVersion/plugin.cpp index 427bf648..21e3ba69 100644 --- a/tests/auto/declarative/qdeclarativemoduleplugin/pluginVersion/plugin.cpp +++ b/tests/auto/declarative/qdeclarativemoduleplugin/pluginVersion/plugin.cpp @@ -39,8 +39,8 @@ ** ****************************************************************************/ #include -#include -#include +#include +#include #include class FloorPluginType : public QObject diff --git a/tests/auto/declarative/qdeclarativemoduleplugin/pluginVersion/pluginVersion.pro b/tests/auto/declarative/qdeclarativemoduleplugin/pluginVersion/pluginVersion.pro index 70a38b9a..33334d9b 100644 --- a/tests/auto/declarative/qdeclarativemoduleplugin/pluginVersion/pluginVersion.pro +++ b/tests/auto/declarative/qdeclarativemoduleplugin/pluginVersion/pluginVersion.pro @@ -1,7 +1,7 @@ TEMPLATE = lib CONFIG += plugin SOURCES = plugin.cpp -QT = core declarative +QT = core quick1 DESTDIR = ../imports/com/nokia/AutoTestQmlVersionPluginType symbian: { diff --git a/tests/auto/declarative/qdeclarativemoduleplugin/pluginWithQmlFile/plugin.cpp b/tests/auto/declarative/qdeclarativemoduleplugin/pluginWithQmlFile/plugin.cpp index 1b5a9d85..da05e477 100644 --- a/tests/auto/declarative/qdeclarativemoduleplugin/pluginWithQmlFile/plugin.cpp +++ b/tests/auto/declarative/qdeclarativemoduleplugin/pluginWithQmlFile/plugin.cpp @@ -39,8 +39,8 @@ ** ****************************************************************************/ #include -#include -#include +#include +#include #include class MyPlugin : public QDeclarativeExtensionPlugin diff --git a/tests/auto/declarative/qdeclarativemoduleplugin/pluginWithQmlFile/pluginWithQmlFile.pro b/tests/auto/declarative/qdeclarativemoduleplugin/pluginWithQmlFile/pluginWithQmlFile.pro index aa9c95c4..62f090a6 100644 --- a/tests/auto/declarative/qdeclarativemoduleplugin/pluginWithQmlFile/pluginWithQmlFile.pro +++ b/tests/auto/declarative/qdeclarativemoduleplugin/pluginWithQmlFile/pluginWithQmlFile.pro @@ -1,7 +1,7 @@ TEMPLATE = lib CONFIG += plugin SOURCES = plugin.cpp -QT = core declarative +QT = core quick1 DESTDIR = ../imports/com/nokia/AutoTestPluginWithQmlFile symbian: { diff --git a/tests/auto/declarative/qdeclarativemoduleplugin/pluginWrongCase/plugin.cpp b/tests/auto/declarative/qdeclarativemoduleplugin/pluginWrongCase/plugin.cpp index 8397dbf3..f0a1527b 100644 --- a/tests/auto/declarative/qdeclarativemoduleplugin/pluginWrongCase/plugin.cpp +++ b/tests/auto/declarative/qdeclarativemoduleplugin/pluginWrongCase/plugin.cpp @@ -39,8 +39,8 @@ ** ****************************************************************************/ #include -#include -#include +#include +#include #include class MyPluginType : public QObject diff --git a/tests/auto/declarative/qdeclarativemoduleplugin/pluginWrongCase/pluginWrongCase.pro b/tests/auto/declarative/qdeclarativemoduleplugin/pluginWrongCase/pluginWrongCase.pro index c7337ca0..31a4464d 100644 --- a/tests/auto/declarative/qdeclarativemoduleplugin/pluginWrongCase/pluginWrongCase.pro +++ b/tests/auto/declarative/qdeclarativemoduleplugin/pluginWrongCase/pluginWrongCase.pro @@ -1,7 +1,7 @@ TEMPLATE = lib CONFIG += plugin SOURCES = plugin.cpp -QT = core declarative +QT = core quick1 TARGET = Plugin DESTDIR = ../imports/com/nokia/WrongCase diff --git a/tests/auto/declarative/qdeclarativemoduleplugin/qdeclarativemoduleplugin.pro b/tests/auto/declarative/qdeclarativemoduleplugin/qdeclarativemoduleplugin.pro index 6e72d983..248da333 100644 --- a/tests/auto/declarative/qdeclarativemoduleplugin/qdeclarativemoduleplugin.pro +++ b/tests/auto/declarative/qdeclarativemoduleplugin/qdeclarativemoduleplugin.pro @@ -1,4 +1,4 @@ -QT = core +QT = core testlib TEMPLATE = subdirs SUBDIRS = plugin plugin.2 plugin.2.1 pluginWrongCase pluginWithQmlFile pluginMixed pluginVersion tst_qdeclarativemoduleplugin_pro.depends += plugin diff --git a/tests/auto/declarative/qdeclarativemoduleplugin/tst_qdeclarativemoduleplugin.cpp b/tests/auto/declarative/qdeclarativemoduleplugin/tst_qdeclarativemoduleplugin.cpp index cc22da45..f7a4075b 100644 --- a/tests/auto/declarative/qdeclarativemoduleplugin/tst_qdeclarativemoduleplugin.cpp +++ b/tests/auto/declarative/qdeclarativemoduleplugin/tst_qdeclarativemoduleplugin.cpp @@ -40,13 +40,12 @@ ****************************************************************************/ #include #include -#include -#include +#include +#include #include #include #include "../shared/testhttpserver.h" -#include "../../../shared/util.h" #define SERVER_ADDR "http://127.0.0.1:14450" #define SERVER_PORT 14450 diff --git a/tests/auto/declarative/qdeclarativemoduleplugin/tst_qdeclarativemoduleplugin.pro b/tests/auto/declarative/qdeclarativemoduleplugin/tst_qdeclarativemoduleplugin.pro index 98cd4729..79116058 100644 --- a/tests/auto/declarative/qdeclarativemoduleplugin/tst_qdeclarativemoduleplugin.pro +++ b/tests/auto/declarative/qdeclarativemoduleplugin/tst_qdeclarativemoduleplugin.pro @@ -1,10 +1,12 @@ -load(qttest_p4) +CONFIG += testcase +TARGET = tst_qdeclarativemoduleplugin + +QT += quick1 network testlib +CONFIG -= app_bundle HEADERS = ../shared/testhttpserver.h SOURCES = tst_qdeclarativemoduleplugin.cpp \ ../shared/testhttpserver.cpp -QT += declarative network -CONFIG -= app_bundle symbian: { importFiles.files = data -- cgit v1.2.3