diff options
author | Matthew Vogt <matthew.vogt@nokia.com> | 2012-04-11 16:54:33 +1000 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-04-16 01:25:54 +0200 |
commit | f189b8934dc405cbd45258abc5aba2713428b1cc (patch) | |
tree | dd3d4f61c7337343705faf7a603585c287b8ae50 /src | |
parent | e00c40a89a1172add896e86e805a7cd42a4ea0c5 (diff) |
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: Glenn Watson <glenn.watson@nokia.com>
Diffstat (limited to 'src')
-rw-r--r-- | src/imports/particles/particles.pro | 2 | ||||
-rw-r--r-- | src/particles/particleresources/noise.png (renamed from src/quick/particles/particleresources/noise.png) | bin | 19477 -> 19477 bytes | |||
-rw-r--r-- | src/particles/particles.pri (renamed from src/quick/particles/particles.pri) | 3 | ||||
-rw-r--r-- | src/particles/particles.pro | 40 | ||||
-rw-r--r-- | src/particles/particles.qrc (renamed from src/quick/particles/particles.qrc) | 0 | ||||
-rw-r--r-- | src/particles/qquickage.cpp (renamed from src/quick/particles/qquickage.cpp) | 0 | ||||
-rw-r--r-- | src/particles/qquickage_p.h (renamed from src/quick/particles/qquickage_p.h) | 0 | ||||
-rw-r--r-- | src/particles/qquickangledirection.cpp (renamed from src/quick/particles/qquickangledirection.cpp) | 0 | ||||
-rw-r--r-- | src/particles/qquickangledirection_p.h (renamed from src/quick/particles/qquickangledirection_p.h) | 0 | ||||
-rw-r--r-- | src/particles/qquickcumulativedirection.cpp (renamed from src/quick/particles/qquickcumulativedirection.cpp) | 0 | ||||
-rw-r--r-- | src/particles/qquickcumulativedirection_p.h (renamed from src/quick/particles/qquickcumulativedirection_p.h) | 0 | ||||
-rw-r--r-- | src/particles/qquickcustomaffector.cpp (renamed from src/quick/particles/qquickcustomaffector.cpp) | 0 | ||||
-rw-r--r-- | src/particles/qquickcustomaffector_p.h (renamed from src/quick/particles/qquickcustomaffector_p.h) | 0 | ||||
-rw-r--r-- | src/particles/qquickcustomparticle.cpp (renamed from src/quick/particles/qquickcustomparticle.cpp) | 0 | ||||
-rw-r--r-- | src/particles/qquickcustomparticle_p.h (renamed from src/quick/particles/qquickcustomparticle_p.h) | 0 | ||||
-rw-r--r-- | src/particles/qquickdirection.cpp (renamed from src/quick/particles/qquickdirection.cpp) | 0 | ||||
-rw-r--r-- | src/particles/qquickdirection_p.h (renamed from src/quick/particles/qquickdirection_p.h) | 0 | ||||
-rw-r--r-- | src/particles/qquickellipseextruder.cpp (renamed from src/quick/particles/qquickellipseextruder.cpp) | 0 | ||||
-rw-r--r-- | src/particles/qquickellipseextruder_p.h (renamed from src/quick/particles/qquickellipseextruder_p.h) | 0 | ||||
-rw-r--r-- | src/particles/qquickfriction.cpp (renamed from src/quick/particles/qquickfriction.cpp) | 0 | ||||
-rw-r--r-- | src/particles/qquickfriction_p.h (renamed from src/quick/particles/qquickfriction_p.h) | 0 | ||||
-rw-r--r-- | src/particles/qquickgravity.cpp (renamed from src/quick/particles/qquickgravity.cpp) | 0 | ||||
-rw-r--r-- | src/particles/qquickgravity_p.h (renamed from src/quick/particles/qquickgravity_p.h) | 0 | ||||
-rw-r--r-- | src/particles/qquickgroupgoal.cpp (renamed from src/quick/particles/qquickgroupgoal.cpp) | 0 | ||||
-rw-r--r-- | src/particles/qquickgroupgoal_p.h (renamed from src/quick/particles/qquickgroupgoal_p.h) | 0 | ||||
-rw-r--r-- | src/particles/qquickimageparticle.cpp (renamed from src/quick/particles/qquickimageparticle.cpp) | 0 | ||||
-rw-r--r-- | src/particles/qquickimageparticle_p.h (renamed from src/quick/particles/qquickimageparticle_p.h) | 0 | ||||
-rw-r--r-- | src/particles/qquickitemparticle.cpp (renamed from src/quick/particles/qquickitemparticle.cpp) | 0 | ||||
-rw-r--r-- | src/particles/qquickitemparticle_p.h (renamed from src/quick/particles/qquickitemparticle_p.h) | 0 | ||||
-rw-r--r-- | src/particles/qquicklineextruder.cpp (renamed from src/quick/particles/qquicklineextruder.cpp) | 0 | ||||
-rw-r--r-- | src/particles/qquicklineextruder_p.h (renamed from src/quick/particles/qquicklineextruder_p.h) | 0 | ||||
-rw-r--r-- | src/particles/qquickmaskextruder.cpp (renamed from src/quick/particles/qquickmaskextruder.cpp) | 0 | ||||
-rw-r--r-- | src/particles/qquickmaskextruder_p.h (renamed from src/quick/particles/qquickmaskextruder_p.h) | 0 | ||||
-rw-r--r-- | src/particles/qquickparticleaffector.cpp (renamed from src/quick/particles/qquickparticleaffector.cpp) | 0 | ||||
-rw-r--r-- | src/particles/qquickparticleaffector_p.h (renamed from src/quick/particles/qquickparticleaffector_p.h) | 0 | ||||
-rw-r--r-- | src/particles/qquickparticleemitter.cpp (renamed from src/quick/particles/qquickparticleemitter.cpp) | 0 | ||||
-rw-r--r-- | src/particles/qquickparticleemitter_p.h (renamed from src/quick/particles/qquickparticleemitter_p.h) | 0 | ||||
-rw-r--r-- | src/particles/qquickparticleextruder.cpp (renamed from src/quick/particles/qquickparticleextruder.cpp) | 0 | ||||
-rw-r--r-- | src/particles/qquickparticleextruder_p.h (renamed from src/quick/particles/qquickparticleextruder_p.h) | 0 | ||||
-rw-r--r-- | src/particles/qquickparticlegroup.cpp (renamed from src/quick/particles/qquickparticlegroup.cpp) | 0 | ||||
-rw-r--r-- | src/particles/qquickparticlegroup_p.h (renamed from src/quick/particles/qquickparticlegroup_p.h) | 0 | ||||
-rw-r--r-- | src/particles/qquickparticlepainter.cpp (renamed from src/quick/particles/qquickparticlepainter.cpp) | 0 | ||||
-rw-r--r-- | src/particles/qquickparticlepainter_p.h (renamed from src/quick/particles/qquickparticlepainter_p.h) | 0 | ||||
-rw-r--r-- | src/particles/qquickparticlesmodule.cpp (renamed from src/quick/particles/qquickparticlesmodule.cpp) | 0 | ||||
-rw-r--r-- | src/particles/qquickparticlesmodule_p.h (renamed from src/quick/particles/qquickparticlesmodule_p.h) | 4 | ||||
-rw-r--r-- | src/particles/qquickparticlesystem.cpp (renamed from src/quick/particles/qquickparticlesystem.cpp) | 0 | ||||
-rw-r--r-- | src/particles/qquickparticlesystem_p.h (renamed from src/quick/particles/qquickparticlesystem_p.h) | 0 | ||||
-rw-r--r-- | src/particles/qquickpointattractor.cpp (renamed from src/quick/particles/qquickpointattractor.cpp) | 0 | ||||
-rw-r--r-- | src/particles/qquickpointattractor_p.h (renamed from src/quick/particles/qquickpointattractor_p.h) | 0 | ||||
-rw-r--r-- | src/particles/qquickpointdirection.cpp (renamed from src/quick/particles/qquickpointdirection.cpp) | 0 | ||||
-rw-r--r-- | src/particles/qquickpointdirection_p.h (renamed from src/quick/particles/qquickpointdirection_p.h) | 0 | ||||
-rw-r--r-- | src/particles/qquickrectangleextruder.cpp (renamed from src/quick/particles/qquickrectangleextruder.cpp) | 0 | ||||
-rw-r--r-- | src/particles/qquickrectangleextruder_p.h (renamed from src/quick/particles/qquickrectangleextruder_p.h) | 0 | ||||
-rw-r--r-- | src/particles/qquickspritegoal.cpp (renamed from src/quick/particles/qquickspritegoal.cpp) | 0 | ||||
-rw-r--r-- | src/particles/qquickspritegoal_p.h (renamed from src/quick/particles/qquickspritegoal_p.h) | 0 | ||||
-rw-r--r-- | src/particles/qquicktargetdirection.cpp (renamed from src/quick/particles/qquicktargetdirection.cpp) | 0 | ||||
-rw-r--r-- | src/particles/qquicktargetdirection_p.h (renamed from src/quick/particles/qquicktargetdirection_p.h) | 0 | ||||
-rw-r--r-- | src/particles/qquicktrailemitter.cpp (renamed from src/quick/particles/qquicktrailemitter.cpp) | 0 | ||||
-rw-r--r-- | src/particles/qquicktrailemitter_p.h (renamed from src/quick/particles/qquicktrailemitter_p.h) | 0 | ||||
-rw-r--r-- | src/particles/qquickturbulence.cpp (renamed from src/quick/particles/qquickturbulence.cpp) | 0 | ||||
-rw-r--r-- | src/particles/qquickturbulence_p.h (renamed from src/quick/particles/qquickturbulence_p.h) | 0 | ||||
-rw-r--r-- | src/particles/qquickv8particledata.cpp (renamed from src/quick/particles/qquickv8particledata.cpp) | 0 | ||||
-rw-r--r-- | src/particles/qquickv8particledata_p.h (renamed from src/quick/particles/qquickv8particledata_p.h) | 0 | ||||
-rw-r--r-- | src/particles/qquickwander.cpp (renamed from src/quick/particles/qquickwander.cpp) | 0 | ||||
-rw-r--r-- | src/particles/qquickwander_p.h (renamed from src/quick/particles/qquickwander_p.h) | 0 | ||||
-rw-r--r-- | src/particles/qtquickparticlesglobal_p.h | 69 | ||||
-rw-r--r-- | src/quick/items/qquickshadereffect_p.h | 3 | ||||
-rw-r--r-- | src/quick/items/qquickshadereffectnode_p.h | 5 | ||||
-rw-r--r-- | src/quick/items/qquickspriteengine_p.h | 9 | ||||
-rw-r--r-- | src/quick/quick.pro | 1 | ||||
-rw-r--r-- | src/quick/scenegraph/coreapi/qsggeometry.h | 2 | ||||
-rw-r--r-- | src/src.pro | 2 |
72 files changed, 126 insertions, 14 deletions
diff --git a/src/imports/particles/particles.pro b/src/imports/particles/particles.pro index dc3198d124..a9d0ece448 100644 --- a/src/imports/particles/particles.pro +++ b/src/imports/particles/particles.pro @@ -5,7 +5,7 @@ include(../qimportbase.pri) SOURCES += \ plugin.cpp -QT += quick-private qml-private +QT += quick-private quickparticles-private qml-private OTHER_FILES += \ qmldir diff --git a/src/quick/particles/particleresources/noise.png b/src/particles/particleresources/noise.png Binary files differindex 3c723e1a5a..3c723e1a5a 100644 --- a/src/quick/particles/particleresources/noise.png +++ b/src/particles/particleresources/noise.png diff --git a/src/quick/particles/particles.pri b/src/particles/particles.pri index 3a40a3b911..3e083ab291 100644 --- a/src/quick/particles/particles.pri +++ b/src/particles/particles.pri @@ -28,7 +28,8 @@ HEADERS += \ $$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 \ diff --git a/src/particles/particles.pro b/src/particles/particles.pro new file mode 100644 index 0000000000..3aff6bbcc0 --- /dev/null +++ b/src/particles/particles.pro @@ -0,0 +1,40 @@ +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) +} + diff --git a/src/quick/particles/particles.qrc b/src/particles/particles.qrc index 344f9489a4..344f9489a4 100644 --- a/src/quick/particles/particles.qrc +++ b/src/particles/particles.qrc diff --git a/src/quick/particles/qquickage.cpp b/src/particles/qquickage.cpp index 9f24cba3cc..9f24cba3cc 100644 --- a/src/quick/particles/qquickage.cpp +++ b/src/particles/qquickage.cpp diff --git a/src/quick/particles/qquickage_p.h b/src/particles/qquickage_p.h index 2ec8faae4b..2ec8faae4b 100644 --- a/src/quick/particles/qquickage_p.h +++ b/src/particles/qquickage_p.h diff --git a/src/quick/particles/qquickangledirection.cpp b/src/particles/qquickangledirection.cpp index e77c47362c..e77c47362c 100644 --- a/src/quick/particles/qquickangledirection.cpp +++ b/src/particles/qquickangledirection.cpp diff --git a/src/quick/particles/qquickangledirection_p.h b/src/particles/qquickangledirection_p.h index 84633cd40e..84633cd40e 100644 --- a/src/quick/particles/qquickangledirection_p.h +++ b/src/particles/qquickangledirection_p.h diff --git a/src/quick/particles/qquickcumulativedirection.cpp b/src/particles/qquickcumulativedirection.cpp index d7c4094297..d7c4094297 100644 --- a/src/quick/particles/qquickcumulativedirection.cpp +++ b/src/particles/qquickcumulativedirection.cpp diff --git a/src/quick/particles/qquickcumulativedirection_p.h b/src/particles/qquickcumulativedirection_p.h index e1675a18d8..e1675a18d8 100644 --- a/src/quick/particles/qquickcumulativedirection_p.h +++ b/src/particles/qquickcumulativedirection_p.h diff --git a/src/quick/particles/qquickcustomaffector.cpp b/src/particles/qquickcustomaffector.cpp index acec98192d..acec98192d 100644 --- a/src/quick/particles/qquickcustomaffector.cpp +++ b/src/particles/qquickcustomaffector.cpp diff --git a/src/quick/particles/qquickcustomaffector_p.h b/src/particles/qquickcustomaffector_p.h index 1266830f94..1266830f94 100644 --- a/src/quick/particles/qquickcustomaffector_p.h +++ b/src/particles/qquickcustomaffector_p.h diff --git a/src/quick/particles/qquickcustomparticle.cpp b/src/particles/qquickcustomparticle.cpp index 7d27e48c6b..7d27e48c6b 100644 --- a/src/quick/particles/qquickcustomparticle.cpp +++ b/src/particles/qquickcustomparticle.cpp diff --git a/src/quick/particles/qquickcustomparticle_p.h b/src/particles/qquickcustomparticle_p.h index f689091268..f689091268 100644 --- a/src/quick/particles/qquickcustomparticle_p.h +++ b/src/particles/qquickcustomparticle_p.h diff --git a/src/quick/particles/qquickdirection.cpp b/src/particles/qquickdirection.cpp index 4127d06be0..4127d06be0 100644 --- a/src/quick/particles/qquickdirection.cpp +++ b/src/particles/qquickdirection.cpp diff --git a/src/quick/particles/qquickdirection_p.h b/src/particles/qquickdirection_p.h index 651865a1f5..651865a1f5 100644 --- a/src/quick/particles/qquickdirection_p.h +++ b/src/particles/qquickdirection_p.h diff --git a/src/quick/particles/qquickellipseextruder.cpp b/src/particles/qquickellipseextruder.cpp index 083564e5cb..083564e5cb 100644 --- a/src/quick/particles/qquickellipseextruder.cpp +++ b/src/particles/qquickellipseextruder.cpp diff --git a/src/quick/particles/qquickellipseextruder_p.h b/src/particles/qquickellipseextruder_p.h index c2d0c634ab..c2d0c634ab 100644 --- a/src/quick/particles/qquickellipseextruder_p.h +++ b/src/particles/qquickellipseextruder_p.h diff --git a/src/quick/particles/qquickfriction.cpp b/src/particles/qquickfriction.cpp index d37d109f48..d37d109f48 100644 --- a/src/quick/particles/qquickfriction.cpp +++ b/src/particles/qquickfriction.cpp diff --git a/src/quick/particles/qquickfriction_p.h b/src/particles/qquickfriction_p.h index 3b06710529..3b06710529 100644 --- a/src/quick/particles/qquickfriction_p.h +++ b/src/particles/qquickfriction_p.h diff --git a/src/quick/particles/qquickgravity.cpp b/src/particles/qquickgravity.cpp index cf4f35eb72..cf4f35eb72 100644 --- a/src/quick/particles/qquickgravity.cpp +++ b/src/particles/qquickgravity.cpp diff --git a/src/quick/particles/qquickgravity_p.h b/src/particles/qquickgravity_p.h index a738fd3ef3..a738fd3ef3 100644 --- a/src/quick/particles/qquickgravity_p.h +++ b/src/particles/qquickgravity_p.h diff --git a/src/quick/particles/qquickgroupgoal.cpp b/src/particles/qquickgroupgoal.cpp index 0d7f15a9e1..0d7f15a9e1 100644 --- a/src/quick/particles/qquickgroupgoal.cpp +++ b/src/particles/qquickgroupgoal.cpp diff --git a/src/quick/particles/qquickgroupgoal_p.h b/src/particles/qquickgroupgoal_p.h index f553badbd6..f553badbd6 100644 --- a/src/quick/particles/qquickgroupgoal_p.h +++ b/src/particles/qquickgroupgoal_p.h diff --git a/src/quick/particles/qquickimageparticle.cpp b/src/particles/qquickimageparticle.cpp index d9eb6ed01b..d9eb6ed01b 100644 --- a/src/quick/particles/qquickimageparticle.cpp +++ b/src/particles/qquickimageparticle.cpp diff --git a/src/quick/particles/qquickimageparticle_p.h b/src/particles/qquickimageparticle_p.h index 4db2c9801a..4db2c9801a 100644 --- a/src/quick/particles/qquickimageparticle_p.h +++ b/src/particles/qquickimageparticle_p.h diff --git a/src/quick/particles/qquickitemparticle.cpp b/src/particles/qquickitemparticle.cpp index 91ef06fcb2..91ef06fcb2 100644 --- a/src/quick/particles/qquickitemparticle.cpp +++ b/src/particles/qquickitemparticle.cpp diff --git a/src/quick/particles/qquickitemparticle_p.h b/src/particles/qquickitemparticle_p.h index c7b8a2661e..c7b8a2661e 100644 --- a/src/quick/particles/qquickitemparticle_p.h +++ b/src/particles/qquickitemparticle_p.h diff --git a/src/quick/particles/qquicklineextruder.cpp b/src/particles/qquicklineextruder.cpp index f555de3f72..f555de3f72 100644 --- a/src/quick/particles/qquicklineextruder.cpp +++ b/src/particles/qquicklineextruder.cpp diff --git a/src/quick/particles/qquicklineextruder_p.h b/src/particles/qquicklineextruder_p.h index 6f2b2493a6..6f2b2493a6 100644 --- a/src/quick/particles/qquicklineextruder_p.h +++ b/src/particles/qquicklineextruder_p.h diff --git a/src/quick/particles/qquickmaskextruder.cpp b/src/particles/qquickmaskextruder.cpp index 50b71749c0..50b71749c0 100644 --- a/src/quick/particles/qquickmaskextruder.cpp +++ b/src/particles/qquickmaskextruder.cpp diff --git a/src/quick/particles/qquickmaskextruder_p.h b/src/particles/qquickmaskextruder_p.h index 8b6c3f0b2d..8b6c3f0b2d 100644 --- a/src/quick/particles/qquickmaskextruder_p.h +++ b/src/particles/qquickmaskextruder_p.h diff --git a/src/quick/particles/qquickparticleaffector.cpp b/src/particles/qquickparticleaffector.cpp index 0005af86af..0005af86af 100644 --- a/src/quick/particles/qquickparticleaffector.cpp +++ b/src/particles/qquickparticleaffector.cpp diff --git a/src/quick/particles/qquickparticleaffector_p.h b/src/particles/qquickparticleaffector_p.h index 4147488f87..4147488f87 100644 --- a/src/quick/particles/qquickparticleaffector_p.h +++ b/src/particles/qquickparticleaffector_p.h diff --git a/src/quick/particles/qquickparticleemitter.cpp b/src/particles/qquickparticleemitter.cpp index 035d66cbcd..035d66cbcd 100644 --- a/src/quick/particles/qquickparticleemitter.cpp +++ b/src/particles/qquickparticleemitter.cpp diff --git a/src/quick/particles/qquickparticleemitter_p.h b/src/particles/qquickparticleemitter_p.h index eb9e1fd591..eb9e1fd591 100644 --- a/src/quick/particles/qquickparticleemitter_p.h +++ b/src/particles/qquickparticleemitter_p.h diff --git a/src/quick/particles/qquickparticleextruder.cpp b/src/particles/qquickparticleextruder.cpp index 279f7c05f3..279f7c05f3 100644 --- a/src/quick/particles/qquickparticleextruder.cpp +++ b/src/particles/qquickparticleextruder.cpp diff --git a/src/quick/particles/qquickparticleextruder_p.h b/src/particles/qquickparticleextruder_p.h index e24950e4e8..e24950e4e8 100644 --- a/src/quick/particles/qquickparticleextruder_p.h +++ b/src/particles/qquickparticleextruder_p.h diff --git a/src/quick/particles/qquickparticlegroup.cpp b/src/particles/qquickparticlegroup.cpp index 9a165074a1..9a165074a1 100644 --- a/src/quick/particles/qquickparticlegroup.cpp +++ b/src/particles/qquickparticlegroup.cpp diff --git a/src/quick/particles/qquickparticlegroup_p.h b/src/particles/qquickparticlegroup_p.h index 8889187558..8889187558 100644 --- a/src/quick/particles/qquickparticlegroup_p.h +++ b/src/particles/qquickparticlegroup_p.h diff --git a/src/quick/particles/qquickparticlepainter.cpp b/src/particles/qquickparticlepainter.cpp index e490b70240..e490b70240 100644 --- a/src/quick/particles/qquickparticlepainter.cpp +++ b/src/particles/qquickparticlepainter.cpp diff --git a/src/quick/particles/qquickparticlepainter_p.h b/src/particles/qquickparticlepainter_p.h index 1ae4625856..1ae4625856 100644 --- a/src/quick/particles/qquickparticlepainter_p.h +++ b/src/particles/qquickparticlepainter_p.h diff --git a/src/quick/particles/qquickparticlesmodule.cpp b/src/particles/qquickparticlesmodule.cpp index e83cde3cd1..e83cde3cd1 100644 --- a/src/quick/particles/qquickparticlesmodule.cpp +++ b/src/particles/qquickparticlesmodule.cpp diff --git a/src/quick/particles/qquickparticlesmodule_p.h b/src/particles/qquickparticlesmodule_p.h index 23a40488cf..87e99fa6bb 100644 --- a/src/quick/particles/qquickparticlesmodule_p.h +++ b/src/particles/qquickparticlesmodule_p.h @@ -42,13 +42,13 @@ #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(); diff --git a/src/quick/particles/qquickparticlesystem.cpp b/src/particles/qquickparticlesystem.cpp index 4fd6108f2f..4fd6108f2f 100644 --- a/src/quick/particles/qquickparticlesystem.cpp +++ b/src/particles/qquickparticlesystem.cpp diff --git a/src/quick/particles/qquickparticlesystem_p.h b/src/particles/qquickparticlesystem_p.h index f70cc5af94..f70cc5af94 100644 --- a/src/quick/particles/qquickparticlesystem_p.h +++ b/src/particles/qquickparticlesystem_p.h diff --git a/src/quick/particles/qquickpointattractor.cpp b/src/particles/qquickpointattractor.cpp index a54ee41c1e..a54ee41c1e 100644 --- a/src/quick/particles/qquickpointattractor.cpp +++ b/src/particles/qquickpointattractor.cpp diff --git a/src/quick/particles/qquickpointattractor_p.h b/src/particles/qquickpointattractor_p.h index 85b7a9aa30..85b7a9aa30 100644 --- a/src/quick/particles/qquickpointattractor_p.h +++ b/src/particles/qquickpointattractor_p.h diff --git a/src/quick/particles/qquickpointdirection.cpp b/src/particles/qquickpointdirection.cpp index e35eb4854c..e35eb4854c 100644 --- a/src/quick/particles/qquickpointdirection.cpp +++ b/src/particles/qquickpointdirection.cpp diff --git a/src/quick/particles/qquickpointdirection_p.h b/src/particles/qquickpointdirection_p.h index 7b18e6d8d7..7b18e6d8d7 100644 --- a/src/quick/particles/qquickpointdirection_p.h +++ b/src/particles/qquickpointdirection_p.h diff --git a/src/quick/particles/qquickrectangleextruder.cpp b/src/particles/qquickrectangleextruder.cpp index ad2207ca9a..ad2207ca9a 100644 --- a/src/quick/particles/qquickrectangleextruder.cpp +++ b/src/particles/qquickrectangleextruder.cpp diff --git a/src/quick/particles/qquickrectangleextruder_p.h b/src/particles/qquickrectangleextruder_p.h index 1d4f8cc439..1d4f8cc439 100644 --- a/src/quick/particles/qquickrectangleextruder_p.h +++ b/src/particles/qquickrectangleextruder_p.h diff --git a/src/quick/particles/qquickspritegoal.cpp b/src/particles/qquickspritegoal.cpp index 95d913cafa..95d913cafa 100644 --- a/src/quick/particles/qquickspritegoal.cpp +++ b/src/particles/qquickspritegoal.cpp diff --git a/src/quick/particles/qquickspritegoal_p.h b/src/particles/qquickspritegoal_p.h index 2b6b4f28fc..2b6b4f28fc 100644 --- a/src/quick/particles/qquickspritegoal_p.h +++ b/src/particles/qquickspritegoal_p.h diff --git a/src/quick/particles/qquicktargetdirection.cpp b/src/particles/qquicktargetdirection.cpp index 695684dfde..695684dfde 100644 --- a/src/quick/particles/qquicktargetdirection.cpp +++ b/src/particles/qquicktargetdirection.cpp diff --git a/src/quick/particles/qquicktargetdirection_p.h b/src/particles/qquicktargetdirection_p.h index 0e0e942ca8..0e0e942ca8 100644 --- a/src/quick/particles/qquicktargetdirection_p.h +++ b/src/particles/qquicktargetdirection_p.h diff --git a/src/quick/particles/qquicktrailemitter.cpp b/src/particles/qquicktrailemitter.cpp index 32f8763599..32f8763599 100644 --- a/src/quick/particles/qquicktrailemitter.cpp +++ b/src/particles/qquicktrailemitter.cpp diff --git a/src/quick/particles/qquicktrailemitter_p.h b/src/particles/qquicktrailemitter_p.h index 0b63a444ec..0b63a444ec 100644 --- a/src/quick/particles/qquicktrailemitter_p.h +++ b/src/particles/qquicktrailemitter_p.h diff --git a/src/quick/particles/qquickturbulence.cpp b/src/particles/qquickturbulence.cpp index 18ecc6a4cd..18ecc6a4cd 100644 --- a/src/quick/particles/qquickturbulence.cpp +++ b/src/particles/qquickturbulence.cpp diff --git a/src/quick/particles/qquickturbulence_p.h b/src/particles/qquickturbulence_p.h index cd5535c387..cd5535c387 100644 --- a/src/quick/particles/qquickturbulence_p.h +++ b/src/particles/qquickturbulence_p.h diff --git a/src/quick/particles/qquickv8particledata.cpp b/src/particles/qquickv8particledata.cpp index 8e50e41091..8e50e41091 100644 --- a/src/quick/particles/qquickv8particledata.cpp +++ b/src/particles/qquickv8particledata.cpp diff --git a/src/quick/particles/qquickv8particledata_p.h b/src/particles/qquickv8particledata_p.h index 21ec6458c1..21ec6458c1 100644 --- a/src/quick/particles/qquickv8particledata_p.h +++ b/src/particles/qquickv8particledata_p.h diff --git a/src/quick/particles/qquickwander.cpp b/src/particles/qquickwander.cpp index 0f9a5f069b..0f9a5f069b 100644 --- a/src/quick/particles/qquickwander.cpp +++ b/src/particles/qquickwander.cpp diff --git a/src/quick/particles/qquickwander_p.h b/src/particles/qquickwander_p.h index bb418f7912..bb418f7912 100644 --- a/src/quick/particles/qquickwander_p.h +++ b/src/particles/qquickwander_p.h diff --git a/src/particles/qtquickparticlesglobal_p.h b/src/particles/qtquickparticlesglobal_p.h new file mode 100644 index 0000000000..d7814f759d --- /dev/null +++ b/src/particles/qtquickparticlesglobal_p.h @@ -0,0 +1,69 @@ +/**************************************************************************** +** +** 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 diff --git a/src/quick/items/qquickshadereffect_p.h b/src/quick/items/qquickshadereffect_p.h index 32f12fad30..9734c3bf46 100644 --- a/src/quick/items/qquickshadereffect_p.h +++ b/src/quick/items/qquickshadereffect_p.h @@ -45,6 +45,7 @@ #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" @@ -63,7 +64,7 @@ class QSignalMapper; class QQuickCustomMaterialShader; // Common class for QQuickShaderEffect and QQuickCustomParticle. -struct QQuickShaderEffectCommon +struct Q_QUICK_PRIVATE_EXPORT QQuickShaderEffectCommon { typedef QQuickShaderEffectMaterialKey Key; typedef QQuickShaderEffectMaterial::UniformData UniformData; diff --git a/src/quick/items/qquickshadereffectnode_p.h b/src/quick/items/qquickshadereffectnode_p.h index 1bbce86426..2b2aab5365 100644 --- a/src/quick/items/qquickshadereffectnode_p.h +++ b/src/quick/items/qquickshadereffectnode_p.h @@ -46,6 +46,7 @@ #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> @@ -73,7 +74,7 @@ uint qHash(const QQuickShaderEffectMaterialKey &key); class QQuickCustomMaterialShader; class QQuickShaderEffectNode; -class QQuickShaderEffectMaterial : public QSGMaterial +class Q_QUICK_PRIVATE_EXPORT QQuickShaderEffectMaterial : public QSGMaterial { public: struct UniformData @@ -127,7 +128,7 @@ protected: class QSGShaderEffectMesh; -class QQuickShaderEffectNode : public QObject, public QSGGeometryNode +class Q_QUICK_PRIVATE_EXPORT QQuickShaderEffectNode : public QObject, public QSGGeometryNode { Q_OBJECT public: diff --git a/src/quick/items/qquickspriteengine_p.h b/src/quick/items/qquickspriteengine_p.h index 00cefbfbc0..f6ef79ca50 100644 --- a/src/quick/items/qquickspriteengine_p.h +++ b/src/quick/items/qquickspriteengine_p.h @@ -50,14 +50,15 @@ #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) @@ -173,7 +174,7 @@ private: 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? @@ -252,7 +253,7 @@ protected: bool m_addAdvance; }; -class QQuickSpriteEngine : public QQuickStochasticEngine +class Q_QUICK_PRIVATE_EXPORT QQuickSpriteEngine : public QQuickStochasticEngine { Q_OBJECT Q_PROPERTY(QQmlListProperty<QQuickSprite> sprites READ sprites) diff --git a/src/quick/quick.pro b/src/quick/quick.pro index 0f0120ee79..87d4c90509 100644 --- a/src/quick/quick.pro +++ b/src/quick/quick.pro @@ -22,7 +22,6 @@ load(qt_module_config) include(util/util.pri) include(scenegraph/scenegraph.pri) include(items/items.pri) -include(particles/particles.pri) include(designer/designer.pri) HEADERS += \ diff --git a/src/quick/scenegraph/coreapi/qsggeometry.h b/src/quick/scenegraph/coreapi/qsggeometry.h index 3a3d87a233..a11ec42976 100644 --- a/src/quick/scenegraph/coreapi/qsggeometry.h +++ b/src/quick/scenegraph/coreapi/qsggeometry.h @@ -56,7 +56,7 @@ class Q_QUICK_EXPORT QSGGeometry { public: - struct Attribute + struct Q_QUICK_EXPORT Attribute { int position; int tupleSize; diff --git a/src/src.pro b/src/src.pro index 0246eea409..7631910c3c 100644 --- a/src/src.pro +++ b/src/src.pro @@ -1,6 +1,6 @@ TEMPLATE = subdirs CONFIG += ordered -SUBDIRS += qml quick plugins +SUBDIRS += qml quick particles plugins contains(QT_CONFIG, qmltest): SUBDIRS += qmltest |