diff options
author | J-P Nurmi <jpnurmi@qt.io> | 2016-07-07 16:04:29 +0200 |
---|---|---|
committer | J-P Nurmi <jpnurmi@qt.io> | 2016-07-08 07:37:33 +0000 |
commit | 7af626e08cc21463a86d0d0614d4aeb9c036643d (patch) | |
tree | 775e8b1b4233d5426e95da56f4f614abfc359b54 /src/quicktemplates2 | |
parent | 8024cb734c07a5c29a12f75d74fa1333f203ca47 (diff) |
Bump up all controls and templates imports to version 2.1
Controls must import templates version 2.1 in order to "inherit"
1-revisioned properties, methods, and signals. So far, this has
been done case by case, but it's less error prone and more clear
to change them all. For example, if you ever see a source file
pasted/linked somewhere, it's easy to identify the version it
belongs to.
Change-Id: I41609ec1a22bc05ac3e79f953a147ca42d9e0786
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Diffstat (limited to 'src/quicktemplates2')
-rw-r--r-- | src/quicktemplates2/qquickapplicationwindow.cpp | 2 | ||||
-rw-r--r-- | src/quicktemplates2/qquickdrawer.cpp | 2 | ||||
-rw-r--r-- | src/quicktemplates2/qquickpage.cpp | 2 | ||||
-rw-r--r-- | src/quicktemplates2/qquickpopup.cpp | 2 | ||||
-rw-r--r-- | src/quicktemplates2/qquicktooltip.cpp | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/src/quicktemplates2/qquickapplicationwindow.cpp b/src/quicktemplates2/qquickapplicationwindow.cpp index ae18123d..ed75d13a 100644 --- a/src/quicktemplates2/qquickapplicationwindow.cpp +++ b/src/quicktemplates2/qquickapplicationwindow.cpp @@ -69,7 +69,7 @@ QT_BEGIN_NAMESPACE \image qtquickcontrols2-applicationwindow-wireframe.png \qml - import QtQuick.Controls 2.0 + import QtQuick.Controls 2.1 ApplicationWindow { visible: true diff --git a/src/quicktemplates2/qquickdrawer.cpp b/src/quicktemplates2/qquickdrawer.cpp index e5f356e4..cfb58902 100644 --- a/src/quicktemplates2/qquickdrawer.cpp +++ b/src/quicktemplates2/qquickdrawer.cpp @@ -76,7 +76,7 @@ QT_BEGIN_NAMESPACE \code import QtQuick 2.7 - import QtQuick.Controls 2.0 + import QtQuick.Controls 2.1 ApplicationWindow { id: window diff --git a/src/quicktemplates2/qquickpage.cpp b/src/quicktemplates2/qquickpage.cpp index 9c0c22ec..67b1f063 100644 --- a/src/quicktemplates2/qquickpage.cpp +++ b/src/quicktemplates2/qquickpage.cpp @@ -58,7 +58,7 @@ QT_BEGIN_NAMESPACE toolbar header and an application-wide tabbar footer. \qml - import QtQuick.Controls 2.0 + import QtQuick.Controls 2.1 ApplicationWindow { visible: true diff --git a/src/quicktemplates2/qquickpopup.cpp b/src/quicktemplates2/qquickpopup.cpp index 0f773629..25ab2b42 100644 --- a/src/quicktemplates2/qquickpopup.cpp +++ b/src/quicktemplates2/qquickpopup.cpp @@ -61,7 +61,7 @@ QT_BEGIN_NAMESPACE \qml import QtQuick.Window 2.2 - import QtQuick.Controls 2.0 + import QtQuick.Controls 2.1 Window { id: window diff --git a/src/quicktemplates2/qquicktooltip.cpp b/src/quicktemplates2/qquicktooltip.cpp index 3eee830b..09c07778 100644 --- a/src/quicktemplates2/qquicktooltip.cpp +++ b/src/quicktemplates2/qquicktooltip.cpp @@ -327,7 +327,7 @@ QQuickToolTip *QQuickToolTipAttachedPrivate::instance(bool create) const QQmlContext *context = qmlContext(parent); if (context) { QQmlComponent component(context->engine()); - component.setData("import QtQuick.Controls 2.0; ToolTip { }", QUrl()); + component.setData("import QtQuick.Controls 2.1; ToolTip { }", QUrl()); QObject *object = component.create(context); tip = qobject_cast<QQuickToolTip *>(object); |