diff options
| author | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2014-01-10 15:08:47 +0200 |
|---|---|---|
| committer | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2014-01-13 08:17:56 +0200 |
| commit | 99d7cbbb8887382ea17dcbeb90a8d768bb9ebdb5 (patch) | |
| tree | ce0563bbde0c8a5f391479d180755ca212cfbcff /src/datavisualizationqml2 | |
| parent | b05e4498bdb82a32ba9d82fd6fc65727b99e745d (diff) | |
Improve static build support.
Now qml plugin can also be built statically.
Change-Id: Id37f565ab9e02529fafaffa024acd69560b3703a
Reviewed-by: Mika Salmela <mika.salmela@digia.com>
Diffstat (limited to 'src/datavisualizationqml2')
4 files changed, 8 insertions, 3 deletions
diff --git a/src/datavisualizationqml2/datavisualizationqml2.pro b/src/datavisualizationqml2/datavisualizationqml2.pro index 7c456586..6396b86b 100644 --- a/src/datavisualizationqml2/datavisualizationqml2.pro +++ b/src/datavisualizationqml2/datavisualizationqml2.pro @@ -8,7 +8,11 @@ uri = QtDataVisualization static { DEFINES += QT_DATAVISUALIZATION_STATICLIB - CONFIG -= static staticlib + # Only build qml plugin static if Qt itself is also built static + !contains(QT_CONFIG, static): CONFIG -= static staticlib + + # Insert the plugin URI into its meta data to enable static plugin usage + QMAKE_MOC_OPTIONS += -Muri=$$uri } INCLUDEPATH += ../../include \ diff --git a/src/datavisualizationqml2/datavisualizationqml2_plugin.cpp b/src/datavisualizationqml2/datavisualizationqml2_plugin.cpp index 93aa2eea..a103d847 100644 --- a/src/datavisualizationqml2/datavisualizationqml2_plugin.cpp +++ b/src/datavisualizationqml2/datavisualizationqml2_plugin.cpp @@ -22,7 +22,7 @@ QT_DATAVISUALIZATION_BEGIN_NAMESPACE -void Datavis3Dqml2Plugin::registerTypes(const char *uri) +void QtDataVisualizationQml2Plugin::registerTypes(const char *uri) { // @uri QtDataVisualization qmlRegisterUncreatableType<const QAbstractItemModel>(uri, 1, 0, "AbstractItemModel", diff --git a/src/datavisualizationqml2/datavisualizationqml2_plugin.h b/src/datavisualizationqml2/datavisualizationqml2_plugin.h index e01a39f4..fcf5bddf 100644 --- a/src/datavisualizationqml2/datavisualizationqml2_plugin.h +++ b/src/datavisualizationqml2/datavisualizationqml2_plugin.h @@ -95,7 +95,7 @@ QML_DECLARE_TYPE(QAbstract3DInputHandler) QT_DATAVISUALIZATION_BEGIN_NAMESPACE -class Datavis3Dqml2Plugin : public QQmlExtensionPlugin +class QtDataVisualizationQml2Plugin : public QQmlExtensionPlugin { Q_OBJECT Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface") diff --git a/src/datavisualizationqml2/qmldir b/src/datavisualizationqml2/qmldir index 601861d8..bbd17868 100644 --- a/src/datavisualizationqml2/qmldir +++ b/src/datavisualizationqml2/qmldir @@ -1,3 +1,4 @@ module QtDataVisualization plugin datavisualizationqml2 +classname QtDataVisualizationQml2Plugin |