diff options
| author | Caroline Chao <caroline.chao@digia.com> | 2013-06-20 13:55:38 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-06-24 07:59:34 +0200 |
| commit | 9066836d5f649ea51a443559498be385282b3bdd (patch) | |
| tree | 70caba15b81330decd493583e8f175aa936a6cc1 /src | |
| parent | 22eeeb772747122960eea03e3010411db705b36f (diff) | |
Remove the QtQuick.Controls.Styles.Private module
This module doesn't bring much value by itself.
Move the private styles to the QtQuick.Controls.Private
module instead.
Change-Id: I2f633b4334b5a6120a3c402e9e30b294811f048d
Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
Diffstat (limited to 'src')
| -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 |
4 files changed, 6 insertions, 11 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 |