diff options
| -rw-r--r-- | src/private/qmldir | 5 | ||||
| -rw-r--r-- | src/src.pro | 2 | ||||
| -rw-r--r-- | src/styles/private/private.pro | 3 | ||||
| -rw-r--r-- | src/styles/private/qmldir | 7 | ||||
| -rw-r--r-- | tests/auto/controls/data/tst_groupbox.qml | 2 | ||||
| -rw-r--r-- | tests/auto/controls/data/tst_styles.qml | 10 | ||||
| -rw-r--r-- | tests/manual/testbench/content/Components.qml | 2 |
7 files changed, 13 insertions, 18 deletions
diff --git a/src/private/qmldir b/src/private/qmldir index 48fdff2fc..817e88a0f 100644 --- a/src/private/qmldir +++ b/src/private/qmldir @@ -12,3 +12,8 @@ TabBar 1.0 TabBar.qml StackViewSlideDelegate 1.0 StackViewSlideDelegate.qml StyleHelpers 1.0 style.js JSArray 1.0 StackView.js +GroupBoxStyle 1.0 ../Styles/Base/GroupBoxStyle.qml +SpinBoxStyle 1.0 ../Styles/Base/SpinBoxStyle.qml +ToolBarStyle 1.0 ../Styles/Base/ToolBarStyle.qml +StatusBarStyle 1.0 ../Styles/Base/StatusBarStyle.qml +ToolButtonStyle 1.0 ../Styles/Base/ToolButtonStyle.qml diff --git a/src/src.pro b/src/src.pro index 719a3c7b5..2108ac7e6 100644 --- a/src/src.pro +++ b/src/src.pro @@ -1,5 +1,5 @@ TEMPLATE = subdirs -SUBDIRS += controls styles private styles/private +SUBDIRS += controls styles private SUBDIRS += layouts diff --git a/src/styles/private/private.pro b/src/styles/private/private.pro deleted file mode 100644 index 9a5bcd1ed..000000000 --- a/src/styles/private/private.pro +++ /dev/null @@ -1,3 +0,0 @@ -TARGETPATH = QtQuick/Controls/Styles/Private - -load(qml_module) diff --git a/src/styles/private/qmldir b/src/styles/private/qmldir deleted file mode 100644 index 4d1885d5e..000000000 --- a/src/styles/private/qmldir +++ /dev/null @@ -1,7 +0,0 @@ -module QtQuick.Controls.Styles.Private - -GroupBoxStyle 1.0 ../Base/GroupBoxStyle.qml -SpinBoxStyle 1.0 ../Base/SpinBoxStyle.qml -ToolBarStyle 1.0 ../Base/ToolBarStyle.qml -StatusBarStyle 1.0 ../Base/StatusBarStyle.qml -ToolButtonStyle 1.0 ../Base/ToolButtonStyle.qml diff --git a/tests/auto/controls/data/tst_groupbox.qml b/tests/auto/controls/data/tst_groupbox.qml index 937781055..97dbb9e57 100644 --- a/tests/auto/controls/data/tst_groupbox.qml +++ b/tests/auto/controls/data/tst_groupbox.qml @@ -91,7 +91,7 @@ TestCase { function test_dynamicSize() { - var groupbox = Qt.createQmlObject('import QtQuick.Controls 1.0; import QtQuick.Controls.Styles.Private 1.0 ; GroupBox {style:GroupBoxStyle{}}', container, '') + var groupbox = Qt.createQmlObject('import QtQuick.Controls 1.0; import QtQuick.Controls.Private 1.0 ; GroupBox {style:GroupBoxStyle{}}', container, '') compare(groupbox.width, 16) compare(groupbox.height, 16) diff --git a/tests/auto/controls/data/tst_styles.qml b/tests/auto/controls/data/tst_styles.qml index 233c4a2eb..f6b53b722 100644 --- a/tests/auto/controls/data/tst_styles.qml +++ b/tests/auto/controls/data/tst_styles.qml @@ -62,7 +62,7 @@ Item { function test_createToolButtonStyle() { var control = Qt.createQmlObject( - 'import QtQuick 2.1; import QtQuick.Controls 1.0; import QtQuick.Controls.Styles.Private 1.0; \ + 'import QtQuick 2.1; import QtQuick.Controls 1.0; import QtQuick.Controls.Private 1.0; \ Rectangle { width: 50; height: 50; property Component style: ToolButtonStyle {}}' , container, '') } @@ -111,21 +111,21 @@ Item { function test_createSpinBoxStyle() { var control = Qt.createQmlObject( - 'import QtQuick 2.1; import QtQuick.Controls 1.0; import QtQuick.Controls.Styles.Private 1.0; \ + 'import QtQuick 2.1; import QtQuick.Controls 1.0; import QtQuick.Controls.Private 1.0; \ Rectangle { width: 50; height: 50; property Component style: SpinBoxStyle {}}' , container, '') } function test_createToolBarStyle() { var control = Qt.createQmlObject( - 'import QtQuick 2.1; import QtQuick.Controls 1.0; import QtQuick.Controls.Styles.Private 1.0; \ + 'import QtQuick 2.1; import QtQuick.Controls 1.0; import QtQuick.Controls.Private 1.0; \ Rectangle { width: 50; height: 50; property Component style: ToolBarStyle {}}' , container, '') } function test_createStatusBarStyle() { var control = Qt.createQmlObject( - 'import QtQuick 2.1; import QtQuick.Controls 1.0; import QtQuick.Controls.Styles.Private 1.0; \ + 'import QtQuick 2.1; import QtQuick.Controls 1.0; import QtQuick.Controls.Private 1.0; \ Rectangle { width: 50; height: 50; property Component style: StatusBarStyle {}}' , container, '') } @@ -146,7 +146,7 @@ Item { function test_createGroupBoxStyle() { var control = Qt.createQmlObject( - 'import QtQuick 2.1; import QtQuick.Controls 1.0; import QtQuick.Controls.Styles.Private 1.0; \ + 'import QtQuick 2.1; import QtQuick.Controls 1.0; import QtQuick.Controls.Private 1.0; \ Rectangle { width: 50; height: 50; property Component style: GroupBoxStyle {}}' , container, '') } diff --git a/tests/manual/testbench/content/Components.qml b/tests/manual/testbench/content/Components.qml index b497230d6..23527ccdb 100644 --- a/tests/manual/testbench/content/Components.qml +++ b/tests/manual/testbench/content/Components.qml @@ -41,7 +41,7 @@ import QtQuick 2.1 import QtQuick.Controls 1.0 import QtQuick.Controls.Styles 1.0 -import QtQuick.Controls.Styles.Private 1.0 +import QtQuick.Controls.Private 1.0 Item { property Component button: Button { text: "Push me"} |