From 7bdd8bcba6c7ce2095becfa28a70ad0e69aeb695 Mon Sep 17 00:00:00 2001
From: Jens Bache-Wiig <jensbw@gmail.com>
Date: Mon, 26 Sep 2011 00:07:13 +0200
Subject: [PATCH] Make QtQuick 1.1 (4.7.4) the minimum requirement.
We need this for SplitterRow and it has been released for a
while.
---
components/Button.qml | 2 +-
components/ButtonRow.qml | 2 +-
components/CheckBox.qml | 2 +-
components/ChoiceList.qml | 2 +-
components/ComboBox.qml | 2 +-
components/ContextMenu.qml | 2 +-
components/Dial.qml | 2 +-
components/Dialog.qml | 2 +-
components/Frame.qml | 2 +-
components/GroupBox.qml | 2 +-
components/MenuItem.qml | 2 +-
components/ProgressBar.qml | 2 +-
components/RadioButton.qml | 2 +-
components/ScrollArea.qml | 2 +-
components/ScrollBar.qml | 2 +-
components/Slider.qml | 2 +-
components/SpinBox.qml | 2 +-
components/Switch.qml | 2 +-
components/Tab.qml | 2 +-
components/TabBar.qml | 2 +-
components/TabFrame.qml | 2 +-
components/TableColumn.qml | 2 +-
components/TableView.qml | 2 +-
components/TextArea.qml | 2 +-
components/TextField.qml | 2 +-
components/ToolBar.qml | 3 ++-
components/ToolButton.qml | 2 +-
components/custom/BasicButton.qml | 2 +-
components/custom/Button.qml | 2 +-
components/custom/CheckBox.qml | 2 +-
components/custom/ChoiceList.qml | 2 +-
components/custom/GroupBox.qml | 2 +-
components/custom/ProgressBar.qml | 2 +-
components/custom/Slider.qml | 2 +-
components/custom/SpinBox.qml | 2 +-
components/custom/TextField.qml | 2 +-
components/custom/behaviors/ButtonBehavior.qml | 2 +-
components/custom/behaviors/ModalPopupBehavior.qml | 2 +-
components/custom/private/ChoiceListPopup.qml | 2 +-
examples/Gallery.qml | 2 +-
src/qstyleplugin.cpp | 3 +--
src/qwheelarea.cpp | 2 +-
42 files changed, 43 insertions(+), 43 deletions(-)
diff --git a/components/Button.qml b/components/Button.qml
index 4ba2b8d6a..89ef6a4d0 100644
--- a/components/Button.qml
+++ b/components/Button.qml
@@ -1,4 +1,4 @@
-import QtQuick 1.0
+import QtQuick 1.1
import "custom" as Components
Components.Button {
diff --git a/components/ButtonRow.qml b/components/ButtonRow.qml
index 7123b415b..dd5d6615d 100644
--- a/components/ButtonRow.qml
+++ b/components/ButtonRow.qml
@@ -1,4 +1,4 @@
-import QtQuick 1.0
+import QtQuick 1.1
import "custom" as Components
Components.ButtonRow {
diff --git a/components/CheckBox.qml b/components/CheckBox.qml
index a712a4c94..b112328c0 100644
--- a/components/CheckBox.qml
+++ b/components/CheckBox.qml
@@ -1,4 +1,4 @@
-import QtQuick 1.0
+import QtQuick 1.1
import "custom" as Components
// jb : Size should not depend on background, we should make it consistent
diff --git a/components/ChoiceList.qml b/components/ChoiceList.qml
index e45dc0f26..3d0ea4193 100644
--- a/components/ChoiceList.qml
+++ b/components/ChoiceList.qml
@@ -1,4 +1,4 @@
-import QtQuick 1.0
+import QtQuick 1.1
import "custom" as Components
Components.ChoiceList {
diff --git a/components/ComboBox.qml b/components/ComboBox.qml
index 8dcd06942..d68155852 100644
--- a/components/ComboBox.qml
+++ b/components/ComboBox.qml
@@ -1,4 +1,4 @@
-import QtQuick 1.0
+import QtQuick 1.1
import "custom" as Custom
/*
diff --git a/components/ContextMenu.qml b/components/ContextMenu.qml
index ba42642e0..a439d4a8f 100644
--- a/components/ContextMenu.qml
+++ b/components/ContextMenu.qml
@@ -1,4 +1,4 @@
-import QtQuick 1.0
+import QtQuick 1.1
Menu {
id: root
diff --git a/components/Dial.qml b/components/Dial.qml
index 3e42ccf2d..63eed32fb 100644
--- a/components/Dial.qml
+++ b/components/Dial.qml
@@ -1,4 +1,4 @@
-import QtQuick 1.0
+import QtQuick 1.1
import "custom" as Components
// jens: ContainsMouse breaks drag functionality
diff --git a/components/Dialog.qml b/components/Dialog.qml
index a80a0cd7e..3e0264acc 100644
--- a/components/Dialog.qml
+++ b/components/Dialog.qml
@@ -1,4 +1,4 @@
-import QtQuick 1.0
+import QtQuick 1.1
Window {
id: dialog
diff --git a/components/Frame.qml b/components/Frame.qml
index 23458a327..db8d911c8 100644
--- a/components/Frame.qml
+++ b/components/Frame.qml
@@ -1,4 +1,4 @@
-import QtQuick 1.0
+import QtQuick 1.1
import "custom" as Components
Item {
default property alias data: content.data
diff --git a/components/GroupBox.qml b/components/GroupBox.qml
index 5cc6d77d2..dc28814b3 100644
--- a/components/GroupBox.qml
+++ b/components/GroupBox.qml
@@ -1,4 +1,4 @@
-import QtQuick 1.0
+import QtQuick 1.1
import "custom" as Components
Components.GroupBox {
diff --git a/components/MenuItem.qml b/components/MenuItem.qml
index 04038e55e..15abc4dc8 100644
--- a/components/MenuItem.qml
+++ b/components/MenuItem.qml
@@ -1,4 +1,4 @@
-import QtQuick 1.0
+import QtQuick 1.1
Item {
property string text
diff --git a/components/ProgressBar.qml b/components/ProgressBar.qml
index 676518421..2266c781a 100644
--- a/components/ProgressBar.qml
+++ b/components/ProgressBar.qml
@@ -1,4 +1,4 @@
-import QtQuick 1.0
+import QtQuick 1.1
import "custom" as Components
Components.ProgressBar {
diff --git a/components/RadioButton.qml b/components/RadioButton.qml
index 3fee200e8..4ae6c80fb 100644
--- a/components/RadioButton.qml
+++ b/components/RadioButton.qml
@@ -1,4 +1,4 @@
-import QtQuick 1.0
+import QtQuick 1.1
import "custom" as Components
// jb : Size should not depend on background, we should make it consistent
diff --git a/components/ScrollArea.qml b/components/ScrollArea.qml
index d9bbabb45..6d37de165 100644
--- a/components/ScrollArea.qml
+++ b/components/ScrollArea.qml
@@ -1,4 +1,4 @@
-import QtQuick 1.0
+import QtQuick 1.1
import "custom" as Components
import "private" as Private
diff --git a/components/ScrollBar.qml b/components/ScrollBar.qml
index 13221b1c1..6078bdeb4 100644
--- a/components/ScrollBar.qml
+++ b/components/ScrollBar.qml
@@ -1,4 +1,4 @@
-import QtQuick 1.0
+import QtQuick 1.1
import "custom" as Components
Item {
diff --git a/components/Slider.qml b/components/Slider.qml
index 9b037f1c1..3e57aeb12 100644
--- a/components/Slider.qml
+++ b/components/Slider.qml
@@ -1,4 +1,4 @@
-import QtQuick 1.0
+import QtQuick 1.1
import "custom" as Components
// jens: ContainsMouse breaks drag functionality
diff --git a/components/SpinBox.qml b/components/SpinBox.qml
index 8c2a10627..2c7053cf1 100644
--- a/components/SpinBox.qml
+++ b/components/SpinBox.qml
@@ -1,4 +1,4 @@
-import QtQuick 1.0
+import QtQuick 1.1
import "custom" as Components
Components.SpinBox {
diff --git a/components/Switch.qml b/components/Switch.qml
index 45bdfd84e..6096f246b 100644
--- a/components/Switch.qml
+++ b/components/Switch.qml
@@ -1,4 +1,4 @@
-import QtQuick 1.0
+import QtQuick 1.1
import "custom" as Components
Components.Switch {
diff --git a/components/Tab.qml b/components/Tab.qml
index c16ec7057..f64ebf754 100644
--- a/components/Tab.qml
+++ b/components/Tab.qml
@@ -1,4 +1,4 @@
-import QtQuick 1.0
+import QtQuick 1.1
Item {
id:tab
diff --git a/components/TabBar.qml b/components/TabBar.qml
index b2fa1bc3f..d07a412dc 100644
--- a/components/TabBar.qml
+++ b/components/TabBar.qml
@@ -1,4 +1,4 @@
-import QtQuick 1.0
+import QtQuick 1.1
import "custom" as Components
diff --git a/components/TabFrame.qml b/components/TabFrame.qml
index c65a6b7df..afe9026db 100644
--- a/components/TabFrame.qml
+++ b/components/TabFrame.qml
@@ -1,4 +1,4 @@
-import QtQuick 1.0
+import QtQuick 1.1
import "custom" as Components
Item {
diff --git a/components/TableColumn.qml b/components/TableColumn.qml
index 48e8581b0..3944a8a48 100644
--- a/components/TableColumn.qml
+++ b/components/TableColumn.qml
@@ -1,4 +1,4 @@
-import QtQuick 1.0
+import QtQuick 1.1
QtObject {
property string caption
diff --git a/components/TableView.qml b/components/TableView.qml
index 953148ef9..576bd00bc 100644
--- a/components/TableView.qml
+++ b/components/TableView.qml
@@ -1,4 +1,4 @@
-import QtQuick 1.0
+import QtQuick 1.1
import "private" as Private
/*
diff --git a/components/TextArea.qml b/components/TextArea.qml
index 30da414f3..c53959e2d 100644
--- a/components/TextArea.qml
+++ b/components/TextArea.qml
@@ -1,4 +1,4 @@
-import QtQuick 1.0
+import QtQuick 1.1
import "custom" as Components
ScrollArea {
diff --git a/components/TextField.qml b/components/TextField.qml
index f7925f013..78d4a8b46 100644
--- a/components/TextField.qml
+++ b/components/TextField.qml
@@ -1,4 +1,4 @@
-import QtQuick 1.0
+import QtQuick 1.1
import "custom" as Components
Components.TextField {
diff --git a/components/ToolBar.qml b/components/ToolBar.qml
index 67fc21d6b..efdf973b4 100644
--- a/components/ToolBar.qml
+++ b/components/ToolBar.qml
@@ -1,4 +1,5 @@
-import QtQuick 1.0
+import QtQuick 1.1
+import "."
import "custom" as Components
StyleItem{
diff --git a/components/ToolButton.qml b/components/ToolButton.qml
index 7be60b276..cb19b7979 100644
--- a/components/ToolButton.qml
+++ b/components/ToolButton.qml
@@ -1,4 +1,4 @@
-import QtQuick 1.0
+import QtQuick 1.1
import "custom" as Components
Components.Button {
diff --git a/components/custom/BasicButton.qml b/components/custom/BasicButton.qml
index 52700fc27..3f6f8f320 100644
--- a/components/custom/BasicButton.qml
+++ b/components/custom/BasicButton.qml
@@ -1,4 +1,4 @@
-import QtQuick 1.0
+import QtQuick 1.1
import "./behaviors" // ButtonBehavior
Item {
diff --git a/components/custom/Button.qml b/components/custom/Button.qml
index 45abc83f6..af3456c3c 100644
--- a/components/custom/Button.qml
+++ b/components/custom/Button.qml
@@ -1,4 +1,4 @@
-import QtQuick 1.0
+import QtQuick 1.1
BasicButton {
id: button
diff --git a/components/custom/CheckBox.qml b/components/custom/CheckBox.qml
index 98de77f9c..e0b4c4d85 100644
--- a/components/custom/CheckBox.qml
+++ b/components/custom/CheckBox.qml
@@ -1,4 +1,4 @@
-import QtQuick 1.0
+import QtQuick 1.1
import "./behaviors"
FocusScope {
diff --git a/components/custom/ChoiceList.qml b/components/custom/ChoiceList.qml
index a316f042e..2f8818494 100644
--- a/components/custom/ChoiceList.qml
+++ b/components/custom/ChoiceList.qml
@@ -1,4 +1,4 @@
-import QtQuick 1.0
+import QtQuick 1.1
import "./private" as Private
Item {
diff --git a/components/custom/GroupBox.qml b/components/custom/GroupBox.qml
index 95ddcb95f..62aebb7fd 100644
--- a/components/custom/GroupBox.qml
+++ b/components/custom/GroupBox.qml
@@ -1,4 +1,4 @@
-import QtQuick 1.0
+import QtQuick 1.1
Item {
id: groupbox
diff --git a/components/custom/ProgressBar.qml b/components/custom/ProgressBar.qml
index 3ad8bca6c..cc4a77cb6 100644
--- a/components/custom/ProgressBar.qml
+++ b/components/custom/ProgressBar.qml
@@ -1,4 +1,4 @@
-import QtQuick 1.0
+import QtQuick 1.1
Item {
id: progressBar
diff --git a/components/custom/Slider.qml b/components/custom/Slider.qml
index 9f3ae4b02..096b6006c 100644
--- a/components/custom/Slider.qml
+++ b/components/custom/Slider.qml
@@ -24,7 +24,7 @@
**
****************************************************************************/
-import QtQuick 1.0
+import QtQuick 1.1
import "../"
Item {
diff --git a/components/custom/SpinBox.qml b/components/custom/SpinBox.qml
index 211d99827..16c08a9e8 100644
--- a/components/custom/SpinBox.qml
+++ b/components/custom/SpinBox.qml
@@ -1,4 +1,4 @@
-import QtQuick 1.0
+import QtQuick 1.1
FocusScope {
id: spinbox
diff --git a/components/custom/TextField.qml b/components/custom/TextField.qml
index 2ddefc46f..8c413caef 100644
--- a/components/custom/TextField.qml
+++ b/components/custom/TextField.qml
@@ -1,4 +1,4 @@
-import QtQuick 1.0
+import QtQuick 1.1
import "./behaviors" // TextEditMouseBehavior
// KNOWN ISSUES
diff --git a/components/custom/behaviors/ButtonBehavior.qml b/components/custom/behaviors/ButtonBehavior.qml
index 57ea62690..3d1595f79 100644
--- a/components/custom/behaviors/ButtonBehavior.qml
+++ b/components/custom/behaviors/ButtonBehavior.qml
@@ -1,4 +1,4 @@
-import QtQuick 1.0
+import QtQuick 1.1
Item {
id: behavior
diff --git a/components/custom/behaviors/ModalPopupBehavior.qml b/components/custom/behaviors/ModalPopupBehavior.qml
index 108bf02ae..489987ab5 100644
--- a/components/custom/behaviors/ModalPopupBehavior.qml
+++ b/components/custom/behaviors/ModalPopupBehavior.qml
@@ -1,4 +1,4 @@
-import QtQuick 1.0
+import QtQuick 1.1
// KNOWN ISSUES
// none
diff --git a/components/custom/private/ChoiceListPopup.qml b/components/custom/private/ChoiceListPopup.qml
index 6a76db163..9c7cb3883 100644
--- a/components/custom/private/ChoiceListPopup.qml
+++ b/components/custom/private/ChoiceListPopup.qml
@@ -1,4 +1,4 @@
-import QtQuick 1.0
+import QtQuick 1.1
MouseArea {
id: popup
diff --git a/examples/Gallery.qml b/examples/Gallery.qml
index eab71dedb..1b017d4d7 100644
--- a/examples/Gallery.qml
+++ b/examples/Gallery.qml
@@ -1,4 +1,4 @@
-import QtQuick 1.0
+import QtQuick 1.1
import QtDesktop 0.1
import "content"
diff --git a/src/qstyleplugin.cpp b/src/qstyleplugin.cpp
index ef7c630f2..f1b84b363 100644
--- a/src/qstyleplugin.cpp
+++ b/src/qstyleplugin.cpp
@@ -94,8 +94,7 @@ void StylePlugin::registerTypes(const char *uri)
qmlRegisterType<QtMenuSeparator>(uri, 0, 1, "Separator");
qmlRegisterType<QWindowItem>("QtQuick", 0, 1, "Window");
qmlRegisterUncreatableType<QtMenuBase>(uri, 0, 1, "NativeMenuBase", QLatin1String("Do not create objects of type NativeMenuBase"));
- qmlRegisterUncreatableType<QDesktopItem>("Qt",4,7,"Desktop", QLatin1String("Do not create objects of type Desktop"));
- qmlRegisterUncreatableType<QDesktopItem>("QtQuick",0,1,"Desktop", QLatin1String("Do not create objects of type Desktop"));
+ qmlRegisterUncreatableType<QDesktopItem>("QtQuick",1,1,"Desktop", QLatin1String("Do not create objects of type Desktop"));
}
void StylePlugin::initializeEngine(QDeclarativeEngine *engine, const char *uri)
diff --git a/src/qwheelarea.cpp b/src/qwheelarea.cpp
index 075d46713..6e9cd0b83 100644
--- a/src/qwheelarea.cpp
+++ b/src/qwheelarea.cpp
@@ -194,6 +194,6 @@ void QWheelArea::setScrollSpeed(qreal d)
qreal QWheelArea::scrollSpeed()
{
- _scrollSpeed;
+ return _scrollSpeed;
}
--
GitLab