diff options
| author | Gunnar Sletta <gunnar.sletta@nokia.com> | 2011-08-11 16:03:12 +0200 |
|---|---|---|
| committer | Gunnar Sletta <gunnar.sletta@nokia.com> | 2011-08-11 16:03:12 +0200 |
| commit | f9949f501890a7f8289fcbda85d3a4085bdbb21a (patch) | |
| tree | 759e57bb3ed156e46a98c3a4223951c3edc55d43 /src/qtquick1/qtquick1.pro | |
| parent | 1ddef09c351f2899b1662ddd1de190c0d0a8b7bf (diff) | |
| parent | 3e0c19d5ba0e4826c3f036c3172d8ea0e30530a6 (diff) | |
Merge branch 'master' into refactor
Conflicts:
src/declarative/declarative.pro
src/imports/gestures/gestures.pro
src/imports/inputcontext/inputcontext.pro
src/qtquick1/graphicsitems/qdeclarativeitem.cpp
src/qtquick1/qtquick1.pro
Change-Id: I782be7090d8b6da9c890bc8e778722da93da8037
Diffstat (limited to 'src/qtquick1/qtquick1.pro')
| -rw-r--r-- | src/qtquick1/qtquick1.pro | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/qtquick1/qtquick1.pro b/src/qtquick1/qtquick1.pro index e7db6062fb..2e3113e214 100644 --- a/src/qtquick1/qtquick1.pro +++ b/src/qtquick1/qtquick1.pro @@ -7,8 +7,7 @@ CONFIG += module CONFIG += dll warn_on MODULE_PRI += ../../modules/qt_qtquick1.pri -QT += testlib-private declarative script testlib declarative-private core-private gui-private script-private network widgets-private -DEFINES += QT_NO_URL_CAST_FROM_STRING +QT += testlib-private declarative testlib declarative-private core-private gui-private network widgets-private load(qt_module_config) |