From 4442dea01b9d4d45964228ac442166d89f091f9e Mon Sep 17 00:00:00 2001 From: Martin Jones Date: Mon, 11 Jul 2011 13:47:51 +1000 Subject: Extract all QtQuick 1 elements into a separate library/plugin. Change-Id: I41a280de2739ee08202f4be2519e5012870090f2 Reviewed-on: http://codereview.qt.nokia.com/1391 Reviewed-by: Martin Jones --- src/imports/gestures/gestures.pro | 2 +- src/imports/gestures/qdeclarativegesturearea.cpp | 2 +- src/imports/imports.pro | 2 +- src/imports/particles/V1/qdeclarativeparticles.cpp | 6 +- src/imports/particles/V1/qdeclarativeparticles_p.h | 2 +- src/imports/particles/particles.pro | 2 +- src/imports/qt47/plugin.cpp | 68 ++++++++++++++++++++++ src/imports/qt47/qmldir | 1 + src/imports/qt47/qt47.pro | 30 ++++++++++ src/imports/qtquick1/plugin.cpp | 68 ++++++++++++++++++++++ src/imports/qtquick1/qmldir | 1 + src/imports/qtquick1/qtquick1.pro | 30 ++++++++++ 12 files changed, 206 insertions(+), 8 deletions(-) create mode 100644 src/imports/qt47/plugin.cpp create mode 100644 src/imports/qt47/qmldir create mode 100644 src/imports/qt47/qt47.pro create mode 100644 src/imports/qtquick1/plugin.cpp create mode 100644 src/imports/qtquick1/qmldir create mode 100644 src/imports/qtquick1/qtquick1.pro (limited to 'src/imports') diff --git a/src/imports/gestures/gestures.pro b/src/imports/gestures/gestures.pro index 7ecd4b8afa..5c009dde51 100644 --- a/src/imports/gestures/gestures.pro +++ b/src/imports/gestures/gestures.pro @@ -2,7 +2,7 @@ TARGET = qmlgesturesplugin TARGETPATH = Qt/labs/gestures include(../qimportbase.pri) -QT += core-private gui-private declarative-private script-private +QT += core-private gui-private declarative-private script-private qtquick1 qtquick1-private SOURCES += qdeclarativegesturearea.cpp plugin.cpp HEADERS += qdeclarativegesturearea_p.h diff --git a/src/imports/gestures/qdeclarativegesturearea.cpp b/src/imports/gestures/qdeclarativegesturearea.cpp index 8523ec7f30..c0d88a3318 100644 --- a/src/imports/gestures/qdeclarativegesturearea.cpp +++ b/src/imports/gestures/qdeclarativegesturearea.cpp @@ -46,7 +46,7 @@ #include #include -#include +#include #include #include diff --git a/src/imports/imports.pro b/src/imports/imports.pro index e81c4bf5cf..c60e72db08 100644 --- a/src/imports/imports.pro +++ b/src/imports/imports.pro @@ -1,5 +1,5 @@ TEMPLATE = subdirs -SUBDIRS += folderlistmodel particles gestures inputcontext etcprovider +SUBDIRS += qtquick1 qt47 folderlistmodel particles gestures inputcontext etcprovider contains(QT_CONFIG, qmltest): SUBDIRS += testlib diff --git a/src/imports/particles/V1/qdeclarativeparticles.cpp b/src/imports/particles/V1/qdeclarativeparticles.cpp index 62b2d49805..f307109ee8 100644 --- a/src/imports/particles/V1/qdeclarativeparticles.cpp +++ b/src/imports/particles/V1/qdeclarativeparticles.cpp @@ -42,9 +42,9 @@ #include "qdeclarativeparticles_p.h" #include -#include +#include -#include +#include #include #include @@ -446,7 +446,7 @@ public: void updateOpacity(QDeclarativeParticle &p, int age); QUrl url; - QDeclarativePixmap image; + QDeclarative1Pixmap image; int count; int emissionRate; qreal emissionVariance; diff --git a/src/imports/particles/V1/qdeclarativeparticles_p.h b/src/imports/particles/V1/qdeclarativeparticles_p.h index f66531cbce..d0e6c0857b 100644 --- a/src/imports/particles/V1/qdeclarativeparticles_p.h +++ b/src/imports/particles/V1/qdeclarativeparticles_p.h @@ -42,7 +42,7 @@ #ifndef QDECLARATIVEPARTICLES_H #define QDECLARATIVEPARTICLES_H -#include +#include QT_BEGIN_HEADER diff --git a/src/imports/particles/particles.pro b/src/imports/particles/particles.pro index 56f663f328..c73d068e2c 100644 --- a/src/imports/particles/particles.pro +++ b/src/imports/particles/particles.pro @@ -9,7 +9,7 @@ SOURCES += \ particles.cpp \ V1/qdeclarativeparticles.cpp -QT += declarative opengl core gui declarative-private core-private gui-private +QT += declarative opengl core gui declarative-private core-private gui-private qtquick1 qtquick1-private OTHER_FILES += \ qmldir diff --git a/src/imports/qt47/plugin.cpp b/src/imports/qt47/plugin.cpp new file mode 100644 index 0000000000..dd086638de --- /dev/null +++ b/src/imports/qt47/plugin.cpp @@ -0,0 +1,68 @@ +/**************************************************************************** +** +** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). +** All rights reserved. +** Contact: Nokia Corporation (qt-info@nokia.com) +** +** This file is part of the plugins of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:BSD$ +** You may use this file under the terms of the BSD license as follows: +** +** "Redistribution and use in source and binary forms, with or without +** modification, are permitted provided that the following conditions are +** met: +** * Redistributions of source code must retain the above copyright +** notice, this list of conditions and the following disclaimer. +** * Redistributions in binary form must reproduce the above copyright +** notice, this list of conditions and the following disclaimer in +** the documentation and/or other materials provided with the +** distribution. +** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor +** the names of its contributors may be used to endorse or promote +** products derived from this software without specific prior written +** permission. +** +** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#include +#include + +#include + +QT_BEGIN_NAMESPACE + +//![class decl] +class Qt47Plugin : public QDeclarativeExtensionPlugin +{ + Q_OBJECT +public: + virtual void registerTypes(const char *uri) + { + Q_ASSERT(QLatin1String(uri) == QLatin1String("Qt")); + QDeclarativeQtQuick1Module::defineModule(QDeclarativeQtQuick1Module::Qt47); + } +}; +//![class decl] + +QT_END_NAMESPACE + +#include "plugin.moc" + +//![plugin export decl] +Q_EXPORT_PLUGIN2(qt47plugin, QT_PREPEND_NAMESPACE(Qt47Plugin)); +//![plugin export decl] + diff --git a/src/imports/qt47/qmldir b/src/imports/qt47/qmldir new file mode 100644 index 0000000000..cf3a7273d5 --- /dev/null +++ b/src/imports/qt47/qmldir @@ -0,0 +1 @@ +plugin qt47plugin diff --git a/src/imports/qt47/qt47.pro b/src/imports/qt47/qt47.pro new file mode 100644 index 0000000000..34a608a7d7 --- /dev/null +++ b/src/imports/qt47/qt47.pro @@ -0,0 +1,30 @@ +TARGET = qt47plugin +TARGETPATH = Qt +include(../qimportbase.pri) + +SOURCES += \ + plugin.cpp + +QT += declarative qtquick1 opengl qtquick1-private + + +OTHER_FILES += \ + qmldir + +DESTDIR = $$QT.declarative.imports/$$TARGETPATH +target.path = $$[QT_INSTALL_IMPORTS]/$$TARGETPATH + +qmldir.files += $$PWD/qmldir +qmldir.path += $$[QT_INSTALL_IMPORTS]/$$TARGETPATH + +symbian:{ +# TARGET.UID3 = + + isEmpty(DESTDIR):importFiles.files = qtquick1plugin$${QT_LIBINFIX}.dll qmldir + else:importFiles.files = $$DESTDIR/qtquick1plugin$${QT_LIBINFIX}.dll qmldir + importFiles.path = $$QT_IMPORTS_BASE_DIR/$$TARGETPATH + + DEPLOYMENT = importFiles +} + +INSTALLS += target qmldir diff --git a/src/imports/qtquick1/plugin.cpp b/src/imports/qtquick1/plugin.cpp new file mode 100644 index 0000000000..522f2ec796 --- /dev/null +++ b/src/imports/qtquick1/plugin.cpp @@ -0,0 +1,68 @@ +/**************************************************************************** +** +** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). +** All rights reserved. +** Contact: Nokia Corporation (qt-info@nokia.com) +** +** This file is part of the plugins of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:BSD$ +** You may use this file under the terms of the BSD license as follows: +** +** "Redistribution and use in source and binary forms, with or without +** modification, are permitted provided that the following conditions are +** met: +** * Redistributions of source code must retain the above copyright +** notice, this list of conditions and the following disclaimer. +** * Redistributions in binary form must reproduce the above copyright +** notice, this list of conditions and the following disclaimer in +** the documentation and/or other materials provided with the +** distribution. +** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor +** the names of its contributors may be used to endorse or promote +** products derived from this software without specific prior written +** permission. +** +** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#include +#include + +#include + +QT_BEGIN_NAMESPACE + +//![class decl] +class QtQuick1Plugin : public QDeclarativeExtensionPlugin +{ + Q_OBJECT +public: + virtual void registerTypes(const char *uri) + { + Q_ASSERT(QLatin1String(uri) == QLatin1String("QtQuick")); + QDeclarativeQtQuick1Module::defineModule(QDeclarativeQtQuick1Module::QtQuick1); + } +}; +//![class decl] + +QT_END_NAMESPACE + +#include "plugin.moc" + +//![plugin export decl] +Q_EXPORT_PLUGIN2(qtquick1plugin, QT_PREPEND_NAMESPACE(QtQuick1Plugin)); +//![plugin export decl] + diff --git a/src/imports/qtquick1/qmldir b/src/imports/qtquick1/qmldir new file mode 100644 index 0000000000..f68e439f53 --- /dev/null +++ b/src/imports/qtquick1/qmldir @@ -0,0 +1 @@ +plugin qtquick1plugin diff --git a/src/imports/qtquick1/qtquick1.pro b/src/imports/qtquick1/qtquick1.pro new file mode 100644 index 0000000000..1c7e324212 --- /dev/null +++ b/src/imports/qtquick1/qtquick1.pro @@ -0,0 +1,30 @@ +TARGET = qtquick1plugin +TARGETPATH = QtQuick +include(../qimportbase.pri) + +SOURCES += \ + plugin.cpp + +QT += declarative qtquick1 opengl qtquick1-private + + +OTHER_FILES += \ + qmldir + +DESTDIR = $$QT.declarative.imports/$$TARGETPATH +target.path = $$[QT_INSTALL_IMPORTS]/$$TARGETPATH + +qmldir.files += $$PWD/qmldir +qmldir.path += $$[QT_INSTALL_IMPORTS]/$$TARGETPATH + +symbian:{ +# TARGET.UID3 = + + isEmpty(DESTDIR):importFiles.files = qtquick1plugin$${QT_LIBINFIX}.dll qmldir + else:importFiles.files = $$DESTDIR/qtquick1plugin$${QT_LIBINFIX}.dll qmldir + importFiles.path = $$QT_IMPORTS_BASE_DIR/$$TARGETPATH + + DEPLOYMENT = importFiles +} + +INSTALLS += target qmldir -- cgit v1.2.3