From 3777ae67efbbd33c10eab6e0a7d46845b1403948 Mon Sep 17 00:00:00 2001 From: Marco Martin Date: Wed, 6 Feb 2013 13:37:56 +0100 Subject: [PATCH] very war enable of components they will still not work due theme not being defined yet --- declarativeimports/CMakeLists.txt | 2 +- .../core/declarativeitemcontainer.cpp | 2 +- .../plasmacomponents/CMakeLists.txt | 20 ++++++++++++--- declarativeimports/plasmacomponents/enums.cpp | 2 +- declarativeimports/plasmacomponents/enums.h | 1 - .../plasmacomponentsplugin.cpp | 25 +++++++++---------- .../plasmacomponents/plasmacomponentsplugin.h | 17 +++++++------ .../platformcomponents/touch/EditBubble.qml | 2 +- .../platformcomponents/touch/Menu.qml | 2 +- .../platformcomponents/touch/MenuItem.qml | 2 +- .../platformcomponents/touch/ScrollBar.qml | 2 +- .../touch/ScrollDecorator.qml | 2 +- .../touch/SectionScroller.qml | 2 +- .../platformcomponents/touch/Sheet.qml | 2 +- .../platformcomponents/touch/TextArea.qml | 2 +- .../platformcomponents/touch/TextField.qml | 2 +- .../touch/TextFieldFocus.qml | 2 +- .../platformcomponents/touch/Window.qml | 2 +- .../plasmacomponents/qml/BusyIndicator.qml | 2 +- .../plasmacomponents/qml/Button.qml | 2 +- .../plasmacomponents/qml/ButtonRow.qml | 2 +- .../plasmacomponents/qml/CheckBox.qml | 2 +- .../plasmacomponents/qml/CommonDialog.qml | 2 +- .../plasmacomponents/qml/ContextMenu.qml | 2 +- .../plasmacomponents/qml/Dialog.qml | 2 +- .../plasmacomponents/qml/Highlight.qml | 2 +- .../plasmacomponents/qml/Label.qml | 2 +- .../plasmacomponents/qml/ListItem.qml | 2 +- .../plasmacomponents/qml/Page.qml | 2 +- .../plasmacomponents/qml/PageStack.qml | 2 +- .../plasmacomponents/qml/ProgressBar.qml | 2 +- .../plasmacomponents/qml/QueryDialog.qml | 2 +- .../plasmacomponents/qml/RadioButton.qml | 2 +- .../plasmacomponents/qml/ScrollBar.qml | 2 +- .../plasmacomponents/qml/SectionScroller.qml | 2 +- .../plasmacomponents/qml/SelectionDialog.qml | 2 +- .../plasmacomponents/qml/Sheet.qml | 2 +- .../plasmacomponents/qml/Slider.qml | 2 +- .../plasmacomponents/qml/Switch.qml | 2 +- .../plasmacomponents/qml/TabBar.qml | 2 +- .../plasmacomponents/qml/TabButton.qml | 2 +- .../plasmacomponents/qml/TabGroup.qml | 2 +- .../plasmacomponents/qml/TextArea.qml | 2 +- .../plasmacomponents/qml/TextField.qml | 4 +-- .../plasmacomponents/qml/ToolBar.qml | 2 +- .../plasmacomponents/qml/ToolBarLayout.qml | 2 +- .../plasmacomponents/qml/ToolButton.qml | 2 +- .../qml/private/ButtonShadow.qml | 2 +- .../qml/private/DualStateButton.qml | 2 +- .../qml/private/InlineDialog.qml | 2 +- .../qml/private/RoundShadow.qml | 2 +- .../qml/private/ScrollBarDelegate.qml | 2 +- .../qml/private/ScrollDecoratorDelegate.qml | 2 +- .../qml/private/TabBarLayout.qml | 2 +- .../qml/private/TextFieldFocus.qml | 2 +- 55 files changed, 89 insertions(+), 78 deletions(-) diff --git a/declarativeimports/CMakeLists.txt b/declarativeimports/CMakeLists.txt index 85af499b5..f0f28ec91 100644 --- a/declarativeimports/CMakeLists.txt +++ b/declarativeimports/CMakeLists.txt @@ -2,6 +2,6 @@ add_subdirectory(core) #add_subdirectory(draganddrop) #add_subdirectory(krunnermodel) #add_subdirectory(qtextracomponents) -#add_subdirectory(plasmacomponents) +add_subdirectory(plasmacomponents) #add_subdirectory(plasmaextracomponents) #add_subdirectory(locale) diff --git a/declarativeimports/core/declarativeitemcontainer.cpp b/declarativeimports/core/declarativeitemcontainer.cpp index 5b8c9d037..b28916db1 100644 --- a/declarativeimports/core/declarativeitemcontainer.cpp +++ b/declarativeimports/core/declarativeitemcontainer.cpp @@ -183,4 +183,4 @@ void DeclarativeItemContainer::preferredHeightChanged() setPreferredHeight(preferredHeight); } -#include "declarativeitemcontainer_p.moc" +#include "declarativeitemcontainer.moc" diff --git a/declarativeimports/plasmacomponents/CMakeLists.txt b/declarativeimports/plasmacomponents/CMakeLists.txt index ff584fd49..845d2d8ab 100644 --- a/declarativeimports/plasmacomponents/CMakeLists.txt +++ b/declarativeimports/plasmacomponents/CMakeLists.txt @@ -1,27 +1,39 @@ project(plasmacomponents) +find_package(KDeclarative REQUIRED) + set(plasmacomponents_SRCS - fullscreensheet.cpp - fullscreenwindow.cpp + #fullscreensheet.cpp + #fullscreenwindow.cpp plasmacomponentsplugin.cpp qrangemodel.cpp enums.cpp qmenu.cpp qmenuitem.cpp - ../core/declarativeitemcontainer.cpp + #../core/declarativeitemcontainer.cpp ) INCLUDE_DIRECTORIES( ${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} ${KDE4_INCLUDES} + ${KDECLARATIVE_INCLUDE_DIR} ) qt4_automoc(${plasmacomponents_SRCS}) +set(IMPORTS_INSTALL_DIR "qml") +message("!!! Forcing Imports install location: ${IMPORTS_INSTALL_DIR}") add_library(plasmacomponentsplugin SHARED ${plasmacomponents_SRCS}) -target_link_libraries(plasmacomponentsplugin ${QT_QTCORE_LIBRARY} ${QT_QTDECLARATIVE_LIBRARY} ${QT_QTGUI_LIBRARY} ${KDE4_KDEUI_LIBRARY} ${KDECLARATIVE_LIBRARIES} ${KDE4_PLASMA_LIBS}) +target_link_libraries(plasmacomponentsplugin + ${QT_QTCORE_LIBRARY} + ${Qt5Quick_LIBRARIES} + ${Qt5Qml_LIBRARIES} + ${QT_QTGUI_LIBRARY} + ${KDE4_KDEUI_LIBRARY} + ${KDECLARATIVE_LIBRARIES} + plasma) install(TARGETS plasmacomponentsplugin DESTINATION ${IMPORTS_INSTALL_DIR}/org/kde/plasma/components) diff --git a/declarativeimports/plasmacomponents/enums.cpp b/declarativeimports/plasmacomponents/enums.cpp index 2bc316b11..ab9eeaaa3 100644 --- a/declarativeimports/plasmacomponents/enums.cpp +++ b/declarativeimports/plasmacomponents/enums.cpp @@ -21,4 +21,4 @@ -#include "enums.moc" +#include "moc_enums.cpp" diff --git a/declarativeimports/plasmacomponents/enums.h b/declarativeimports/plasmacomponents/enums.h index 83b476e59..46a40d70c 100644 --- a/declarativeimports/plasmacomponents/enums.h +++ b/declarativeimports/plasmacomponents/enums.h @@ -22,7 +22,6 @@ #include -#include class DialogStatus : public QObject { diff --git a/declarativeimports/plasmacomponents/plasmacomponentsplugin.cpp b/declarativeimports/plasmacomponents/plasmacomponentsplugin.cpp index dbf6a76fa..34d56d9ec 100644 --- a/declarativeimports/plasmacomponents/plasmacomponentsplugin.cpp +++ b/declarativeimports/plasmacomponents/plasmacomponentsplugin.cpp @@ -19,10 +19,9 @@ #include "plasmacomponentsplugin.h" -#include -#include -#include -#include +#include +#include +#include #include "qrangemodel.h" @@ -35,9 +34,9 @@ #include "enums.h" #include "qmenu.h" #include "qmenuitem.h" -#include "fullscreensheet.h" +//#include "fullscreensheet.h" -Q_EXPORT_PLUGIN2(plasmacomponentsplugin, PlasmaComponentsPlugin) +//Q_EXPORT_PLUGIN2(plasmacomponentsplugin, PlasmaComponentsPlugin) class BKSingleton { @@ -55,7 +54,7 @@ EngineBookKeeping *EngineBookKeeping::self() return &privateBKSelf->self; } -QDeclarativeEngine *EngineBookKeeping::engine() const +QQmlEngine *EngineBookKeeping::engine() const { //for components creation, any engine will do, as long is valid if (m_engines.isEmpty()) { @@ -66,7 +65,7 @@ QDeclarativeEngine *EngineBookKeeping::engine() const } } -void EngineBookKeeping::insertEngine(QDeclarativeEngine *engine) +void EngineBookKeeping::insertEngine(QQmlEngine *engine) { connect(engine, SIGNAL(destroyed(QObject *)), this, SLOT(engineDestroyed(QObject *))); @@ -75,14 +74,14 @@ void EngineBookKeeping::insertEngine(QDeclarativeEngine *engine) void EngineBookKeeping::engineDestroyed(QObject *deleted) { - m_engines.remove(static_cast(deleted)); + m_engines.remove(static_cast(deleted)); } -void PlasmaComponentsPlugin::initializeEngine(QDeclarativeEngine *engine, const char *uri) +void PlasmaComponentsPlugin::initializeEngine(QQmlEngine *engine, const char *uri) { - QDeclarativeExtensionPlugin::initializeEngine(engine, uri); + QQmlExtensionPlugin::initializeEngine(engine, uri); EngineBookKeeping::self()->insertEngine(engine); } @@ -96,7 +95,7 @@ void PlasmaComponentsPlugin::registerTypes(const char *uri) qmlRegisterType(uri, 0, 1, "Menu"); qmlRegisterType(uri, 0, 1, "MenuItem"); } else { - qmlRegisterType(uri, 0, 1, "Sheet"); + // qmlRegisterType(uri, 0, 1, "Sheet"); } qmlRegisterType(uri, 0, 1, "RangeModel"); @@ -107,5 +106,5 @@ void PlasmaComponentsPlugin::registerTypes(const char *uri) } -#include "plasmacomponentsplugin.moc" +#include "moc_plasmacomponentsplugin.cpp" diff --git a/declarativeimports/plasmacomponents/plasmacomponentsplugin.h b/declarativeimports/plasmacomponents/plasmacomponentsplugin.h index 7384060c7..3a2a9a26d 100644 --- a/declarativeimports/plasmacomponents/plasmacomponentsplugin.h +++ b/declarativeimports/plasmacomponents/plasmacomponentsplugin.h @@ -20,11 +20,11 @@ #ifndef PLASMACOMPONENTSPLUGIN_H #define PLASMACOMPONENTSPLUGIN_H -#include +#include #include -class QDeclarativeEngine; -class QDeclarativeItem; +class QQmlEngine; +class QQuickItem; class PlasmaComponentsPlugin; class EngineBookKeeping : public QObject @@ -35,22 +35,23 @@ public: EngineBookKeeping(); static EngineBookKeeping *self(); - void insertEngine(QDeclarativeEngine *engine); - QDeclarativeEngine *engine() const; + void insertEngine(QQmlEngine *engine); + QQmlEngine *engine() const; private Q_SLOTS: void engineDestroyed(QObject *deleted); private: - QSet m_engines; + QSet m_engines; }; -class PlasmaComponentsPlugin : public QDeclarativeExtensionPlugin +class PlasmaComponentsPlugin : public QQmlExtensionPlugin { Q_OBJECT + Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface") public: - void initializeEngine(QDeclarativeEngine *engine, const char *uri); + void initializeEngine(QQmlEngine *engine, const char *uri); void registerTypes(const char *uri); }; diff --git a/declarativeimports/plasmacomponents/platformcomponents/touch/EditBubble.qml b/declarativeimports/plasmacomponents/platformcomponents/touch/EditBubble.qml index 96f39689b..3d7d16c32 100644 --- a/declarativeimports/plasmacomponents/platformcomponents/touch/EditBubble.qml +++ b/declarativeimports/plasmacomponents/platformcomponents/touch/EditBubble.qml @@ -17,7 +17,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -import QtQuick 1.1 +import QtQuick 2.0 import org.kde.plasma.core 0.1 as PlasmaCore import org.kde.qtextracomponents 0.1 diff --git a/declarativeimports/plasmacomponents/platformcomponents/touch/Menu.qml b/declarativeimports/plasmacomponents/platformcomponents/touch/Menu.qml index 56329c83b..699c78b5e 100644 --- a/declarativeimports/plasmacomponents/platformcomponents/touch/Menu.qml +++ b/declarativeimports/plasmacomponents/platformcomponents/touch/Menu.qml @@ -17,7 +17,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -import QtQuick 1.0 +import QtQuick 2.0 import org.kde.plasma.core 0.1 as PlasmaCore import "." 0.1 diff --git a/declarativeimports/plasmacomponents/platformcomponents/touch/MenuItem.qml b/declarativeimports/plasmacomponents/platformcomponents/touch/MenuItem.qml index 0ec88eda1..a15b8c919 100644 --- a/declarativeimports/plasmacomponents/platformcomponents/touch/MenuItem.qml +++ b/declarativeimports/plasmacomponents/platformcomponents/touch/MenuItem.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ -import QtQuick 1.1 +import QtQuick 2.0 import org.kde.plasma.core 0.1 as PlasmaCore Item { diff --git a/declarativeimports/plasmacomponents/platformcomponents/touch/ScrollBar.qml b/declarativeimports/plasmacomponents/platformcomponents/touch/ScrollBar.qml index ab9b4115d..693882cf9 100644 --- a/declarativeimports/plasmacomponents/platformcomponents/touch/ScrollBar.qml +++ b/declarativeimports/plasmacomponents/platformcomponents/touch/ScrollBar.qml @@ -18,7 +18,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -import QtQuick 1.1 +import QtQuick 2.0 import org.kde.plasma.core 0.1 as PlasmaCore import "private" as Private diff --git a/declarativeimports/plasmacomponents/platformcomponents/touch/ScrollDecorator.qml b/declarativeimports/plasmacomponents/platformcomponents/touch/ScrollDecorator.qml index b3b11eb7a..82dff27c9 100644 --- a/declarativeimports/plasmacomponents/platformcomponents/touch/ScrollDecorator.qml +++ b/declarativeimports/plasmacomponents/platformcomponents/touch/ScrollDecorator.qml @@ -17,7 +17,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -import QtQuick 1.0 +import QtQuick 2.0 /** * Just provided for compatibility diff --git a/declarativeimports/plasmacomponents/platformcomponents/touch/SectionScroller.qml b/declarativeimports/plasmacomponents/platformcomponents/touch/SectionScroller.qml index 19b26729b..cec4107c2 100644 --- a/declarativeimports/plasmacomponents/platformcomponents/touch/SectionScroller.qml +++ b/declarativeimports/plasmacomponents/platformcomponents/touch/SectionScroller.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ -import QtQuick 1.1 +import QtQuick 2.0 import "private/SectionScroller.js" as Sections import org.kde.plasma.core 0.1 as PlasmaCore diff --git a/declarativeimports/plasmacomponents/platformcomponents/touch/Sheet.qml b/declarativeimports/plasmacomponents/platformcomponents/touch/Sheet.qml index e4f096c51..e9ade11cf 100644 --- a/declarativeimports/plasmacomponents/platformcomponents/touch/Sheet.qml +++ b/declarativeimports/plasmacomponents/platformcomponents/touch/Sheet.qml @@ -40,7 +40,7 @@ ** ****************************************************************************/ -import QtQuick 1.0 +import QtQuick 2.0 import org.kde.plasma.core 0.1 as PlasmaCore import "private/AppManager.js" as Utils import "." 0.1 diff --git a/declarativeimports/plasmacomponents/platformcomponents/touch/TextArea.qml b/declarativeimports/plasmacomponents/platformcomponents/touch/TextArea.qml index 295a2a367..2afd8733f 100644 --- a/declarativeimports/plasmacomponents/platformcomponents/touch/TextArea.qml +++ b/declarativeimports/plasmacomponents/platformcomponents/touch/TextArea.qml @@ -17,7 +17,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -import QtQuick 1.1 +import QtQuick 2.0 import org.kde.plasma.core 0.1 as PlasmaCore import org.kde.qtextracomponents 0.1 import "EditBubble.js" as EditBubbleHelper diff --git a/declarativeimports/plasmacomponents/platformcomponents/touch/TextField.qml b/declarativeimports/plasmacomponents/platformcomponents/touch/TextField.qml index d5d1e8450..5d01b1971 100644 --- a/declarativeimports/plasmacomponents/platformcomponents/touch/TextField.qml +++ b/declarativeimports/plasmacomponents/platformcomponents/touch/TextField.qml @@ -17,7 +17,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -import QtQuick 1.1 +import QtQuick 2.0 import org.kde.plasma.core 0.1 as PlasmaCore import org.kde.qtextracomponents 0.1 import "EditBubble.js" as EditBubbleHelper diff --git a/declarativeimports/plasmacomponents/platformcomponents/touch/TextFieldFocus.qml b/declarativeimports/plasmacomponents/platformcomponents/touch/TextFieldFocus.qml index a8b031c13..1ac2492d4 100644 --- a/declarativeimports/plasmacomponents/platformcomponents/touch/TextFieldFocus.qml +++ b/declarativeimports/plasmacomponents/platformcomponents/touch/TextFieldFocus.qml @@ -18,7 +18,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -import QtQuick 1.0 +import QtQuick 2.0 import org.kde.plasma.core 0.1 as PlasmaCore Item { diff --git a/declarativeimports/plasmacomponents/platformcomponents/touch/Window.qml b/declarativeimports/plasmacomponents/platformcomponents/touch/Window.qml index 2f436a932..01768be6a 100644 --- a/declarativeimports/plasmacomponents/platformcomponents/touch/Window.qml +++ b/declarativeimports/plasmacomponents/platformcomponents/touch/Window.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ -import QtQuick 1.0 +import QtQuick 2.0 Item { id: root diff --git a/declarativeimports/plasmacomponents/qml/BusyIndicator.qml b/declarativeimports/plasmacomponents/qml/BusyIndicator.qml index e08e95f8e..cf1b8a106 100644 --- a/declarativeimports/plasmacomponents/qml/BusyIndicator.qml +++ b/declarativeimports/plasmacomponents/qml/BusyIndicator.qml @@ -18,7 +18,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -import QtQuick 1.1 +import QtQuick 2.0 import org.kde.plasma.core 0.1 as PlasmaCore /** diff --git a/declarativeimports/plasmacomponents/qml/Button.qml b/declarativeimports/plasmacomponents/qml/Button.qml index 1168e6a7f..56e07d428 100644 --- a/declarativeimports/plasmacomponents/qml/Button.qml +++ b/declarativeimports/plasmacomponents/qml/Button.qml @@ -28,7 +28,7 @@ * theme which changes via the systemsetting-workspace appearance -desktop * theme. */ -import QtQuick 1.1 +import QtQuick 2.0 import org.kde.plasma.core 0.1 as PlasmaCore import "private" as Private diff --git a/declarativeimports/plasmacomponents/qml/ButtonRow.qml b/declarativeimports/plasmacomponents/qml/ButtonRow.qml index 1921f9cc4..47671cfe6 100644 --- a/declarativeimports/plasmacomponents/qml/ButtonRow.qml +++ b/declarativeimports/plasmacomponents/qml/ButtonRow.qml @@ -39,7 +39,7 @@ ** ****************************************************************************/ -import QtQuick 1.1 +import QtQuick 2.0 import "ButtonGroup.js" as Behavior /** diff --git a/declarativeimports/plasmacomponents/qml/CheckBox.qml b/declarativeimports/plasmacomponents/qml/CheckBox.qml index 93f82b03e..0ac902bfb 100644 --- a/declarativeimports/plasmacomponents/qml/CheckBox.qml +++ b/declarativeimports/plasmacomponents/qml/CheckBox.qml @@ -17,7 +17,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -import QtQuick 1.0 +import QtQuick 2.0 import org.kde.plasma.core 0.1 as PlasmaCore import "private" as Private diff --git a/declarativeimports/plasmacomponents/qml/CommonDialog.qml b/declarativeimports/plasmacomponents/qml/CommonDialog.qml index b7064752e..eccaf4f56 100644 --- a/declarativeimports/plasmacomponents/qml/CommonDialog.qml +++ b/declarativeimports/plasmacomponents/qml/CommonDialog.qml @@ -40,7 +40,7 @@ ** ****************************************************************************/ -import QtQuick 1.1 +import QtQuick 2.0 import org.kde.plasma.core 0.1 as PlasmaCore import "." 0.1 diff --git a/declarativeimports/plasmacomponents/qml/ContextMenu.qml b/declarativeimports/plasmacomponents/qml/ContextMenu.qml index bbb6dd33a..213d65efc 100644 --- a/declarativeimports/plasmacomponents/qml/ContextMenu.qml +++ b/declarativeimports/plasmacomponents/qml/ContextMenu.qml @@ -40,7 +40,7 @@ ** ****************************************************************************/ -import QtQuick 1.1 +import QtQuick 2.0 import org.kde.plasma.components 0.1 /** diff --git a/declarativeimports/plasmacomponents/qml/Dialog.qml b/declarativeimports/plasmacomponents/qml/Dialog.qml index f01309940..6a76b5963 100644 --- a/declarativeimports/plasmacomponents/qml/Dialog.qml +++ b/declarativeimports/plasmacomponents/qml/Dialog.qml @@ -40,7 +40,7 @@ ** ****************************************************************************/ -import QtQuick 1.0 +import QtQuick 2.0 import org.kde.plasma.core 0.1 as PlasmaCore import "private/AppManager.js" as Utils import "." 0.1 diff --git a/declarativeimports/plasmacomponents/qml/Highlight.qml b/declarativeimports/plasmacomponents/qml/Highlight.qml index 785a5444f..dd474faba 100644 --- a/declarativeimports/plasmacomponents/qml/Highlight.qml +++ b/declarativeimports/plasmacomponents/qml/Highlight.qml @@ -17,7 +17,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -import QtQuick 1.0 +import QtQuick 2.0 import org.kde.plasma.core 0.1 as PlasmaCore /** diff --git a/declarativeimports/plasmacomponents/qml/Label.qml b/declarativeimports/plasmacomponents/qml/Label.qml index e22fd5015..1d80d7855 100644 --- a/declarativeimports/plasmacomponents/qml/Label.qml +++ b/declarativeimports/plasmacomponents/qml/Label.qml @@ -17,7 +17,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -import QtQuick 1.1 +import QtQuick 2.0 import org.kde.plasma.core 0.1 as PlasmaCore /** diff --git a/declarativeimports/plasmacomponents/qml/ListItem.qml b/declarativeimports/plasmacomponents/qml/ListItem.qml index 0dea0d93a..a52d889c0 100644 --- a/declarativeimports/plasmacomponents/qml/ListItem.qml +++ b/declarativeimports/plasmacomponents/qml/ListItem.qml @@ -17,7 +17,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -import QtQuick 1.0 +import QtQuick 2.0 import org.kde.plasma.core 0.1 as PlasmaCore import "private/Config.js" as Config diff --git a/declarativeimports/plasmacomponents/qml/Page.qml b/declarativeimports/plasmacomponents/qml/Page.qml index 3266b43bc..c0e8e08c1 100644 --- a/declarativeimports/plasmacomponents/qml/Page.qml +++ b/declarativeimports/plasmacomponents/qml/Page.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ -import QtQuick 1.1 +import QtQuick 2.0 import "." 0.1 diff --git a/declarativeimports/plasmacomponents/qml/PageStack.qml b/declarativeimports/plasmacomponents/qml/PageStack.qml index 3d5b04150..0b803ee8b 100644 --- a/declarativeimports/plasmacomponents/qml/PageStack.qml +++ b/declarativeimports/plasmacomponents/qml/PageStack.qml @@ -43,7 +43,7 @@ // The PageStack item defines a container for pages and a stack-based // navigation model. Pages can be defined as QML items or components. -import QtQuick 1.1 +import QtQuick 2.0 import "." 0.1 import "private/PageStack.js" as Engine diff --git a/declarativeimports/plasmacomponents/qml/ProgressBar.qml b/declarativeimports/plasmacomponents/qml/ProgressBar.qml index c3877cd4d..a01848d0b 100644 --- a/declarativeimports/plasmacomponents/qml/ProgressBar.qml +++ b/declarativeimports/plasmacomponents/qml/ProgressBar.qml @@ -17,7 +17,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -import QtQuick 1.0 +import QtQuick 2.0 import org.kde.plasma.core 0.1 as PlasmaCore import org.kde.qtextracomponents 0.1 diff --git a/declarativeimports/plasmacomponents/qml/QueryDialog.qml b/declarativeimports/plasmacomponents/qml/QueryDialog.qml index 23604e002..b83b05fcc 100644 --- a/declarativeimports/plasmacomponents/qml/QueryDialog.qml +++ b/declarativeimports/plasmacomponents/qml/QueryDialog.qml @@ -40,7 +40,7 @@ ** ****************************************************************************/ -import QtQuick 1.1 +import QtQuick 2.0 import org.kde.plasma.extras 0.1 as PlasmaExtras import "." 0.1 diff --git a/declarativeimports/plasmacomponents/qml/RadioButton.qml b/declarativeimports/plasmacomponents/qml/RadioButton.qml index dd1247372..b1da4028e 100644 --- a/declarativeimports/plasmacomponents/qml/RadioButton.qml +++ b/declarativeimports/plasmacomponents/qml/RadioButton.qml @@ -17,7 +17,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -import QtQuick 1.0 +import QtQuick 2.0 import org.kde.plasma.core 0.1 as PlasmaCore import "private" as Private diff --git a/declarativeimports/plasmacomponents/qml/ScrollBar.qml b/declarativeimports/plasmacomponents/qml/ScrollBar.qml index 11ebc6879..e6ef59836 100644 --- a/declarativeimports/plasmacomponents/qml/ScrollBar.qml +++ b/declarativeimports/plasmacomponents/qml/ScrollBar.qml @@ -18,7 +18,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -import QtQuick 1.1 +import QtQuick 2.0 import org.kde.plasma.core 0.1 as PlasmaCore import "private" as Private diff --git a/declarativeimports/plasmacomponents/qml/SectionScroller.qml b/declarativeimports/plasmacomponents/qml/SectionScroller.qml index 507216d50..5254da9d2 100644 --- a/declarativeimports/plasmacomponents/qml/SectionScroller.qml +++ b/declarativeimports/plasmacomponents/qml/SectionScroller.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ -import QtQuick 1.1 +import QtQuick 2.0 import "private/SectionScroller.js" as Sections import org.kde.plasma.core 0.1 as PlasmaCore diff --git a/declarativeimports/plasmacomponents/qml/SelectionDialog.qml b/declarativeimports/plasmacomponents/qml/SelectionDialog.qml index 0fc21c4e9..fbc9f011d 100644 --- a/declarativeimports/plasmacomponents/qml/SelectionDialog.qml +++ b/declarativeimports/plasmacomponents/qml/SelectionDialog.qml @@ -40,7 +40,7 @@ ** ****************************************************************************/ -import QtQuick 1.1 +import QtQuick 2.0 import org.kde.plasma.core 0.1 as PlasmaCore import "." 0.1 diff --git a/declarativeimports/plasmacomponents/qml/Sheet.qml b/declarativeimports/plasmacomponents/qml/Sheet.qml index f13705aac..33b312bab 100644 --- a/declarativeimports/plasmacomponents/qml/Sheet.qml +++ b/declarativeimports/plasmacomponents/qml/Sheet.qml @@ -40,7 +40,7 @@ ** ****************************************************************************/ -import QtQuick 1.0 +import QtQuick 2.0 import org.kde.plasma.core 0.1 as PlasmaCore import "private/AppManager.js" as Utils import "." 0.1 diff --git a/declarativeimports/plasmacomponents/qml/Slider.qml b/declarativeimports/plasmacomponents/qml/Slider.qml index 3190d212b..74d4c5de6 100644 --- a/declarativeimports/plasmacomponents/qml/Slider.qml +++ b/declarativeimports/plasmacomponents/qml/Slider.qml @@ -17,7 +17,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -import QtQuick 1.0 +import QtQuick 2.0 import org.kde.plasma.core 0.1 as PlasmaCore import "private" as Private diff --git a/declarativeimports/plasmacomponents/qml/Switch.qml b/declarativeimports/plasmacomponents/qml/Switch.qml index 999359730..d4630f92d 100644 --- a/declarativeimports/plasmacomponents/qml/Switch.qml +++ b/declarativeimports/plasmacomponents/qml/Switch.qml @@ -17,7 +17,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -import QtQuick 1.0 +import QtQuick 2.0 import org.kde.plasma.core 0.1 as PlasmaCore import "private" as Private diff --git a/declarativeimports/plasmacomponents/qml/TabBar.qml b/declarativeimports/plasmacomponents/qml/TabBar.qml index f7287bf60..c2218319f 100644 --- a/declarativeimports/plasmacomponents/qml/TabBar.qml +++ b/declarativeimports/plasmacomponents/qml/TabBar.qml @@ -40,7 +40,7 @@ ** ****************************************************************************/ -import QtQuick 1.1 +import QtQuick 2.0 import org.kde.plasma.core 0.1 as PlasmaCore import "private" as Private diff --git a/declarativeimports/plasmacomponents/qml/TabButton.qml b/declarativeimports/plasmacomponents/qml/TabButton.qml index a17a1de3e..062530f2c 100644 --- a/declarativeimports/plasmacomponents/qml/TabButton.qml +++ b/declarativeimports/plasmacomponents/qml/TabButton.qml @@ -40,7 +40,7 @@ ** ****************************************************************************/ -import QtQuick 1.1 +import QtQuick 2.0 import "private/AppManager.js" as Utils import org.kde.plasma.core 0.1 as PlasmaCore diff --git a/declarativeimports/plasmacomponents/qml/TabGroup.qml b/declarativeimports/plasmacomponents/qml/TabGroup.qml index 93c502b97..bfcc0055c 100644 --- a/declarativeimports/plasmacomponents/qml/TabGroup.qml +++ b/declarativeimports/plasmacomponents/qml/TabGroup.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ -import QtQuick 1.1 +import QtQuick 2.0 import "private/TabGroup.js" as Engine import "." 0.1 diff --git a/declarativeimports/plasmacomponents/qml/TextArea.qml b/declarativeimports/plasmacomponents/qml/TextArea.qml index a4864d003..6f9269119 100644 --- a/declarativeimports/plasmacomponents/qml/TextArea.qml +++ b/declarativeimports/plasmacomponents/qml/TextArea.qml @@ -17,7 +17,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -import QtQuick 1.1 +import QtQuick 2.0 import org.kde.plasma.core 0.1 as PlasmaCore import "private" as Private diff --git a/declarativeimports/plasmacomponents/qml/TextField.qml b/declarativeimports/plasmacomponents/qml/TextField.qml index 2f0133f52..04d99ac80 100644 --- a/declarativeimports/plasmacomponents/qml/TextField.qml +++ b/declarativeimports/plasmacomponents/qml/TextField.qml @@ -17,7 +17,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -import QtQuick 1.1 +import QtQuick 2.0 import org.kde.plasma.core 0.1 as PlasmaCore import "private" as Private @@ -122,7 +122,7 @@ FocusScope { * integers between 11 and 31 into the text input: * * @code - * import QtQuick 1.0 + * import QtQuick 2.0 * TextInput { * validator: IntValidator { bottom: 11; top: 31 } * focus: true diff --git a/declarativeimports/plasmacomponents/qml/ToolBar.qml b/declarativeimports/plasmacomponents/qml/ToolBar.qml index 930c7c13b..42ecc0274 100644 --- a/declarativeimports/plasmacomponents/qml/ToolBar.qml +++ b/declarativeimports/plasmacomponents/qml/ToolBar.qml @@ -17,7 +17,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -import QtQuick 1.1 +import QtQuick 2.0 import org.kde.plasma.core 0.1 as PlasmaCore /** diff --git a/declarativeimports/plasmacomponents/qml/ToolBarLayout.qml b/declarativeimports/plasmacomponents/qml/ToolBarLayout.qml index dfee250fa..f39efede1 100644 --- a/declarativeimports/plasmacomponents/qml/ToolBarLayout.qml +++ b/declarativeimports/plasmacomponents/qml/ToolBarLayout.qml @@ -17,7 +17,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -import QtQuick 1.1 +import QtQuick 2.0 import "." 0.1 /** diff --git a/declarativeimports/plasmacomponents/qml/ToolButton.qml b/declarativeimports/plasmacomponents/qml/ToolButton.qml index 1baa108a0..0f20ada16 100644 --- a/declarativeimports/plasmacomponents/qml/ToolButton.qml +++ b/declarativeimports/plasmacomponents/qml/ToolButton.qml @@ -18,7 +18,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -import QtQuick 1.1 +import QtQuick 2.0 import org.kde.plasma.core 0.1 as PlasmaCore import "private" as Private diff --git a/declarativeimports/plasmacomponents/qml/private/ButtonShadow.qml b/declarativeimports/plasmacomponents/qml/private/ButtonShadow.qml index 8c00c35ca..a58e1406a 100644 --- a/declarativeimports/plasmacomponents/qml/private/ButtonShadow.qml +++ b/declarativeimports/plasmacomponents/qml/private/ButtonShadow.qml @@ -33,7 +33,7 @@ TODO i need more info here Properties: **/ -import QtQuick 1.0 +import QtQuick 2.0 import org.kde.plasma.core 0.1 as PlasmaCore Item { diff --git a/declarativeimports/plasmacomponents/qml/private/DualStateButton.qml b/declarativeimports/plasmacomponents/qml/private/DualStateButton.qml index 6cef3c1c2..694c21d0e 100644 --- a/declarativeimports/plasmacomponents/qml/private/DualStateButton.qml +++ b/declarativeimports/plasmacomponents/qml/private/DualStateButton.qml @@ -17,7 +17,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -import QtQuick 1.0 +import QtQuick 2.0 import org.kde.plasma.core 0.1 as PlasmaCore /** diff --git a/declarativeimports/plasmacomponents/qml/private/InlineDialog.qml b/declarativeimports/plasmacomponents/qml/private/InlineDialog.qml index 2b7b83233..3fb542bd3 100644 --- a/declarativeimports/plasmacomponents/qml/private/InlineDialog.qml +++ b/declarativeimports/plasmacomponents/qml/private/InlineDialog.qml @@ -17,7 +17,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -import QtQuick 1.1 +import QtQuick 2.0 import org.kde.plasma.core 0.1 as PlasmaCore import org.kde.plasma.extras 0.1 as PlasmaExtras import org.kde.plasma.components 0.1 as PlasmaComponents diff --git a/declarativeimports/plasmacomponents/qml/private/RoundShadow.qml b/declarativeimports/plasmacomponents/qml/private/RoundShadow.qml index a1518b474..578d66098 100644 --- a/declarativeimports/plasmacomponents/qml/private/RoundShadow.qml +++ b/declarativeimports/plasmacomponents/qml/private/RoundShadow.qml @@ -34,7 +34,7 @@ Properties: TODO needs more info?? **/ -import QtQuick 1.0 +import QtQuick 2.0 import org.kde.plasma.core 0.1 as PlasmaCore Item { diff --git a/declarativeimports/plasmacomponents/qml/private/ScrollBarDelegate.qml b/declarativeimports/plasmacomponents/qml/private/ScrollBarDelegate.qml index 7f925492a..9898c0a37 100644 --- a/declarativeimports/plasmacomponents/qml/private/ScrollBarDelegate.qml +++ b/declarativeimports/plasmacomponents/qml/private/ScrollBarDelegate.qml @@ -18,7 +18,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -import QtQuick 1.1 +import QtQuick 2.0 import org.kde.plasma.core 0.1 as PlasmaCore diff --git a/declarativeimports/plasmacomponents/qml/private/ScrollDecoratorDelegate.qml b/declarativeimports/plasmacomponents/qml/private/ScrollDecoratorDelegate.qml index ca8e7af4e..c95da0071 100644 --- a/declarativeimports/plasmacomponents/qml/private/ScrollDecoratorDelegate.qml +++ b/declarativeimports/plasmacomponents/qml/private/ScrollDecoratorDelegate.qml @@ -18,7 +18,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -import QtQuick 1.1 +import QtQuick 2.0 import org.kde.plasma.core 0.1 as PlasmaCore diff --git a/declarativeimports/plasmacomponents/qml/private/TabBarLayout.qml b/declarativeimports/plasmacomponents/qml/private/TabBarLayout.qml index bb96903b5..f9877250a 100644 --- a/declarativeimports/plasmacomponents/qml/private/TabBarLayout.qml +++ b/declarativeimports/plasmacomponents/qml/private/TabBarLayout.qml @@ -54,7 +54,7 @@ Properties: **/ -import QtQuick 1.1 +import QtQuick 2.0 import org.kde.qtextracomponents 0.1 import "AppManager.js" as Utils diff --git a/declarativeimports/plasmacomponents/qml/private/TextFieldFocus.qml b/declarativeimports/plasmacomponents/qml/private/TextFieldFocus.qml index 3bc24ffcc..855a4177b 100644 --- a/declarativeimports/plasmacomponents/qml/private/TextFieldFocus.qml +++ b/declarativeimports/plasmacomponents/qml/private/TextFieldFocus.qml @@ -18,7 +18,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -import QtQuick 1.0 +import QtQuick 2.0 import org.kde.plasma.core 0.1 as PlasmaCore Item {