diff options
| author | Gunnar Sletta <gunnar.sletta@nokia.com> | 2011-05-04 11:38:59 +0200 |
|---|---|---|
| committer | Gunnar Sletta <gunnar.sletta@nokia.com> | 2011-05-04 11:38:59 +0200 |
| commit | 01285af37aafa00a1bf3fbd7654b1ec5e057775d (patch) | |
| tree | b3c421716c3bc6892b565a096a8ec5be837cd267 /src/declarative/declarative.pro | |
| parent | 16f58282bc5a1f81f7346ac6560df68761ad277d (diff) | |
| parent | dbbcc4dff099d5cf41a3253f922b785889e17545 (diff) | |
Merge branch 'master' into qtquick2
Conflicts:
src/imports/particles/particles.pro
Diffstat (limited to 'src/declarative/declarative.pro')
| -rw-r--r-- | src/declarative/declarative.pro | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/declarative/declarative.pro b/src/declarative/declarative.pro index 8a0ae71919..0a1f76a251 100644 --- a/src/declarative/declarative.pro +++ b/src/declarative/declarative.pro @@ -2,7 +2,11 @@ load(qt_module) TARGET = QtDeclarative QPRO_PWD = $$PWD -QT = core gui script network + +CONFIG += module +MODULE_PRI += ../../modules/qt_declarative.pri + +QT = core-private gui-private script-private network script opengl-private contains(QT_CONFIG, svg): QT += svg DEFINES += QT_BUILD_DECLARATIVE_LIB QT_NO_URL_CAST_FROM_STRING win32-msvc*|win32-icc:QMAKE_LFLAGS += /BASE:0x66000000 |