From 4acac5ddf1e123d1436011a9ec911e89014a4798 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Tue, 3 Apr 2012 19:31:05 +0200 Subject: auto-generate module pris Change-Id: I90090bcf60ecc2c3fb31a38129edeae8ff0f1c55 Reviewed-by: Joerg Bornemann --- src/particles/particles.pro | 1 - 1 file changed, 1 deletion(-) (limited to 'src/particles') diff --git a/src/particles/particles.pro b/src/particles/particles.pro index 4a3b868c05..399f4d3428 100644 --- a/src/particles/particles.pro +++ b/src/particles/particles.pro @@ -4,7 +4,6 @@ TARGET = QtQuickParticles CONFIG += module CONFIG += dll warn_on -MODULE_PRI = ../../modules/qt_quickparticles.pri QT = core-private gui-private qml-private quick-private -- cgit v1.2.3 From 27416448a1c3259ecad80172ba35ab9aa504a78d Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Wed, 11 Apr 2012 21:53:15 +0200 Subject: use auto-defined QT_BUILD_*_LIB variables Change-Id: Iefe0b0982ee482bc47b4f66e514a7d0900674e42 Reviewed-by: Alan Alpert --- src/particles/qtquickparticlesglobal_p.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/particles') diff --git a/src/particles/qtquickparticlesglobal_p.h b/src/particles/qtquickparticlesglobal_p.h index d7814f759d..03773273fb 100644 --- a/src/particles/qtquickparticlesglobal_p.h +++ b/src/particles/qtquickparticlesglobal_p.h @@ -48,7 +48,7 @@ #if defined(Q_OS_WIN) # if defined(QT_MAKEDLL) /* create a Qt DLL library */ -# if defined(QT_BUILD_QUICKPARTICLES_LIB) +# if defined(QT_BUILD_PARTICLES_LIB) # define Q_QUICKPARTICLES_PRIVATE_EXPORT Q_DECL_EXPORT # else # define Q_QUICKPARTICLES_PRIVATE_EXPORT Q_DECL_IMPORT -- cgit v1.2.3 From 489651ef7f0e17e210e8a85f8fa95617d14ca7cf Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Thu, 12 Apr 2012 12:09:53 +0200 Subject: build system cleanups - load(qt_module) => load(qt_build_config) - remove: - CONFIG+=module (obsolete) - setup of PKGCONFIG* variables (automated now) - code relating to module version headers (automated now) - %mastercontent assignment (automated now) - QT_BUILD_*_LIB defines (automated now) - pointless QPRO_PWD assignments - pointless and commented out include and depend paths - qmake -project boilerplate Change-Id: Ib2d80a375e88bae1b50a22a274374b7e2cc2a86c Reviewed-by: Alan Alpert --- src/particles/particles.pro | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'src/particles') diff --git a/src/particles/particles.pro b/src/particles/particles.pro index 399f4d3428..1daaf99c0f 100644 --- a/src/particles/particles.pro +++ b/src/particles/particles.pro @@ -1,13 +1,12 @@ -load(qt_module) +load(qt_build_config) TARGET = QtQuickParticles -CONFIG += module CONFIG += dll warn_on QT = core-private gui-private qml-private quick-private -DEFINES += QT_BUILD_QUICKPARTICLES_LIB QT_NO_URL_CAST_FROM_STRING QT_NO_INTEGER_EVENT_COORDINATES +DEFINES += QT_NO_URL_CAST_FROM_STRING QT_NO_INTEGER_EVENT_COORDINATES win32-msvc*:DEFINES *= _CRT_SECURE_NO_WARNINGS solaris-cc*:QMAKE_CXXFLAGS_RELEASE -= -O2 -- cgit v1.2.3