diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2016-02-12 16:46:17 +0100 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2016-02-25 16:55:56 +0000 |
| commit | 36a22f2c48f7df34c71b2177ff9c8b65daef614c (patch) | |
| tree | e21cb3e7d1bf4011543a6cf182b305443138b63f | |
| parent | a9ac71a443260de66f720f0184646847b03fcb46 (diff) | |
| download | qtsvg-36a22f2c48f7df34c71b2177ff9c8b65daef614c.tar.gz | |
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: I20b0d2c018e3adce10629aee3fa055df437df71c
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
| -rw-r--r-- | src/plugins/iconengines/svgiconengine/svgiconengine.pro | 10 | ||||
| -rw-r--r-- | src/plugins/imageformats/svg/svg.pro | 10 | ||||
| -rw-r--r-- | src/svg/svg.pro | 3 |
3 files changed, 12 insertions, 11 deletions
diff --git a/src/plugins/iconengines/svgiconengine/svgiconengine.pro b/src/plugins/iconengines/svgiconengine/svgiconengine.pro index 516142b..eb6847b 100644 --- a/src/plugins/iconengines/svgiconengine/svgiconengine.pro +++ b/src/plugins/iconengines/svgiconengine/svgiconengine.pro @@ -1,12 +1,12 @@ TARGET = qsvgicon -PLUGIN_TYPE = iconengines -PLUGIN_EXTENDS = svg -PLUGIN_CLASS_NAME = QSvgIconPlugin -load(qt_plugin) - HEADERS += qsvgiconengine.h SOURCES += main.cpp \ qsvgiconengine.cpp OTHER_FILES += qsvgiconengine.json QT += svg core-private gui-private + +PLUGIN_TYPE = iconengines +PLUGIN_EXTENDS = svg +PLUGIN_CLASS_NAME = QSvgIconPlugin +load(qt_plugin) diff --git a/src/plugins/imageformats/svg/svg.pro b/src/plugins/imageformats/svg/svg.pro index ce1881f..9db6a9a 100644 --- a/src/plugins/imageformats/svg/svg.pro +++ b/src/plugins/imageformats/svg/svg.pro @@ -1,11 +1,11 @@ TARGET = qsvg -PLUGIN_TYPE = imageformats -PLUGIN_EXTENDS = svg -PLUGIN_CLASS_NAME = QSvgPlugin -load(qt_plugin) - HEADERS += qsvgiohandler.h SOURCES += main.cpp \ qsvgiohandler.cpp QT += svg + +PLUGIN_TYPE = imageformats +PLUGIN_EXTENDS = svg +PLUGIN_CLASS_NAME = QSvgPlugin +load(qt_plugin) diff --git a/src/svg/svg.pro b/src/svg/svg.pro index 83e76b7..103bbea 100644 --- a/src/svg/svg.pro +++ b/src/svg/svg.pro @@ -7,7 +7,6 @@ win32-msvc*|win32-icc:QMAKE_LFLAGS += /BASE:0x66000000 solaris-cc*:QMAKE_CXXFLAGS_RELEASE -= -O2 QMAKE_DOCS = $$PWD/doc/qtsvg.qdocconf -load(qt_module) HEADERS += \ qsvggraphics_p.h \ @@ -53,3 +52,5 @@ contains(QT_CONFIG, system-zlib) { } else { QT_PRIVATE += zlib-private } + +load(qt_module) |