diff options
| author | Andy Shaw <andy.shaw@digia.com> | 2014-03-28 11:12:05 +0100 |
|---|---|---|
| committer | Andy Shaw <andy.shaw@digia.com> | 2014-04-11 12:55:56 +0300 |
| commit | 743754a36d25c3f529603b1f404a131982c897f6 (patch) | |
| tree | 9e6701a267d322c489aecbb66c3fc665bc5a015f /plugins | |
| parent | 1b2e5857f541f57351e8e7e692e579e8b5c663ac (diff) | |
Fix build for iOS and for building the QtQuick 2 plugin statically
When building statically then static will be set not staticlib, therefore
we need to ensure we check for static in those cases. And also protect
against Mac specific flags when building for iOS.
Task-number: QTRD-3036
Change-Id: Ib2c534974ad9292e3634b8b692344c71e26e56cd
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/declarative/declarative.pri | 2 | ||||
| -rw-r--r-- | plugins/declarative/plugin.cpp | 4 | ||||
| -rw-r--r-- | plugins/quick2/qmldir | 1 | ||||
| -rw-r--r-- | plugins/quick2/quick2.pro | 3 |
4 files changed, 6 insertions, 4 deletions
diff --git a/plugins/declarative/declarative.pri b/plugins/declarative/declarative.pri index e862809f..e652c7c4 100644 --- a/plugins/declarative/declarative.pri +++ b/plugins/declarative/declarative.pri @@ -9,7 +9,7 @@ contains(DEFINES, CHARTS_FOR_QUICK2) { } INCLUDEPATH += $$CHART_BUILD_PRIVATE_HEADER_DIR - +ios:CONFIG(iphonesimulator, iphonesimulator|iphoneos):TARGET = $$join(TARGET,,,_iphonesimulator) CONFIG(debug, debug|release) { mac: TARGET = $$join(TARGET,,,_debug) win32: TARGET = $$join(TARGET,,,d) diff --git a/plugins/declarative/plugin.cpp b/plugins/declarative/plugin.cpp index c801a32d..01de104a 100644 --- a/plugins/declarative/plugin.cpp +++ b/plugins/declarative/plugin.cpp @@ -241,10 +241,10 @@ public: } }; -#include "plugin.moc" - QTCOMMERCIALCHART_END_NAMESPACE +#include "plugin.moc" + QTCOMMERCIALCHART_USE_NAMESPACE #if (QT_VERSION < QT_VERSION_CHECK(5, 0, 0)) diff --git a/plugins/quick2/qmldir b/plugins/quick2/qmldir index 90d4edb8..d0035f70 100644 --- a/plugins/quick2/qmldir +++ b/plugins/quick2/qmldir @@ -1,2 +1,3 @@ module QtCommercial.Chart plugin qtcommercialchartqml2 +classname ChartQmlPlugin diff --git a/plugins/quick2/quick2.pro b/plugins/quick2/quick2.pro index 12e9d45b..235ebc2c 100644 --- a/plugins/quick2/quick2.pro +++ b/plugins/quick2/quick2.pro @@ -7,4 +7,5 @@ DEFINES += CHARTS_FOR_QUICK2 error( "Couldn't find the declarative.pri file!" ) } qmldir.files += plugins.qmltypes - +TARGETPATH = QtCommercial.Chart +QMAKE_MOC_OPTIONS += -Muri=$$TARGETPATH |