diff options
| author | Lars Knoll <lars.knoll@nokia.com> | 2011-08-31 14:03:16 +0200 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@nokia.com> | 2011-08-31 14:03:16 +0200 |
| commit | 20c3575fc39004d6a556820543982f4a6ebef0be (patch) | |
| tree | 9d8be9faae42972c85f0e296cc6dcaf27c3fcc4e /src/declarative/declarative.pro | |
| parent | 71478352376022faa9be6d79f2a760c289945ff5 (diff) | |
| parent | 3108a36914d59d8a0d15bfdb2b5bbb09aa6e54a2 (diff) | |
Merge remote-tracking branch 'origin/master' into refactor
Conflicts:
src/declarative/declarative.pro
Change-Id: I9c6d8447e1254c6acd32fa0775ff6a79d0d66acd
Diffstat (limited to 'src/declarative/declarative.pro')
| -rw-r--r-- | src/declarative/declarative.pro | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/declarative/declarative.pro b/src/declarative/declarative.pro index 5db77a79dd..d0a3f01148 100644 --- a/src/declarative/declarative.pro +++ b/src/declarative/declarative.pro @@ -8,7 +8,6 @@ MODULE_PRI += ../../modules/qt_declarative.pri QT = core-private gui gui-private network widgets-private sql v8-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 solaris-cc*:QMAKE_CXXFLAGS_RELEASE -= -O2 |