--- /dev/null
+QT.quickparticles.VERSION = 5.0.0
+QT.quickparticles.MAJOR_VERSION = 5
+QT.quickparticles.MINOR_VERSION = 0
+QT.quickparticles.PATCH_VERSION = 0
+
+QT.quickparticles.name = QtQuickParticles
+QT.quickparticles.bins = $$QT_MODULE_BIN_BASE
+QT.quickparticles.includes = $$QT_MODULE_INCLUDE_BASE $$QT_MODULE_INCLUDE_BASE/QtQuickParticles
+QT.quickparticles.private_includes = $$QT_MODULE_INCLUDE_BASE/QtQuickParticles/$$QT.quickparticles.VERSION
+QT.quickparticles.sources = $$QT_MODULE_BASE/src/particles
+QT.quickparticles.libs = $$QT_MODULE_LIB_BASE
+QT.quickparticles.plugins = $$QT_MODULE_PLUGIN_BASE
+QT.quickparticles.imports = $$QT_MODULE_IMPORT_BASE
+QT.quickparticles.depends = qml quick
+QT.quickparticles.DEFINES = QT_QUICKPARTICLES_LIB
+
+QT_CONFIG += quickparticles
SOURCES += \
plugin.cpp
-QT += quick-private qml-private
+QT += quick-private quickparticles-private qml-private
OTHER_FILES += \
qmldir
$$PWD/qquickv8particledata_p.h \
$$PWD/qquickrectangleextruder_p.h \
$$PWD/qquickparticlegroup_p.h \
- $$PWD/qquickgroupgoal_p.h
+ $$PWD/qquickgroupgoal_p.h \
+ $$PWD/qtquickparticlesglobal_p.h
SOURCES += \
$$PWD/qquickangledirection.cpp \
--- /dev/null
+load(qt_module)
+
+TARGET = QtQuickParticles
+
+CONFIG += module
+CONFIG += dll warn_on
+MODULE_PRI = ../../modules/qt_quickparticles.pri
+
+QT = core-private gui-private v8-private qml-private quick-private
+
+DEFINES += QT_BUILD_QUICKPARTICLES_LIB QT_NO_URL_CAST_FROM_STRING QT_NO_INTEGER_EVENT_COORDINATES
+win32-msvc*:DEFINES *= _CRT_SECURE_NO_WARNINGS
+solaris-cc*:QMAKE_CXXFLAGS_RELEASE -= -O2
+
+exists("qqml_enable_gcov") {
+ QMAKE_CXXFLAGS = -fprofile-arcs -ftest-coverage -fno-elide-constructors
+ LIBS += -lgcov
+}
+
+MODULE = quickparticles
+load(qt_module_config)
+
+include(particles.pri)
+
+mac {
+ # FIXME: this is a workaround for broken qmake logic in qtAddModule()
+ # This function refuses to use frameworks unless the framework exists on
+ # the filesystem at the time qmake is run, resulting in a build failure
+ # if QtQuick is qmaked before QtQml is built and frameworks are
+ # in use. qtAddLibrary() contains correct logic to deal with this, so
+ # we'll explicitly call that for now.
+ load(qt)
+ LIBS -= -lQtQml # in non-framework builds, these should be re-added
+ LIBS -= -lQtQml_debug # within the qtAddLibrary if appropriate, so no
+ qtAddLibrary(QtQml) # harm done :)
+ LIBS -= -lQtQuick
+ LIBS -= -lQtQuick_debug
+ qtAddLibrary(QtQuick)
+}
+
#ifndef QQUICKPARTICLESMODULE_H
#define QQUICKPARTICLESMODULE_H
-#include <private/qtquickglobal_p.h>
+#include <private/qtquickparticlesglobal_p.h>
QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
-class Q_QUICK_PRIVATE_EXPORT QQuickParticlesModule
+class Q_QUICKPARTICLES_PRIVATE_EXPORT QQuickParticlesModule
{
public:
static void defineModule();
--- /dev/null
+/****************************************************************************
+**
+** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
+**
+** This file is part of the QtQuickParticles module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** This file may be used under the terms of the GNU Lesser General Public
+** License version 2.1 as published by the Free Software Foundation and
+** appearing in the file LICENSE.LGPL included in the packaging of this
+** file. Please review the following information to ensure the GNU Lesser
+** General Public License version 2.1 requirements will be met:
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights. These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU General
+** Public License version 3.0 as published by the Free Software Foundation
+** and appearing in the file LICENSE.GPL included in the packaging of this
+** file. Please review the following information to ensure the GNU General
+** Public License version 3.0 requirements will be met:
+** http://www.gnu.org/copyleft/gpl.html.
+**
+** Other Usage
+** Alternatively, this file may be used in accordance with the terms and
+** conditions contained in a signed written agreement between you and Nokia.
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QTQUICKPARTICLESGLOBAL_P_H
+#define QTQUICKPARTICLESGLOBAL_P_H
+
+#include <QtCore/qglobal.h>
+
+// We only have private exports from this library
+
+#if defined(Q_OS_WIN)
+# if defined(QT_MAKEDLL) /* create a Qt DLL library */
+# if defined(QT_BUILD_QUICKPARTICLES_LIB)
+# define Q_QUICKPARTICLES_PRIVATE_EXPORT Q_DECL_EXPORT
+# else
+# define Q_QUICKPARTICLES_PRIVATE_EXPORT Q_DECL_IMPORT
+# endif
+# elif defined(QT_DLL) /* use a Qt DLL library */
+# define Q_QUICKPARTICLES_PRIVATE_EXPORT Q_DECL_IMPORT
+# endif
+#endif
+
+#if !defined(Q_QUICKPARTICLES_PRIVATE_EXPORT)
+# if defined(QT_SHARED)
+# define Q_QUICKPARTICLES_PRIVATE_EXPORT Q_DECL_EXPORT
+# else
+# define Q_QUICKPARTICLES_PRIVATE_EXPORT
+# endif
+#endif
+
+#endif // QTQUICKPARTICLESGLOBAL_P_H
#include <QtQuick/qquickitem.h>
#include <QtQuick/qsgmaterial.h>
+#include <private/qtquickglobal_p.h>
#include <private/qsgadaptationlayer_p.h>
#include <private/qquickshadereffectnode_p.h>
#include "qquickshadereffectmesh_p.h"
class QQuickCustomMaterialShader;
// Common class for QQuickShaderEffect and QQuickCustomParticle.
-struct QQuickShaderEffectCommon
+struct Q_QUICK_PRIVATE_EXPORT QQuickShaderEffectCommon
{
typedef QQuickShaderEffectMaterialKey Key;
typedef QQuickShaderEffectMaterial::UniformData UniformData;
#include <QtQuick/qsgmaterial.h>
#include <QtQuick/qsgtextureprovider.h>
#include <QtQuick/qquickitem.h>
+#include <private/qtquickglobal_p.h>
#include <QtCore/qsharedpointer.h>
#include <QtCore/qpointer.h>
class QQuickCustomMaterialShader;
class QQuickShaderEffectNode;
-class QQuickShaderEffectMaterial : public QSGMaterial
+class Q_QUICK_PRIVATE_EXPORT QQuickShaderEffectMaterial : public QSGMaterial
{
public:
struct UniformData
class QSGShaderEffectMesh;
-class QQuickShaderEffectNode : public QObject, public QSGGeometryNode
+class Q_QUICK_PRIVATE_EXPORT QQuickShaderEffectNode : public QObject, public QSGGeometryNode
{
Q_OBJECT
public:
#include <QQmlListProperty>
#include <QImage>
#include <QPair>
-#include <QtQuick/private/qquickpixmapcache_p.h>
+#include <private/qquickpixmapcache_p.h>
+#include <private/qtquickglobal_p.h>
QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
class QQuickSprite;
-class Q_AUTOTEST_EXPORT QQuickStochasticState : public QObject //Currently for internal use only - Sprite and ParticleGroup
+class Q_QUICK_PRIVATE_EXPORT QQuickStochasticState : public QObject //Currently for internal use only - Sprite and ParticleGroup
{
Q_OBJECT
Q_PROPERTY(int duration READ duration WRITE setDuration NOTIFY durationChanged)
bool m_randomStart;
};
-class Q_AUTOTEST_EXPORT QQuickStochasticEngine : public QObject
+class Q_QUICK_PRIVATE_EXPORT QQuickStochasticEngine : public QObject
{
Q_OBJECT
//TODO: Optimize single state case?
bool m_addAdvance;
};
-class QQuickSpriteEngine : public QQuickStochasticEngine
+class Q_QUICK_PRIVATE_EXPORT QQuickSpriteEngine : public QQuickStochasticEngine
{
Q_OBJECT
Q_PROPERTY(QQmlListProperty<QQuickSprite> sprites READ sprites)
include(util/util.pri)
include(scenegraph/scenegraph.pri)
include(items/items.pri)
-include(particles/particles.pri)
include(designer/designer.pri)
HEADERS += \
{
public:
- struct Attribute
+ struct Q_QUICK_EXPORT Attribute
{
int position;
int tupleSize;
TEMPLATE = subdirs
CONFIG += ordered
-SUBDIRS += qml quick plugins
+SUBDIRS += qml quick particles plugins
contains(QT_CONFIG, qmltest): SUBDIRS += qmltest
%modules = ( # path to module name map
"QtQml" => "$basedir/src/qml",
"QtQuick" => "$basedir/src/quick",
+ "QtQuickParticles" => "$basedir/src/particles",
"QtQuickTest" => "$basedir/src/qmltest",
"QtQmlDevTools" => "$basedir/src/qmldevtools",
"QtDeclarative" => "$basedir/src/compatibility",
"network" => "#include <QtNetwork/QtNetwork>\n",
"testlib" => "#include <QtTest/QtTest>\n",
"qml" => "#include <QtQml/QtQml>\n",
+ "quick" => "#include <QtQuick/QtQuick>\n",
);
%modulepris = (
"QtQml" => "$basedir/modules/qt_qml.pri",
"QtQuick" => "$basedir/modules/qt_quick.pri",
+ "QtQuickParticles" => "$basedir/modules/qt_quickparticles.pri",
"QtQuickTest" => "$basedir/modules/qt_qmltest.pri",
"QtQmlDevTools" => "$basedir/modules/qt_qmldevtools.pri",
"QtDeclarative" => "$basedir/modules/qt_declarative.pri",
include (../../shared/util.pri)
TESTDATA = data/*
-QT += core-private gui-private v8-private qml-private quick-private testlib
+QT += core-private gui-private v8-private qml-private quick-private quickparticles-private testlib
include (../../shared/util.pri)
TESTDATA = data/*
-QT += core-private gui-private v8-private qml-private quick-private testlib
+QT += core-private gui-private v8-private qml-private quick-private quickparticles-private testlib
include (../../shared/util.pri)
TESTDATA = data/*
-QT += core-private gui-private v8-private qml-private quick-private testlib
+QT += core-private gui-private v8-private qml-private quick-private quickparticles-private testlib
include (../../shared/util.pri)
TESTDATA = data/*
-QT += core-private gui-private v8-private qml-private quick-private testlib
+QT += core-private gui-private v8-private qml-private quick-private quickparticles-private testlib
include (../../shared/util.pri)
TESTDATA = data/*
-QT += core-private gui-private v8-private qml-private quick-private testlib
+QT += core-private gui-private v8-private qml-private quick-private quickparticles-private testlib
include (../../shared/util.pri)
TESTDATA = data/*
-QT += core-private gui-private v8-private qml-private quick-private testlib
+QT += core-private gui-private v8-private qml-private quick-private quickparticles-private testlib
include (../../shared/util.pri)
TESTDATA = data/*
-QT += core-private gui-private v8-private qml-private quick-private testlib
+QT += core-private gui-private v8-private qml-private quick-private quickparticles-private testlib
include (../../shared/util.pri)
TESTDATA = data/*
-QT += core-private gui-private v8-private qml-private quick-private testlib
+QT += core-private gui-private v8-private qml-private quick-private quickparticles-private testlib
include (../../shared/util.pri)
TESTDATA = data/*
-QT += core-private gui-private v8-private qml-private testlib quick-private
+QT += core-private gui-private v8-private qml-private testlib quick-private quickparticles-private
include (../../shared/util.pri)
TESTDATA = data/*
-QT += core-private gui-private v8-private qml-private quick-private testlib
+QT += core-private gui-private v8-private qml-private quick-private quickparticles-private testlib
include (../../shared/util.pri)
TESTDATA = data/*
-QT += core-private gui-private v8-private qml-private quick-private testlib
+QT += core-private gui-private v8-private qml-private quick-private quickparticles-private testlib
include (../../shared/util.pri)
TESTDATA = data/*
-QT += core-private gui-private v8-private qml-private quick-private testlib
+QT += core-private gui-private v8-private qml-private quick-private quickparticles-private testlib
include (../../shared/util.pri)
TESTDATA = data/*
-QT += core-private gui-private v8-private qml-private quick-private testlib
+QT += core-private gui-private v8-private qml-private quick-private quickparticles-private testlib
include (../../shared/util.pri)
TESTDATA = data/*
-QT += core-private gui-private v8-private qml-private quick-private testlib
+QT += core-private gui-private v8-private qml-private quick-private quickparticles-private testlib
include (../../shared/util.pri)
TESTDATA = data/*
-QT += core-private gui-private v8-private qml-private quick-private testlib
+QT += core-private gui-private v8-private qml-private quick-private quickparticles-private testlib
include (../../shared/util.pri)
TESTDATA = data/*
-QT += core-private gui-private v8-private qml-private quick-private testlib
+QT += core-private gui-private v8-private qml-private quick-private quickparticles-private testlib
include (../../shared/util.pri)
TESTDATA = data/*
-QT += core-private gui-private v8-private qml-private quick-private testlib
+QT += core-private gui-private v8-private qml-private quick-private quickparticles-private testlib
include (../../shared/util.pri)
TESTDATA = data/*
-QT += core-private gui-private v8-private qml-private quick-private testlib
+QT += core-private gui-private v8-private qml-private quick-private quickparticles-private testlib
include (../../shared/util.pri)
TESTDATA = data/*
-QT += core-private gui-private v8-private qml-private testlib quick-private
+QT += core-private gui-private v8-private qml-private testlib quick-private quickparticles-private
include (../../shared/util.pri)
TESTDATA = data/*
-QT += core-private gui-private v8-private qml-private quick-private testlib
+QT += core-private gui-private v8-private qml-private quick-private quickparticles-private testlib
include (../../shared/util.pri)
TESTDATA = data/*
-QT += core-private gui-private v8-private qml-private quick-private testlib
+QT += core-private gui-private v8-private qml-private quick-private quickparticles-private testlib
include (../../shared/util.pri)
TESTDATA = data/*
-QT += core-private gui-private v8-private qml-private quick-private testlib
+QT += core-private gui-private v8-private qml-private quick-private quickparticles-private testlib
include (../../shared/util.pri)
TESTDATA = data/*
-QT += core-private gui-private v8-private qml-private quick-private testlib
+QT += core-private gui-private v8-private qml-private quick-private quickparticles-private testlib