diff --git a/components/Button.qml b/components/Button.qml
index 4ba2b8d6a24afab8d24e31ea336c615f9a374d0e..89ef6a4d06a1f921272cd8549fdd97b54d941ec0 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 7123b415b946d101788a6b2b019b650fd85f5d15..dd5d6615d8079b75b57d6d32682307a8ebe800aa 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 a712a4c9432c3cd99b589b131aeaa25739bfd3b4..b112328c08bd031298065bf434f56c0ce3be70ff 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 e45dc0f26915541d0badaf381953010750f7c4f9..3d0ea4193241046216f004afc8022858780ddcc6 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 8dcd06942956807ed69011872ea2b89bc48426c4..d681558520c9d2c39e0a993bb83f031ec58fe985 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 ba42642e0130766c499fcb74c37e4e86238ffbe5..a439d4a8ff00f2c2055692e44a863e8320aea95e 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 3e42ccf2d9095f57205656ff6b1a2c05657ac3c1..63eed32fb2173444d8e7d5408abe375f0191cd24 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 a80a0cd7eb7c6d54d51afd4cbd4d52b5f1df2b43..3e0264acc71fd397cc23874e765de4086ef83911 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 23458a327a11debb9aafbc8b53411ab84619ecf2..db8d911c89e9cc2929d1d6e66c2b0cbbdd60beac 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 5cc6d77d27cbca03fee543b2a4582730e86a4f96..dc28814b39e501285aff007a02061330ea87f9bf 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 04038e55e747a1a9e9c0bf06bb01ae04ee38c5bb..15abc4dc839c478f62b04e7a7fbf44914b95cd7b 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 676518421dd03d6460fae208080720d3cffd543f..2266c781abba671bc62238e72bb5d76ce4e7781b 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 3fee200e89cf9c31343f1b709c6b9aeba4246835..4ae6c80fbc5b37e0bea3f022af418196f4e97e46 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 d9bbabb45327d4586f66468547ced3eb9bca85fa..6d37de165e7cd8c85ecdf46cec663acc6b6459fb 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 13221b1c12c3e44ce3f605c05e7a04e21bde022e..6078bdeb4111608b1f966c67a76209bdf6c490ca 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 9b037f1c14730fdaecf656a3e0061180045857f9..3e57aeb128fbc1a02645bb3146f563c12ee97111 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 8c2a10627adb6ac19fe18cfdaaac09eb481d27a3..2c7053cf1ac7daa12d2fb2ba74dda6d9b31f76f9 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 45bdfd84ef6045d5f267710c8488a70f79bcaf02..6096f246bd4f03f21a1bf36336842a82ca1b7bf0 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 c16ec705733a56fbf20f2894fdd114d0b0672350..f64ebf7541573ea570c2268afc29046ec13ba617 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 b2fa1bc3fe9afcad5d3a258e33e828d380b14cab..d07a412dc319a44a864a6f76faecc7b7123792ae 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 c65a6b7df2636296fd379d44960d8cfab2455efe..afe9026dbf62ca39281d636c4a12000059b43b11 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 48e8581b06f4800fe0305da4b48838c89f9c0725..3944a8a48679c0d1119e928d8798333964925ca7 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 953148ef95c494b6823a945744d25dc7c0dbe165..576bd00bc4c3885b40063a2b3c58c0dcf3c38ed3 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 30da414f3c17277ca33fbd984d5807a25219feed..c53959e2deb439f6f7865112f9226d70d1de4e27 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 f7925f013f3b4cc82ba7c8e6455f645d3c63932e..78d4a8b46f2e718d86b4a1fd4ac448d5acf4d330 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 67fc21d6b8f9037645e10736e95ca7ca6a4ad810..efdf973b4d9353ac478d63b3ee70c2a7c7c27d49 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 7be60b276a0b32776303b3dc414a0fee3bebb117..cb19b7979d1077badbfe12824071b7c3a2949b78 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 52700fc27d744c9e2c61d312e09a05ce094067d0..3f6f8f320948122080d704be1bc881713f4d3e41 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 45abc83f6041a194dc6e690220572067d63b2aed..af3456c3c7474af033a1b8f65f78b63377250260 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 98de77f9c12ff7b2fcbce2a69775f1887454e2e3..e0b4c4d855979334f724e1e57686fa30b604aeed 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 a316f042ed9ba408449d30581e8ab02d64b485e5..2f88184941964a66df97d75f5654303f343e9b1f 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 95ddcb95f541be94f076e53a1549b6bcb6058552..62aebb7fd64bc7295c3122470ef80b13eb7482d2 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 3ad8bca6c0bf7d94797b5a83433f063b39e2bc27..cc4a77cb662bfd6a8716b53bc032bb2347287119 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 9f3ae4b02fec73a7453bfd5a698fe0a2a3033d55..096b6006cee36ed30013fe8fe177aaf7f79a8e37 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 211d998277e675e37d4f000a8714f9111e09474f..16c08a9e81e371cb900918629d60b05b07817f75 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 2ddefc46f39644fab2b608e6b0a6092786425526..8c413caeffe3482a189c0c6b0268ea83c5ed18db 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 57ea626906c471df9f47b4f61607b3c6fd89e11e..3d1595f7900c13ac8d1eae1b8e5ec0610ce2b11e 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 108bf02ae219b761964e315726500582dfae1d5a..489987ab5e49d91adafff2561aff956bdc20e43d 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 6a76db16326ec624cfa3868568d79b926f34bd4c..9c7cb38837ec2e84e2b32217b82d90a1286bd97e 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 eab71dedb024e302d89662c9b485f4ce3596a816..1b017d4d791b4af4c5a3e09aa0e7834805640c0a 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 ef7c630f23b0ceb589ef44f27ed6601e1abf3476..f1b84b363e9d4494bdea3fb4d12a7bd5b8177128 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 075d467137ed82c4de448f267a1ed4a44242b1e6..6e9cd0b8362a04b55e2af356313c2c1c7ec3fe75 100644
--- a/src/qwheelarea.cpp
+++ b/src/qwheelarea.cpp
@@ -194,6 +194,6 @@ void QWheelArea::setScrollSpeed(qreal d)
qreal QWheelArea::scrollSpeed()
{
- _scrollSpeed;
+ return _scrollSpeed;
}