diff options
| author | Caroline Chao <caroline.chao@digia.com> | 2013-06-20 13:47:31 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-06-24 07:59:25 +0200 |
| commit | 22eeeb772747122960eea03e3010411db705b36f (patch) | |
| tree | 9fad32682ff3f72df8b83160331d9583a3b54713 | |
| parent | 4ef9a9c15dbdb8d9a9df49524bba0e56cbf7ba94 (diff) | |
Make the JS files available via the private module
Instead of importing them using relative path.
Change-Id: Ibe2e23f3bafc522e2848d9d00d244d026eacd168
Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
| -rw-r--r-- | src/controls/StackView.qml | 1 | ||||
| -rw-r--r-- | src/private/BasicButton.qml | 1 | ||||
| -rw-r--r-- | src/private/qmldir | 2 | ||||
| -rw-r--r-- | src/styles/Base/MenuBarStyle.qml | 1 | ||||
| -rw-r--r-- | src/styles/Base/MenuStyle.qml | 1 |
5 files changed, 2 insertions, 4 deletions
diff --git a/src/controls/StackView.qml b/src/controls/StackView.qml index 9559ea872..1f7eb1ab6 100644 --- a/src/controls/StackView.qml +++ b/src/controls/StackView.qml @@ -41,7 +41,6 @@ import QtQuick 2.1 import QtQuick.Controls 1.0 import QtQuick.Controls.Private 1.0 -import "Private/StackView.js" as JSArray /*! \qmltype StackView diff --git a/src/private/BasicButton.qml b/src/private/BasicButton.qml index b5e9ab8f4..f07aea863 100644 --- a/src/private/BasicButton.qml +++ b/src/private/BasicButton.qml @@ -42,7 +42,6 @@ import QtQuick 2.1 import QtQuick.Controls 1.0 import QtQuick.Controls.Private 1.0 import QtQuick.Controls.Styles 1.0 -import "style.js" as StyleHelpers /*! \qmltype BasicButton diff --git a/src/private/qmldir b/src/private/qmldir index 7f73028e0..48fdff2fc 100644 --- a/src/private/qmldir +++ b/src/private/qmldir @@ -10,3 +10,5 @@ ScrollViewHelper 1.0 ScrollViewHelper.qml Style 1.0 Style.qml TabBar 1.0 TabBar.qml StackViewSlideDelegate 1.0 StackViewSlideDelegate.qml +StyleHelpers 1.0 style.js +JSArray 1.0 StackView.js diff --git a/src/styles/Base/MenuBarStyle.qml b/src/styles/Base/MenuBarStyle.qml index 4effd6eec..463ed927b 100644 --- a/src/styles/Base/MenuBarStyle.qml +++ b/src/styles/Base/MenuBarStyle.qml @@ -40,7 +40,6 @@ import QtQuick 2.1 import QtQuick.Controls.Private 1.0 -import "../../Private/style.js" as StyleHelpers /*! \qmltype MenuBarStyle diff --git a/src/styles/Base/MenuStyle.qml b/src/styles/Base/MenuStyle.qml index eab18f7df..ae8f6e757 100644 --- a/src/styles/Base/MenuStyle.qml +++ b/src/styles/Base/MenuStyle.qml @@ -41,7 +41,6 @@ import QtQuick 2.1 import QtQuick.Controls 1.0 import QtQuick.Controls.Private 1.0 -import "../../Private/style.js" as StyleHelpers /*! \qmltype MenuStyle |