diff options
| author | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2015-01-19 14:06:48 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2015-01-19 14:06:48 +0100 |
| commit | 87762e57ebc9d5adc8f570c6e555689c7864614b (patch) | |
| tree | 4edab3c877b30f7871b9adcc43298127870f50d5 /src/controls/controls.pro | |
| parent | 788286932ee8307e48ccb81c0574f51c035e7138 (diff) | |
| parent | 70cb1e525c8dd790e9e1f8f2192ecdb2667ac2a1 (diff) | |
| download | qtquickcontrols-87762e57ebc9d5adc8f570c6e555689c7864614b.tar.gz | |
Merge remote-tracking branch 'origin/5.4' into dev
Conflicts:
.qmake.conf
Change-Id: Ib58b1084fdeb88a19b81f678e8ae2fcce3c8bbf7
Diffstat (limited to 'src/controls/controls.pro')
| -rw-r--r-- | src/controls/controls.pro | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/controls/controls.pro b/src/controls/controls.pro index cbfdafca..a1f8c6fa 100644 --- a/src/controls/controls.pro +++ b/src/controls/controls.pro @@ -1,6 +1,6 @@ TARGET = qtquickcontrolsplugin TARGETPATH = QtQuick/Controls -IMPORT_VERSION = 1.2 +IMPORT_VERSION = 1.3 QT += qml quick quick-private qml-private gui-private core-private |