diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2012-06-26 17:59:46 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2012-06-26 17:59:46 +0200 |
| commit | 4189a0d294999246f5a9680d348a1d160d4f591c (patch) | |
| tree | f0ca75c7dcee691b5ff98f55991dcdf635d19f4c /src/particles | |
| parent | bdefc3a2a8f8d91a48f822e2281670d8a6b9efbc (diff) | |
| parent | 489651ef7f0e17e210e8a85f8fa95617d14ca7cf (diff) | |
Merge branch 'buildsystem'
Change-Id: I230e776290761be7c811c3aec4d915367012fc99
Diffstat (limited to 'src/particles')
| -rw-r--r-- | src/particles/particles.pro | 6 | ||||
| -rw-r--r-- | src/particles/qtquickparticlesglobal_p.h | 2 |
2 files changed, 3 insertions, 5 deletions
diff --git a/src/particles/particles.pro b/src/particles/particles.pro index 4a3b868c05..1daaf99c0f 100644 --- a/src/particles/particles.pro +++ b/src/particles/particles.pro @@ -1,14 +1,12 @@ -load(qt_module) +load(qt_build_config) TARGET = QtQuickParticles -CONFIG += module CONFIG += dll warn_on -MODULE_PRI = ../../modules/qt_quickparticles.pri 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 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 |