Commit f189b893 authored by Matthew Vogt's avatar Matthew Vogt Committed by Qt by Nokia
Browse files

Extract Particles code to an independent library


QtQuick clients that do not use particles features should not have
to load these classes.

Task-number: QTBUG-25178
Change-Id: Ib15f7655dc4d821595e06f9160d2770375279027
Reviewed-by: default avatarGlenn Watson <glenn.watson@nokia.com>
parent e00c40a8
dev 5.10 5.11 5.12 5.12.1 5.12.10 5.12.11 5.12.12 5.12.2 5.12.3 5.12.4 5.12.5 5.12.6 5.12.7 5.12.8 5.12.9 5.13 5.13.0 5.13.1 5.13.2 5.14 5.14.0 5.14.1 5.14.2 5.15 5.15.0 5.15.1 5.15.2 5.3 5.4 5.5 5.6 5.7 5.8 5.9 5.9.8 6.0 6.0.0 6.1 6.1.0 6.1.1 6.1.2 6.1.3 6.2 6.2.0 6.2.1 6.2.2 old/5.0 old/5.1 old/5.2 wip/cmake wip/dbus wip/gc wip/itemviews wip/nacl wip/new-backend wip/pointerhandler wip/propertycache-refactor wip/qquickdeliveryagent wip/scenegraphng wip/tizen wip/webassembly v5.15.0-alpha1 v5.14.1 v5.14.0 v5.14.0-rc2 v5.14.0-rc1 v5.14.0-beta3 v5.14.0-beta2 v5.14.0-beta1 v5.14.0-alpha1 v5.13.2 v5.13.1 v5.13.0 v5.13.0-rc3 v5.13.0-rc2 v5.13.0-rc1 v5.13.0-beta4 v5.13.0-beta3 v5.13.0-beta2 v5.13.0-beta1 v5.13.0-alpha1 v5.12.7 v5.12.6 v5.12.5 v5.12.4 v5.12.3 v5.12.2 v5.12.1 v5.12.0 v5.12.0-rc2 v5.12.0-rc1 v5.12.0-beta4 v5.12.0-beta3 v5.12.0-beta2 v5.12.0-beta1 v5.12.0-alpha1 v5.11.3 v5.11.2 v5.11.1 v5.11.0 v5.11.0-rc2 v5.11.0-rc1 v5.11.0-beta4 v5.11.0-beta3 v5.11.0-beta2 v5.11.0-beta1 v5.11.0-alpha1 v5.10.1 v5.10.0 v5.10.0-rc3 v5.10.0-rc2 v5.10.0-rc1 v5.10.0-beta4 v5.10.0-beta3 v5.10.0-beta2 v5.10.0-beta1 v5.10.0-alpha1 v5.9.9 v5.9.8 v5.9.7 v5.9.6 v5.9.5 v5.9.4 v5.9.3 v5.9.2 v5.9.1 v5.9.0 v5.9.0-rc2 v5.9.0-rc1 v5.9.0-beta4 v5.9.0-beta3 v5.9.0-beta2 v5.9.0-beta1 v5.9.0-alpha1 v5.8.0 v5.8.0-rc1 v5.8.0-beta1 v5.8.0-alpha1 v5.7.1 v5.7.0 v5.7.0-rc1 v5.7.0-beta1 v5.7.0-alpha1 v5.6.3 v5.6.2 v5.6.1 v5.6.1-1 v5.6.0 v5.6.0-rc1 v5.6.0-beta1 v5.6.0-alpha1 v5.5.1 v5.5.0 v5.5.0-rc1 v5.5.0-beta1 v5.5.0-alpha1 v5.4.2 v5.4.1 v5.4.0 v5.4.0-rc1 v5.4.0-beta1 v5.4.0-alpha1 v5.3.2 v5.3.1 v5.3.0 v5.3.0-rc1 v5.3.0-beta1 v5.3.0-alpha1 v5.2.1 v5.2.0 v5.2.0-rc1 v5.2.0-beta1 v5.2.0-alpha1 v5.1.1 v5.1.0 v5.1.0-rc2 v5.1.0-rc1 v5.1.0-beta1 v5.1.0-alpha1 v5.0.2 v5.0.1 v5.0.0 v5.0.0-rc2 v5.0.0-rc1 v5.0.0-beta2 v5.0.0-beta1
No related merge requests found
Showing with 60 additions and 2 deletions
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
...@@ -5,7 +5,7 @@ include(../qimportbase.pri) ...@@ -5,7 +5,7 @@ include(../qimportbase.pri)
SOURCES += \ SOURCES += \
plugin.cpp plugin.cpp
QT += quick-private qml-private QT += quick-private quickparticles-private qml-private
OTHER_FILES += \ OTHER_FILES += \
qmldir qmldir
......
...@@ -28,7 +28,8 @@ HEADERS += \ ...@@ -28,7 +28,8 @@ HEADERS += \
$$PWD/qquickv8particledata_p.h \ $$PWD/qquickv8particledata_p.h \
$$PWD/qquickrectangleextruder_p.h \ $$PWD/qquickrectangleextruder_p.h \
$$PWD/qquickparticlegroup_p.h \ $$PWD/qquickparticlegroup_p.h \
$$PWD/qquickgroupgoal_p.h $$PWD/qquickgroupgoal_p.h \
$$PWD/qtquickparticlesglobal_p.h
SOURCES += \ SOURCES += \
$$PWD/qquickangledirection.cpp \ $$PWD/qquickangledirection.cpp \
......
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)
}
File moved
File moved
File moved
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment