diff options
| author | Matthew Vogt <matthew.vogt@nokia.com> | 2012-02-16 14:43:03 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-02-24 04:51:31 +0100 |
| commit | b855240b782395f94315f43ea3e7e182299fac48 (patch) | |
| tree | bc594c04449be8cd14cd0ab0bb72dafc2be0ffb2 /src/quick/quick.pro | |
| parent | 6a42a6e0a9a1abdda0d07a5a20b4ac7e45348684 (diff) | |
Rename QDeclarative symbols to QQuick and QQml
Symbols beginning with QDeclarative are already exported
by the quick1 module.
Users can apply the bin/rename-qtdeclarative-symbols.sh
script to modify client code using the previous names of the
renamed symbols.
Task-number: QTBUG-23737
Change-Id: Ifaa482663767634931e8711a8e9bf6e404859e66
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Diffstat (limited to 'src/quick/quick.pro')
| -rw-r--r-- | src/quick/quick.pro | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/quick/quick.pro b/src/quick/quick.pro index b445e84248..0f0120ee79 100644 --- a/src/quick/quick.pro +++ b/src/quick/quick.pro @@ -6,13 +6,13 @@ CONFIG += module CONFIG += dll warn_on MODULE_PRI = ../../modules/qt_quick.pri -QT = core-private gui gui-private network v8-private declarative declarative-private +QT = core-private gui gui-private network v8-private qml qml-private DEFINES += QT_BUILD_QUICK_LIB QT_NO_URL_CAST_FROM_STRING QT_NO_INTEGER_EVENT_COORDINATES win32-msvc*:DEFINES *= _CRT_SECURE_NO_WARNINGS solaris-cc*:QMAKE_CXXFLAGS_RELEASE -= -O2 -exists("qdeclarative_enable_gcov") { +exists("qqml_enable_gcov") { QMAKE_CXXFLAGS = -fprofile-arcs -ftest-coverage -fno-elide-constructors LIBS += -lgcov } @@ -36,12 +36,12 @@ mac { # FIXME: this is a workaround for broken qmake logic in qtAddModule() # This function refuses to use frameworks unless the framework exists on # the filesystem at the time qmake is run, resulting in a build failure - # if QtQuick is qmaked before QtDeclarative is built and frameworks are + # if QtQuick is qmaked before QtQml is built and frameworks are # in use. qtAddLibrary() contains correct logic to deal with this, so # we'll explicitly call that for now. load(qt) - LIBS -= -lQtDeclarative # in non-framework builds, these should be re-added - LIBS -= -lQtDeclarative_debug # within the qtAddLibrary if appropriate, so no - qtAddLibrary(QtDeclarative) # harm done :) + LIBS -= -lQtQml # in non-framework builds, these should be re-added + LIBS -= -lQtQml_debug # within the qtAddLibrary if appropriate, so no + qtAddLibrary(QtQml) # harm done :) } |