diff options
author | Kari Oikarinen <kari.oikarinen@qt.io> | 2017-03-29 12:16:18 +0300 |
---|---|---|
committer | Kari Oikarinen <kari.oikarinen@qt.io> | 2017-03-30 06:45:49 +0000 |
commit | 656c17160083eae8f730a2f07644cf8b647729ed (patch) | |
tree | 9fac5b4fa61ecef21840bb5e67d6186127638be1 /src/imports/networksettings/networksettings.pro | |
parent | 2e73f49d37802e403a2c149854040055a97f11a0 (diff) |
Use qml_plugin.prf for the QML plugins
That feature takes care of installing qmldir (and plugins.qmltypes if it
exists) so the plugins doing it themselves is not necessary anymore.
Change-Id: Ie157b153c90db8801a245df1bf0ff00df63b255d
Reviewed-by: Teemu Holappa <teemu.holappa@qt.io>
Diffstat (limited to 'src/imports/networksettings/networksettings.pro')
-rw-r--r-- | src/imports/networksettings/networksettings.pro | 29 |
1 files changed, 5 insertions, 24 deletions
diff --git a/src/imports/networksettings/networksettings.pro b/src/imports/networksettings/networksettings.pro index 1b16421..7c1dc0a 100644 --- a/src/imports/networksettings/networksettings.pro +++ b/src/imports/networksettings/networksettings.pro @@ -1,9 +1,9 @@ -TEMPLATE = lib -TARGET = networksettingsplugin QT += qml quick networksettings -CONFIG += qt plugin -uri = QtDeviceUtilities.NetworkSettings +CONFIG += no_cxx_module + +TARGET = networksettingsplugin +TARGETPATH = QtDeviceUtilities/NetworkSettings SOURCES += \ plugin.cpp \ @@ -11,24 +11,5 @@ SOURCES += \ HEADERS += \ plugin.h \ -DISTFILES = qmldir - -!equals(_PRO_FILE_PWD_, $$OUT_PWD) { - copy_qmldir.target = $$OUT_PWD/qmldir - copy_qmldir.depends = $$_PRO_FILE_PWD_/qmldir - copy_qmldir.commands = $(COPY_FILE) \"$$replace(copy_qmldir.depends, /, $$QMAKE_DIR_SEP)\" \"$$replace(copy_qmldir.target, /, $$QMAKE_DIR_SEP)\" - QMAKE_EXTRA_TARGETS += copy_qmldir - PRE_TARGETDEPS += $$copy_qmldir.target -} - -qmldir.files = qmldir - -pluginfiles.files += \ - -installPath = $$[QT_INSTALL_QML]/$$replace(uri, \\., /) - -pluginfiles.path = $$installPath -qmldir.path = $$installPath -target.path = $$installPath -INSTALLS += target qmldir pluginfiles +load(qml_plugin) |