diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2016-02-12 16:08:03 +0100 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2016-02-25 16:47:28 +0000 |
| commit | 09a9519d7c7e9a3cfe42ee8b9216fa55cb2b576b (patch) | |
| tree | ed59c3a9c0f3d87fc086398007fc78312f8e20f0 /src/qml/qml.pro | |
| parent | 517d7eadaa8bd7dbc61f9247e8f67ee5eac493a9 (diff) | |
consistently put {qt,qml}_{module,plugin} at the end of project files
this fixes static builds by ensuring that all dependencies are exported.
Task-number: QTBUG-51071
Change-Id: I5928f853a1d13b6a73533f9c6f6eae9da0e52a26
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
Diffstat (limited to 'src/qml/qml.pro')
| -rw-r--r-- | src/qml/qml.pro | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/qml/qml.pro b/src/qml/qml.pro index d75262bf0b..e30c39c8b9 100644 --- a/src/qml/qml.pro +++ b/src/qml/qml.pro @@ -11,9 +11,6 @@ solaris-cc*:QMAKE_CXXFLAGS_RELEASE -= -O2 # Ensure this gcc optimization is switched off for mips platforms to avoid trouble with JIT. gcc:isEqual(QT_ARCH, "mips"): QMAKE_CXXFLAGS += -fno-reorder-blocks -MODULE_PLUGIN_TYPES = \ - qmltooling - exists("qqml_enable_gcov") { QMAKE_CXXFLAGS = -fprofile-arcs -ftest-coverage -fno-elide-constructors LIBS_PRIVATE += -lgcov @@ -29,8 +26,6 @@ greaterThan(QT_CLANG_MAJOR_VERSION, 3)|greaterThan(QT_CLANG_MINOR_VERSION, 3)| \ if(equals(QT_APPLE_CLANG_MAJOR_VERSION, 5):greaterThan(QT_APPLE_CLANG_MINOR_VERSION, 0)): \ WERROR += -Wno-error=unused-const-variable -load(qt_module) - HEADERS += qtqmlglobal.h \ qtqmlglobal_p.h @@ -46,3 +41,7 @@ include(qml/qml.pri) include(debugger/debugger.pri) include(animations/animations.pri) include(types/types.pri) + +MODULE_PLUGIN_TYPES = \ + qmltooling +load(qt_module) |