diff options
| author | Alex Blasche <alexander.blasche@theqtcompany.com> | 2016-05-04 11:33:13 +0200 |
|---|---|---|
| committer | Alex Blasche <alexander.blasche@theqtcompany.com> | 2016-05-04 10:25:14 +0000 |
| commit | 9677182c07b22f5f1f4fdff3f1fce6a28f76b662 (patch) | |
| tree | 0f533f2af4111178da1eeddb06bb57efb4f97c0e | |
| parent | d4211eda4eeb1de6daaa139932e7796d611babac (diff) | |
Do not pin the QML plugins import version.
The connectivity QML plugins increase their version along the Qt modules
version.
In addition the CXX_MODULE value was incorrect which caused broken
qmltype make targets (if IMPORT_VERSION is not defined).
The default value processing in qml_plugin.prf is sufficient.
Change-Id: Ia9a1446defaa29bb4408ac803e7fe856215f6b67
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
Reviewed-by: Andy Shaw <andy.shaw@theqtcompany.com>
| -rw-r--r-- | src/imports/bluetooth/bluetooth.pro | 3 | ||||
| -rw-r--r-- | src/imports/bluetooth/plugins.qmltypes | 2 | ||||
| -rw-r--r-- | src/imports/nfc/nfc.pro | 3 | ||||
| -rw-r--r-- | src/imports/nfc/plugins.qmltypes | 2 |
4 files changed, 2 insertions, 8 deletions
diff --git a/src/imports/bluetooth/bluetooth.pro b/src/imports/bluetooth/bluetooth.pro index f0df8eb9..c4e6e3df 100644 --- a/src/imports/bluetooth/bluetooth.pro +++ b/src/imports/bluetooth/bluetooth.pro @@ -1,7 +1,4 @@ -CXX_MODULE = connectivity -TARGET = declarative_bluetooth TARGETPATH = QtBluetooth -IMPORT_VERSION = 5.6 QT = core quick bluetooth diff --git a/src/imports/bluetooth/plugins.qmltypes b/src/imports/bluetooth/plugins.qmltypes index 99ea567f..9c47126d 100644 --- a/src/imports/bluetooth/plugins.qmltypes +++ b/src/imports/bluetooth/plugins.qmltypes @@ -4,7 +4,7 @@ import QtQuick.tooling 1.2 // It is used for QML tooling purposes only. // // This file was auto-generated by: -// 'qmlplugindump -nonrelocatable QtBluetooth 5.6' +// 'qmlplugindump -nonrelocatable QtBluetooth 5.7' Module { dependencies: ["QtQuick 2.0"] diff --git a/src/imports/nfc/nfc.pro b/src/imports/nfc/nfc.pro index e2ec1b9e..d651e837 100644 --- a/src/imports/nfc/nfc.pro +++ b/src/imports/nfc/nfc.pro @@ -1,7 +1,4 @@ -CXX_MODULE = connectivity -TARGET = declarative_nfc TARGETPATH = QtNfc -IMPORT_VERSION = 5.6 QT = core qml nfc diff --git a/src/imports/nfc/plugins.qmltypes b/src/imports/nfc/plugins.qmltypes index 88794b71..7bba6d95 100644 --- a/src/imports/nfc/plugins.qmltypes +++ b/src/imports/nfc/plugins.qmltypes @@ -4,7 +4,7 @@ import QtQuick.tooling 1.2 // It is used for QML tooling purposes only. // // This file was auto-generated by: -// 'qmlplugindump -nonrelocatable QtNfc 5.6' +// 'qmlplugindump -nonrelocatable QtNfc 5.7' Module { dependencies: ["QtQuick 2.0"] |