diff --git a/src/private/Splitter.qml b/src/private/SplitterBase.qml similarity index 99% rename from src/private/Splitter.qml rename to src/private/SplitterBase.qml index b24840b63a0c73e06d1356d986ffbe4c6fa6d860..d70128f12297ca34af741f429980b4653ac88be9 100644 --- a/src/private/Splitter.qml +++ b/src/private/SplitterBase.qml @@ -40,6 +40,7 @@ import QtQuick 2.0 import QtDesktop 1.0 +import QtDesktop.Private 1.0 as Private Splitter { id: root @@ -58,6 +59,7 @@ Splitter { QtObject { id: d + property bool horizontal: orientation == Qt.Horizontal property string size: horizontal ? "width" : "height" property string minimum: horizontal ? "minimumWidth" : "minimumHeight" diff --git a/src/private/private.pro b/src/private/private.pro index b0a8fa4ffdc046e8965e2146eb7a44997dac79d1..4f231692e1e0750308605703e379bf99c7894e02 100644 --- a/src/private/private.pro +++ b/src/private/private.pro @@ -10,16 +10,14 @@ HEADERS += \ $$PWD/qrangemodel_p.h \ $$PWD/qrangemodel_p_p.h \ $$PWD/qwheelarea_p.h \ - $$PWD/qstyleitem_p.h \ - $$PWD/qtsplitterbase_p.h + $$PWD/qstyleitem_p.h SOURCES += \ $$PWD/qquickcomponentsprivate.cpp \ $$PWD/qprivateplugin.cpp\ $$PWD/qstyleitem.cpp \ $$PWD/qrangemodel.cpp\ - $$PWD/qwheelarea.cpp \ - $$PWD/qtsplitterbase.cpp + $$PWD/qwheelarea.cpp OTHER_FILES += \ $$PWD/privateplugin.json @@ -32,8 +30,8 @@ QML_FILES += \ ModalPopupBehavior.qml \ PageSlideTransition.qml \ PageStack.js \ + SplitterBase.qml \ ScrollAreaHelper.qml \ - Splitter.qml \ ScrollBar.qml \ FocusFrame.qml diff --git a/src/private/qmldir b/src/private/qmldir index a9046611c6b4270329049113ba69d7c403857870..6f42dc1481ecd9e1542a07fc6afdfd6a21779018 100644 --- a/src/private/qmldir +++ b/src/private/qmldir @@ -7,3 +7,4 @@ ScrollBar 1.0 ScrollBar.qml ScrollAreaHelper 1.0 ScrollAreaHelper.qml TabBar 1.0 TabBar.qml PageSlideTransition 1.0 PageSlideTransition.qml +SplitterBase 1.0 SplitterBase.qml diff --git a/src/private/qprivateplugin.cpp b/src/private/qprivateplugin.cpp index b44b53ccec16d6dc5aaeada199a3b5790fc6edcf..8a807da04043d282eb130708aadb62c6ac10cc3c 100644 --- a/src/private/qprivateplugin.cpp +++ b/src/private/qprivateplugin.cpp @@ -44,7 +44,6 @@ #include "qwheelarea_p.h" #include "qstyleitem_p.h" #include "qquickcomponentsprivate_p.h" -#include "qtsplitterbase_p.h" QT_BEGIN_NAMESPACE @@ -61,7 +60,6 @@ void StylePlugin::registerTypes(const char *uri) qmlRegisterType<QRangeModel>(uri, 1, 0, "RangeModel"); qmlRegisterType<QWheelArea>(uri, 1, 0, "WheelArea"); qmlRegisterType<QStyleItem>(uri, 1, 0, "StyleItem"); - qmlRegisterType<QtSplitterBase>(uri, 1, 0, "Splitter"); qmlRegisterSingletonType<QQuickComponentsPrivate>(uri, 1, 0, "PrivateHelper", registerPrivateModule); } diff --git a/src/qtdesktop/SplitterColumn.qml b/src/qtdesktop/SplitterColumn.qml index 51f6457ae40d19f1a1cea1dad4d7a3eb2356e16c..0b9026d641d4301728ea294c2e8f223d3da85246 100644 --- a/src/qtdesktop/SplitterColumn.qml +++ b/src/qtdesktop/SplitterColumn.qml @@ -40,7 +40,6 @@ import QtQuick 2.0 import QtDesktop.Private 1.0 as Private -import QtDesktop 1.0 /*! \qmltype SplitterColumn @@ -144,9 +143,9 @@ import QtDesktop 1.0 * } */ -Private.Splitter { +Private.SplitterBase { orientation: Qt.Vertical - handleDelegate: StyleItem { + handleDelegate: Private.StyleItem { id: styleitem elementType: "splitter" height: handleWidth != -1 ? handleWidth : pixelMetric("splitterwidth") diff --git a/src/qtdesktop/SplitterRow.qml b/src/qtdesktop/SplitterRow.qml index d9ee388fcb7cd329a6054b95cb366e7e84a58332..54bd331df1311ff8e0cedab677c2f299700095f5 100644 --- a/src/qtdesktop/SplitterRow.qml +++ b/src/qtdesktop/SplitterRow.qml @@ -40,7 +40,6 @@ import QtQuick 2.0 import QtDesktop.Private 1.0 as Private -import QtDesktop 1.0 /*! \qmltype SplitterRow @@ -145,9 +144,9 @@ import QtDesktop 1.0 */ -Private.Splitter { +Private.SplitterBase { orientation: Qt.Horizontal - handleDelegate: StyleItem { + handleDelegate: Private.StyleItem { id: styleitem elementType: "splitter" width: handleWidth != -1 ? handleWidth : pixelMetric("splitterwidth") diff --git a/src/qtdesktop/plugin.cpp b/src/qtdesktop/plugin.cpp index b8c768914060bd13ac0a0e93879285a996d6f058..6dd49f08467e59689c30eee01c1c836eaf557030 100644 --- a/src/qtdesktop/plugin.cpp +++ b/src/qtdesktop/plugin.cpp @@ -45,6 +45,7 @@ #include "qtmenu_p.h" #include "qtmenubar_p.h" #include "qquicklinearlayout_p.h" +#include "qtsplitterbase_p.h" #include "qpagestatus.h" #include <qqmlextensionplugin.h> @@ -93,6 +94,7 @@ void StylePlugin::registerTypes(const char *uri) QLatin1String("Do not create objects of type Layout")); qmlRegisterUncreatableType<QPageStatus>(uri, 1, 0, "PageStatus", QLatin1String("Do not create objects of type PageStatus")); + qmlRegisterType<QtSplitterBase>(uri, 1, 0, "Splitter"); } void StylePlugin::initializeEngine(QQmlEngine *engine, const char *uri) diff --git a/src/qtdesktop/plugin.pri b/src/qtdesktop/plugin.pri index 5637e75ccc736d26084e89774ebd64164475cac2..dae7ddd494a3a25ff32637e5d0786a6073a07a89 100644 --- a/src/qtdesktop/plugin.pri +++ b/src/qtdesktop/plugin.pri @@ -4,6 +4,7 @@ HEADERS += \ $$PWD/qquicklinearlayout_p.h \ $$PWD/plugin_p.h \ $$PWD/qtaction_p.h \ + $$PWD/qtsplitterbase_p.h \ $$PWD/qtexclusivegroup_p.h \ $$PWD/qtmenu_p.h \ $$PWD/qtmenubar_p.h \ @@ -13,6 +14,7 @@ HEADERS += \ SOURCES += \ $$PWD/qquicklayout.cpp \ + $$PWD/qtsplitterbase.cpp \ $$PWD/qquicklayoutengine.cpp \ $$PWD/qquicklinearlayout.cpp \ $$PWD/plugin.cpp \ diff --git a/src/qtdesktop/qmldir b/src/qtdesktop/qmldir index 2e6383303113b4ec52c97ee67f53ffbc93244266..72ebb39d635ec1fdfd7cbf0c2eb115e4c5812455 100644 --- a/src/qtdesktop/qmldir +++ b/src/qtdesktop/qmldir @@ -29,4 +29,3 @@ TextArea 1.0 TextArea.qml TextField 1.0 TextField.qml ToolBar 1.0 ToolBar.qml ToolButton 1.0 ToolButton.qml - diff --git a/src/private/qtsplitterbase.cpp b/src/qtdesktop/qtsplitterbase.cpp similarity index 100% rename from src/private/qtsplitterbase.cpp rename to src/qtdesktop/qtsplitterbase.cpp diff --git a/src/private/qtsplitterbase_p.h b/src/qtdesktop/qtsplitterbase_p.h similarity index 100% rename from src/private/qtsplitterbase_p.h rename to src/qtdesktop/qtsplitterbase_p.h