diff options
-rw-r--r-- | .qmake.conf | 1 | ||||
-rw-r--r-- | README | 4 | ||||
-rw-r--r-- | desktop.pro | 8 | ||||
-rw-r--r-- | desktop.qmlproject | 18 | ||||
-rw-r--r-- | imports/QtDesktop/components.pro | 85 | ||||
-rw-r--r-- | qtdesktopcomponents.pro | 6 | ||||
-rw-r--r-- | src/qtdesktop/ApplicationWindow.qml (renamed from imports/QtDesktop/ApplicationWindow.qml) | 0 | ||||
-rw-r--r-- | src/qtdesktop/Button.qml (renamed from imports/QtDesktop/Button.qml) | 0 | ||||
-rw-r--r-- | src/qtdesktop/ButtonColumn.qml (renamed from imports/QtDesktop/ButtonColumn.qml) | 0 | ||||
-rw-r--r-- | src/qtdesktop/ButtonRow.qml (renamed from imports/QtDesktop/ButtonRow.qml) | 0 | ||||
-rw-r--r-- | src/qtdesktop/CheckBox.qml (renamed from imports/QtDesktop/CheckBox.qml) | 0 | ||||
-rw-r--r-- | src/qtdesktop/ComboBox.qml (renamed from imports/QtDesktop/ComboBox.qml) | 0 | ||||
-rw-r--r-- | src/qtdesktop/ContextMenu.qml (renamed from imports/QtDesktop/ContextMenu.qml) | 0 | ||||
-rw-r--r-- | src/qtdesktop/Dial.qml (renamed from imports/QtDesktop/Dial.qml) | 0 | ||||
-rw-r--r-- | src/qtdesktop/Dialog.qml (renamed from imports/QtDesktop/Dialog.qml) | 0 | ||||
-rw-r--r-- | src/qtdesktop/Frame.qml (renamed from imports/QtDesktop/Frame.qml) | 0 | ||||
-rw-r--r-- | src/qtdesktop/GroupBox.qml (renamed from imports/QtDesktop/GroupBox.qml) | 0 | ||||
-rw-r--r-- | src/qtdesktop/Label.qml (renamed from imports/QtDesktop/Label.qml) | 0 | ||||
-rw-r--r-- | src/qtdesktop/ProgressBar.qml (renamed from imports/QtDesktop/ProgressBar.qml) | 0 | ||||
-rw-r--r-- | src/qtdesktop/RadioButton.qml (renamed from imports/QtDesktop/RadioButton.qml) | 0 | ||||
-rw-r--r-- | src/qtdesktop/ScrollArea.qml (renamed from imports/QtDesktop/ScrollArea.qml) | 0 | ||||
-rw-r--r-- | src/qtdesktop/ScrollBar.qml (renamed from imports/QtDesktop/ScrollBar.qml) | 0 | ||||
-rw-r--r-- | src/qtdesktop/Slider.qml (renamed from imports/QtDesktop/Slider.qml) | 0 | ||||
-rw-r--r-- | src/qtdesktop/SpinBox.qml (renamed from imports/QtDesktop/SpinBox.qml) | 0 | ||||
-rw-r--r-- | src/qtdesktop/SplitterColumn.qml (renamed from imports/QtDesktop/SplitterColumn.qml) | 0 | ||||
-rw-r--r-- | src/qtdesktop/SplitterRow.qml (renamed from imports/QtDesktop/SplitterRow.qml) | 0 | ||||
-rw-r--r-- | src/qtdesktop/StatusBar.qml (renamed from imports/QtDesktop/StatusBar.qml) | 0 | ||||
-rw-r--r-- | src/qtdesktop/Tab.qml (renamed from imports/QtDesktop/Tab.qml) | 0 | ||||
-rw-r--r-- | src/qtdesktop/TabBar.qml (renamed from imports/QtDesktop/TabBar.qml) | 0 | ||||
-rw-r--r-- | src/qtdesktop/TabFrame.qml (renamed from imports/QtDesktop/TabFrame.qml) | 0 | ||||
-rw-r--r-- | src/qtdesktop/TableColumn.qml (renamed from imports/QtDesktop/TableColumn.qml) | 0 | ||||
-rw-r--r-- | src/qtdesktop/TableView.qml (renamed from imports/QtDesktop/TableView.qml) | 0 | ||||
-rw-r--r-- | src/qtdesktop/TextArea.qml (renamed from imports/QtDesktop/TextArea.qml) | 0 | ||||
-rw-r--r-- | src/qtdesktop/TextField.qml (renamed from imports/QtDesktop/TextField.qml) | 0 | ||||
-rw-r--r-- | src/qtdesktop/ToolBar.qml (renamed from imports/QtDesktop/ToolBar.qml) | 0 | ||||
-rw-r--r-- | src/qtdesktop/ToolButton.qml (renamed from imports/QtDesktop/ToolButton.qml) | 0 | ||||
-rw-r--r-- | src/qtdesktop/plugins.qmltypes (renamed from imports/QtDesktop/plugins.qmltypes) | 0 | ||||
-rw-r--r-- | src/qtdesktop/private/BasicButton.qml (renamed from imports/QtDesktop/private/BasicButton.qml) | 0 | ||||
-rw-r--r-- | src/qtdesktop/private/ButtonBehavior.qml (renamed from imports/QtDesktop/private/ButtonBehavior.qml) | 0 | ||||
-rw-r--r-- | src/qtdesktop/private/ButtonGroup.js (renamed from imports/QtDesktop/private/ButtonGroup.js) | 0 | ||||
-rw-r--r-- | src/qtdesktop/private/ModalPopupBehavior.qml (renamed from imports/QtDesktop/private/ModalPopupBehavior.qml) | 0 | ||||
-rw-r--r-- | src/qtdesktop/private/ScrollAreaHelper.qml (renamed from imports/QtDesktop/private/ScrollAreaHelper.qml) | 0 | ||||
-rw-r--r-- | src/qtdesktop/private/Splitter.qml (renamed from imports/QtDesktop/private/Splitter.qml) | 0 | ||||
-rw-r--r-- | src/qtdesktop/qdesktopitem.cpp (renamed from src/qdesktopitem.cpp) | 0 | ||||
-rw-r--r-- | src/qtdesktop/qdesktopitem.h (renamed from src/qdesktopitem.h) | 0 | ||||
-rw-r--r-- | src/qtdesktop/qfiledialogitem.cpp (renamed from src/qfiledialogitem.cpp) | 0 | ||||
-rw-r--r-- | src/qtdesktop/qfiledialogitem.h (renamed from src/qfiledialogitem.h) | 0 | ||||
-rw-r--r-- | src/qtdesktop/qmldir (renamed from imports/QtDesktop/qmldir) | 0 | ||||
-rw-r--r-- | src/qtdesktop/qquickcomponentsprivate.cpp (renamed from src/qquickcomponentsprivate.cpp) | 0 | ||||
-rw-r--r-- | src/qtdesktop/qquickcomponentsprivate.h (renamed from src/qquickcomponentsprivate.h) | 0 | ||||
-rw-r--r-- | src/qtdesktop/qquicklayout.cpp (renamed from src/qquicklayout.cpp) | 0 | ||||
-rw-r--r-- | src/qtdesktop/qquicklayout.h (renamed from src/qquicklayout.h) | 0 | ||||
-rw-r--r-- | src/qtdesktop/qquicklayoutengine.cpp (renamed from src/qquicklayoutengine.cpp) | 0 | ||||
-rw-r--r-- | src/qtdesktop/qquicklayoutengine_p.h (renamed from src/qquicklayoutengine_p.h) | 0 | ||||
-rw-r--r-- | src/qtdesktop/qquicklinearlayout.cpp (renamed from src/qquicklinearlayout.cpp) | 0 | ||||
-rw-r--r-- | src/qtdesktop/qquicklinearlayout.h (renamed from src/qquicklinearlayout.h) | 0 | ||||
-rw-r--r-- | src/qtdesktop/qrangemodel.cpp (renamed from src/qrangemodel.cpp) | 0 | ||||
-rw-r--r-- | src/qtdesktop/qrangemodel.h (renamed from src/qrangemodel.h) | 0 | ||||
-rw-r--r-- | src/qtdesktop/qrangemodel_p.h (renamed from src/qrangemodel_p.h) | 0 | ||||
-rw-r--r-- | src/qtdesktop/qstyleitem.cpp (renamed from src/qstyleitem.cpp) | 0 | ||||
-rw-r--r-- | src/qtdesktop/qstyleitem.h (renamed from src/qstyleitem.h) | 0 | ||||
-rw-r--r-- | src/qtdesktop/qstyleplugin.cpp (renamed from src/qstyleplugin.cpp) | 0 | ||||
-rw-r--r-- | src/qtdesktop/qstyleplugin.h (renamed from src/qstyleplugin.h) | 0 | ||||
-rw-r--r-- | src/qtdesktop/qtdesktop.pro | 58 | ||||
-rw-r--r-- | src/qtdesktop/qtmenu.cpp (renamed from src/qtmenu.cpp) | 0 | ||||
-rw-r--r-- | src/qtdesktop/qtmenu.h (renamed from src/qtmenu.h) | 0 | ||||
-rw-r--r-- | src/qtdesktop/qtmenubar.cpp (renamed from src/qtmenubar.cpp) | 0 | ||||
-rw-r--r-- | src/qtdesktop/qtmenubar.h (renamed from src/qtmenubar.h) | 0 | ||||
-rw-r--r-- | src/qtdesktop/qtmenuitem.cpp (renamed from src/qtmenuitem.cpp) | 0 | ||||
-rw-r--r-- | src/qtdesktop/qtmenuitem.h (renamed from src/qtmenuitem.h) | 0 | ||||
-rw-r--r-- | src/qtdesktop/qtsplitterbase.cpp (renamed from src/qtsplitterbase.cpp) | 0 | ||||
-rw-r--r-- | src/qtdesktop/qtsplitterbase.h (renamed from src/qtsplitterbase.h) | 0 | ||||
-rw-r--r-- | src/qtdesktop/qwheelarea.cpp (renamed from src/qwheelarea.cpp) | 0 | ||||
-rw-r--r-- | src/qtdesktop/qwheelarea.h (renamed from src/qwheelarea.h) | 0 | ||||
-rw-r--r-- | src/qtdesktop/styleplugin.json (renamed from src/styleplugin.json) | 0 | ||||
-rw-r--r-- | src/qtdesktop/styleplugin.pri | 35 | ||||
-rw-r--r-- | src/src.pro | 59 | ||||
-rw-r--r-- | src/styles/ButtonStyle.qml (renamed from imports/QtDesktop/Styles/ButtonStyle.qml) | 0 | ||||
-rw-r--r-- | src/styles/CheckBoxStyle.qml (renamed from imports/QtDesktop/Styles/CheckBoxStyle.qml) | 0 | ||||
-rw-r--r-- | src/styles/ComboBoxStyle.qml (renamed from imports/QtDesktop/Styles/ComboBoxStyle.qml) | 0 | ||||
-rw-r--r-- | src/styles/Desktop/ButtonStyle.qml (renamed from imports/QtDesktop/Styles/Desktop/ButtonStyle.qml) | 0 | ||||
-rw-r--r-- | src/styles/Desktop/CheckBoxStyle.qml (renamed from imports/QtDesktop/Styles/Desktop/CheckBoxStyle.qml) | 0 | ||||
-rw-r--r-- | src/styles/Desktop/ComboBoxStyle.qml (renamed from imports/QtDesktop/Styles/Desktop/ComboBoxStyle.qml) | 0 | ||||
-rw-r--r-- | src/styles/Desktop/FrameStyle.qml (renamed from imports/QtDesktop/Styles/Desktop/FrameStyle.qml) | 0 | ||||
-rw-r--r-- | src/styles/Desktop/GroupBoxStyle.qml (renamed from imports/QtDesktop/Styles/Desktop/GroupBoxStyle.qml) | 0 | ||||
-rw-r--r-- | src/styles/Desktop/ProgressBarStyle.qml (renamed from imports/QtDesktop/Styles/Desktop/ProgressBarStyle.qml) | 0 | ||||
-rw-r--r-- | src/styles/Desktop/RadioButtonStyle.qml (renamed from imports/QtDesktop/Styles/Desktop/RadioButtonStyle.qml) | 0 | ||||
-rw-r--r-- | src/styles/Desktop/ScrollAreaStyle.qml (renamed from imports/QtDesktop/Styles/Desktop/ScrollAreaStyle.qml) | 0 | ||||
-rw-r--r-- | src/styles/Desktop/ScrollBarStyle.qml (renamed from imports/QtDesktop/Styles/Desktop/ScrollBarStyle.qml) | 0 | ||||
-rw-r--r-- | src/styles/Desktop/SliderStyle.qml (renamed from imports/QtDesktop/Styles/Desktop/SliderStyle.qml) | 0 | ||||
-rw-r--r-- | src/styles/Desktop/SpinBoxStyle.qml (renamed from imports/QtDesktop/Styles/Desktop/SpinBoxStyle.qml) | 0 | ||||
-rw-r--r-- | src/styles/Desktop/TabBarStyle.qml (renamed from imports/QtDesktop/Styles/Desktop/TabBarStyle.qml) | 0 | ||||
-rw-r--r-- | src/styles/Desktop/TabFrameStyle.qml (renamed from imports/QtDesktop/Styles/Desktop/TabFrameStyle.qml) | 0 | ||||
-rw-r--r-- | src/styles/Desktop/TextFieldStyle.qml (renamed from imports/QtDesktop/Styles/Desktop/TextFieldStyle.qml) | 0 | ||||
-rw-r--r-- | src/styles/Desktop/ToolBarStyle.qml (renamed from imports/QtDesktop/Styles/Desktop/ToolBarStyle.qml) | 0 | ||||
-rw-r--r-- | src/styles/Desktop/ToolButtonStyle.qml (renamed from imports/QtDesktop/Styles/Desktop/ToolButtonStyle.qml) | 0 | ||||
-rw-r--r-- | src/styles/FrameStyle.qml (renamed from imports/QtDesktop/Styles/FrameStyle.qml) | 0 | ||||
-rw-r--r-- | src/styles/GroupBoxStyle.qml (renamed from imports/QtDesktop/Styles/GroupBoxStyle.qml) | 0 | ||||
-rw-r--r-- | src/styles/ProgressBarStyle.qml (renamed from imports/QtDesktop/Styles/ProgressBarStyle.qml) | 0 | ||||
-rw-r--r-- | src/styles/RadioButtonStyle.qml (renamed from imports/QtDesktop/Styles/RadioButtonStyle.qml) | 0 | ||||
-rw-r--r-- | src/styles/ScrollAreaStyle.qml (renamed from imports/QtDesktop/Styles/ScrollAreaStyle.qml) | 0 | ||||
-rw-r--r-- | src/styles/ScrollBarStyle.qml (renamed from imports/QtDesktop/Styles/ScrollBarStyle.qml) | 0 | ||||
-rw-r--r-- | src/styles/Settings.js (renamed from imports/QtDesktop/Styles/Settings.js) | 0 | ||||
-rw-r--r-- | src/styles/SliderStyle.qml (renamed from imports/QtDesktop/Styles/SliderStyle.qml) | 0 | ||||
-rw-r--r-- | src/styles/SpinBoxStyle.qml (renamed from imports/QtDesktop/Styles/SpinBoxStyle.qml) | 0 | ||||
-rw-r--r-- | src/styles/TabBarStyle.qml (renamed from imports/QtDesktop/Styles/TabBarStyle.qml) | 0 | ||||
-rw-r--r-- | src/styles/TabFrameStyle.qml (renamed from imports/QtDesktop/Styles/TabFrameStyle.qml) | 0 | ||||
-rw-r--r-- | src/styles/TextFieldStyle.qml (renamed from imports/QtDesktop/Styles/TextFieldStyle.qml) | 0 | ||||
-rw-r--r-- | src/styles/ToolBarStyle.qml (renamed from imports/QtDesktop/Styles/ToolBarStyle.qml) | 0 | ||||
-rw-r--r-- | src/styles/ToolButtonStyle.qml (renamed from imports/QtDesktop/Styles/ToolButtonStyle.qml) | 0 | ||||
-rw-r--r-- | src/styles/qmldir (renamed from imports/QtDesktop/Styles/qmldir) | 0 | ||||
-rw-r--r-- | src/styles/styles.pro | 41 | ||||
-rw-r--r-- | sync.profile | 1 | ||||
-rw-r--r-- | tools/qmlwidget/main.cpp (renamed from qmlwidget/main.cpp) | 0 | ||||
-rw-r--r-- | tools/qmlwidget/qmlwidget.pro (renamed from qmlwidget/qmlwidget.pro) | 0 |
115 files changed, 145 insertions, 171 deletions
diff --git a/.qmake.conf b/.qmake.conf new file mode 100644 index 00000000..42ba8e45 --- /dev/null +++ b/.qmake.conf @@ -0,0 +1 @@ +load(qt_build_config) @@ -18,14 +18,14 @@ You can also contact the maintainer at: jens.bache-wiig (at) digia (dot) com INSTALLATION -Note the MINIMUM REQUIREMENT for this project is that you have Qt 4.7.4. (Qt Quick 1.1) +Note the MINIMUM REQUIREMENT for this project is that you have Qt 5.0. (Qt Quick 2) The components rely on several C++ plugins in order to integrate with the desktop. To install the components into your Qt directory, simply enter the root directory and do: 'qmake && make install' -This will compile and copy the plugins and components into your QTDIR/imports folder. +This will compile and copy the plugins and components into your QTDIR/qml folder. If you are compiling against a system Qt on linux, you might have to do a 'sudo make install' in order to install the project. diff --git a/desktop.pro b/desktop.pro deleted file mode 100644 index 9d7cc095..00000000 --- a/desktop.pro +++ /dev/null @@ -1,8 +0,0 @@ -TEMPLATE = subdirs - -contains(QT_CONFIG, accessibility) { - SUBDIRS = imports/QtDesktop/components.pro src -} else { - message("Building Qt without accessibility is not supported for desktop components.") -} - diff --git a/desktop.qmlproject b/desktop.qmlproject deleted file mode 100644 index 961602a9..00000000 --- a/desktop.qmlproject +++ /dev/null @@ -1,18 +0,0 @@ -/* File generated by QtCreator */ - -import QmlProject 1.0 - -Project { - /* Include .qml, .js, and image files from current directory and subdirectories */ - QmlFiles { - directory: "." - } - JavaScriptFiles { - directory: "." - }/* - ImageFiles { - directory: "." - }*/ - /* List of plugin directories passed to QML runtime */ - // importPaths: [ "../exampleplugin" ] -} diff --git a/imports/QtDesktop/components.pro b/imports/QtDesktop/components.pro deleted file mode 100644 index d22667b1..00000000 --- a/imports/QtDesktop/components.pro +++ /dev/null @@ -1,85 +0,0 @@ -TEMPLATE = subdirs # XXX: Avoid calling the linker -TARGETPATH = QtDesktop - -QML_FILES = \ - plugins.qmltypes \ - qmldir \ - Label.qml \ - Button.qml \ - ComboBox.qml \ - Dial.qml \ - Dialog.qml \ - ProgressBar.qml \ - ScrollBar.qml \ - Switch.qml \ - TableView.qml \ - ToolBar.qml \ - ButtonRow.qml \ - ButtonColumn.qml \ - Frame.qml \ - Slider.qml \ - TabBar.qml \ - Tab.qml \ - ToolButton.qml \ - CheckBox.qml \ - ContextMenu.qml \ - GroupBox.qml \ - RadioButton.qml \ - SpinBox.qml \ - TabFrame.qml \ - TextArea.qml \ - ScrollArea.qml \ - SplitterRow.qml \ - SplitterColumn.qml \ - StatusBar.qml \ - TableColumn.qml \ - TextField.qml \ - ApplicationWindow.qml \ - Styles/ToolButtonStyle.qml \ - Styles/ToolBarStyle.qml \ - Styles/TextFieldStyle.qml \ - Styles/TabBarStyle.qml \ - Styles/TabFrameStyle.qml \ - Styles/SpinBoxStyle.qml \ - Styles/SliderStyle.qml \ - Styles/ScrollBarStyle.qml \ - Styles/ScrollAreaStyle.qml \ - Styles/RadioButtonStyle.qml \ - Styles/ProgressBarStyle.qml \ - Styles/GroupBoxStyle.qml \ - Styles/FrameStyle.qml \ - Styles/ComboBoxStyle.qml \ - Styles/CheckBoxStyle.qml \ - Styles/ButtonStyle.qml \ - Styles/Desktop/ToolButtonStyle.qml \ - Styles/Desktop/ToolBarStyle.qml \ - Styles/Desktop/TextFieldStyle.qml \ - Styles/Desktop/TabBarStyle.qml \ - Styles/Desktop/TabFrameStyle.qml \ - Styles/Desktop/SpinBoxStyle.qml \ - Styles/Desktop/SliderStyle.qml \ - Styles/Desktop/ScrollBarStyle.qml \ - Styles/Desktop/ScrollAreaStyle.qml \ - Styles/Desktop/RadioButtonStyle.qml \ - Styles/Desktop/ProgressBarStyle.qml \ - Styles/Desktop/GroupBoxStyle.qml \ - Styles/Desktop/FrameStyle.qml \ - Styles/Desktop/ComboBoxStyle.qml \ - Styles/Desktop/CheckBoxStyle.qml \ - Styles/Desktop/ButtonStyle.qml - -QML_DIRS = \ - custom \ - private \ - Styles \ - images - -qmlfiles.files = $$QML_FILES -qmlfiles.sources = $$QML_FILES -qmlfiles.path = $$[QT_INSTALL_IMPORTS]/$$TARGETPATH - -qmldirs.files = $$QML_DIRS -qmldirs.sources = $$QML_DIRS -qmldirs.path = $$[QT_INSTALL_IMPORTS]/$$TARGETPATH - -INSTALLS += qmlfiles qmldirs diff --git a/qtdesktopcomponents.pro b/qtdesktopcomponents.pro new file mode 100644 index 00000000..289b0181 --- /dev/null +++ b/qtdesktopcomponents.pro @@ -0,0 +1,6 @@ +load(qt_parts) + +# We need accessibility +!contains(QT_CONFIG, accessibility) { + error("Building Qt without accessibility is not supported for desktop components.") +} diff --git a/imports/QtDesktop/ApplicationWindow.qml b/src/qtdesktop/ApplicationWindow.qml index fe35b6c8..fe35b6c8 100644 --- a/imports/QtDesktop/ApplicationWindow.qml +++ b/src/qtdesktop/ApplicationWindow.qml diff --git a/imports/QtDesktop/Button.qml b/src/qtdesktop/Button.qml index b82e0ebd..b82e0ebd 100644 --- a/imports/QtDesktop/Button.qml +++ b/src/qtdesktop/Button.qml diff --git a/imports/QtDesktop/ButtonColumn.qml b/src/qtdesktop/ButtonColumn.qml index 50410a32..50410a32 100644 --- a/imports/QtDesktop/ButtonColumn.qml +++ b/src/qtdesktop/ButtonColumn.qml diff --git a/imports/QtDesktop/ButtonRow.qml b/src/qtdesktop/ButtonRow.qml index 9c3c2c16..9c3c2c16 100644 --- a/imports/QtDesktop/ButtonRow.qml +++ b/src/qtdesktop/ButtonRow.qml diff --git a/imports/QtDesktop/CheckBox.qml b/src/qtdesktop/CheckBox.qml index 88f19869..88f19869 100644 --- a/imports/QtDesktop/CheckBox.qml +++ b/src/qtdesktop/CheckBox.qml diff --git a/imports/QtDesktop/ComboBox.qml b/src/qtdesktop/ComboBox.qml index 2b50880f..2b50880f 100644 --- a/imports/QtDesktop/ComboBox.qml +++ b/src/qtdesktop/ComboBox.qml diff --git a/imports/QtDesktop/ContextMenu.qml b/src/qtdesktop/ContextMenu.qml index 0ba2a920..0ba2a920 100644 --- a/imports/QtDesktop/ContextMenu.qml +++ b/src/qtdesktop/ContextMenu.qml diff --git a/imports/QtDesktop/Dial.qml b/src/qtdesktop/Dial.qml index e235963d..e235963d 100644 --- a/imports/QtDesktop/Dial.qml +++ b/src/qtdesktop/Dial.qml diff --git a/imports/QtDesktop/Dialog.qml b/src/qtdesktop/Dialog.qml index 2cf0e9ad..2cf0e9ad 100644 --- a/imports/QtDesktop/Dialog.qml +++ b/src/qtdesktop/Dialog.qml diff --git a/imports/QtDesktop/Frame.qml b/src/qtdesktop/Frame.qml index 36627176..36627176 100644 --- a/imports/QtDesktop/Frame.qml +++ b/src/qtdesktop/Frame.qml diff --git a/imports/QtDesktop/GroupBox.qml b/src/qtdesktop/GroupBox.qml index dc2e8ccf..dc2e8ccf 100644 --- a/imports/QtDesktop/GroupBox.qml +++ b/src/qtdesktop/GroupBox.qml diff --git a/imports/QtDesktop/Label.qml b/src/qtdesktop/Label.qml index 99d3ac71..99d3ac71 100644 --- a/imports/QtDesktop/Label.qml +++ b/src/qtdesktop/Label.qml diff --git a/imports/QtDesktop/ProgressBar.qml b/src/qtdesktop/ProgressBar.qml index b9b7fafb..b9b7fafb 100644 --- a/imports/QtDesktop/ProgressBar.qml +++ b/src/qtdesktop/ProgressBar.qml diff --git a/imports/QtDesktop/RadioButton.qml b/src/qtdesktop/RadioButton.qml index f5945535..f5945535 100644 --- a/imports/QtDesktop/RadioButton.qml +++ b/src/qtdesktop/RadioButton.qml diff --git a/imports/QtDesktop/ScrollArea.qml b/src/qtdesktop/ScrollArea.qml index 9415797a..9415797a 100644 --- a/imports/QtDesktop/ScrollArea.qml +++ b/src/qtdesktop/ScrollArea.qml diff --git a/imports/QtDesktop/ScrollBar.qml b/src/qtdesktop/ScrollBar.qml index 5e20190c..5e20190c 100644 --- a/imports/QtDesktop/ScrollBar.qml +++ b/src/qtdesktop/ScrollBar.qml diff --git a/imports/QtDesktop/Slider.qml b/src/qtdesktop/Slider.qml index 4e00c156..4e00c156 100644 --- a/imports/QtDesktop/Slider.qml +++ b/src/qtdesktop/Slider.qml diff --git a/imports/QtDesktop/SpinBox.qml b/src/qtdesktop/SpinBox.qml index 1ddbc9f6..1ddbc9f6 100644 --- a/imports/QtDesktop/SpinBox.qml +++ b/src/qtdesktop/SpinBox.qml diff --git a/imports/QtDesktop/SplitterColumn.qml b/src/qtdesktop/SplitterColumn.qml index 1ff35afe..1ff35afe 100644 --- a/imports/QtDesktop/SplitterColumn.qml +++ b/src/qtdesktop/SplitterColumn.qml diff --git a/imports/QtDesktop/SplitterRow.qml b/src/qtdesktop/SplitterRow.qml index 14c2ea56..14c2ea56 100644 --- a/imports/QtDesktop/SplitterRow.qml +++ b/src/qtdesktop/SplitterRow.qml diff --git a/imports/QtDesktop/StatusBar.qml b/src/qtdesktop/StatusBar.qml index 46641411..46641411 100644 --- a/imports/QtDesktop/StatusBar.qml +++ b/src/qtdesktop/StatusBar.qml diff --git a/imports/QtDesktop/Tab.qml b/src/qtdesktop/Tab.qml index 133c3715..133c3715 100644 --- a/imports/QtDesktop/Tab.qml +++ b/src/qtdesktop/Tab.qml diff --git a/imports/QtDesktop/TabBar.qml b/src/qtdesktop/TabBar.qml index 0ad47520..0ad47520 100644 --- a/imports/QtDesktop/TabBar.qml +++ b/src/qtdesktop/TabBar.qml diff --git a/imports/QtDesktop/TabFrame.qml b/src/qtdesktop/TabFrame.qml index 533bdb19..533bdb19 100644 --- a/imports/QtDesktop/TabFrame.qml +++ b/src/qtdesktop/TabFrame.qml diff --git a/imports/QtDesktop/TableColumn.qml b/src/qtdesktop/TableColumn.qml index 53207070..53207070 100644 --- a/imports/QtDesktop/TableColumn.qml +++ b/src/qtdesktop/TableColumn.qml diff --git a/imports/QtDesktop/TableView.qml b/src/qtdesktop/TableView.qml index 0e0ed819..0e0ed819 100644 --- a/imports/QtDesktop/TableView.qml +++ b/src/qtdesktop/TableView.qml diff --git a/imports/QtDesktop/TextArea.qml b/src/qtdesktop/TextArea.qml index c7f9f81a..c7f9f81a 100644 --- a/imports/QtDesktop/TextArea.qml +++ b/src/qtdesktop/TextArea.qml diff --git a/imports/QtDesktop/TextField.qml b/src/qtdesktop/TextField.qml index f02f50f1..f02f50f1 100644 --- a/imports/QtDesktop/TextField.qml +++ b/src/qtdesktop/TextField.qml diff --git a/imports/QtDesktop/ToolBar.qml b/src/qtdesktop/ToolBar.qml index d1aeffab..d1aeffab 100644 --- a/imports/QtDesktop/ToolBar.qml +++ b/src/qtdesktop/ToolBar.qml diff --git a/imports/QtDesktop/ToolButton.qml b/src/qtdesktop/ToolButton.qml index 1cfe087b..1cfe087b 100644 --- a/imports/QtDesktop/ToolButton.qml +++ b/src/qtdesktop/ToolButton.qml diff --git a/imports/QtDesktop/plugins.qmltypes b/src/qtdesktop/plugins.qmltypes index 79e15ef6..79e15ef6 100644 --- a/imports/QtDesktop/plugins.qmltypes +++ b/src/qtdesktop/plugins.qmltypes diff --git a/imports/QtDesktop/private/BasicButton.qml b/src/qtdesktop/private/BasicButton.qml index 7189e6f5..7189e6f5 100644 --- a/imports/QtDesktop/private/BasicButton.qml +++ b/src/qtdesktop/private/BasicButton.qml diff --git a/imports/QtDesktop/private/ButtonBehavior.qml b/src/qtdesktop/private/ButtonBehavior.qml index 1119811c..1119811c 100644 --- a/imports/QtDesktop/private/ButtonBehavior.qml +++ b/src/qtdesktop/private/ButtonBehavior.qml diff --git a/imports/QtDesktop/private/ButtonGroup.js b/src/qtdesktop/private/ButtonGroup.js index 5b0d9adb..5b0d9adb 100644 --- a/imports/QtDesktop/private/ButtonGroup.js +++ b/src/qtdesktop/private/ButtonGroup.js diff --git a/imports/QtDesktop/private/ModalPopupBehavior.qml b/src/qtdesktop/private/ModalPopupBehavior.qml index 1e95f6f1..1e95f6f1 100644 --- a/imports/QtDesktop/private/ModalPopupBehavior.qml +++ b/src/qtdesktop/private/ModalPopupBehavior.qml diff --git a/imports/QtDesktop/private/ScrollAreaHelper.qml b/src/qtdesktop/private/ScrollAreaHelper.qml index e99b3276..e99b3276 100644 --- a/imports/QtDesktop/private/ScrollAreaHelper.qml +++ b/src/qtdesktop/private/ScrollAreaHelper.qml diff --git a/imports/QtDesktop/private/Splitter.qml b/src/qtdesktop/private/Splitter.qml index a6c18511..a6c18511 100644 --- a/imports/QtDesktop/private/Splitter.qml +++ b/src/qtdesktop/private/Splitter.qml diff --git a/src/qdesktopitem.cpp b/src/qtdesktop/qdesktopitem.cpp index 15c260af..15c260af 100644 --- a/src/qdesktopitem.cpp +++ b/src/qtdesktop/qdesktopitem.cpp diff --git a/src/qdesktopitem.h b/src/qtdesktop/qdesktopitem.h index 6639b8ee..6639b8ee 100644 --- a/src/qdesktopitem.h +++ b/src/qtdesktop/qdesktopitem.h diff --git a/src/qfiledialogitem.cpp b/src/qtdesktop/qfiledialogitem.cpp index f32c77f5..f32c77f5 100644 --- a/src/qfiledialogitem.cpp +++ b/src/qtdesktop/qfiledialogitem.cpp diff --git a/src/qfiledialogitem.h b/src/qtdesktop/qfiledialogitem.h index 1870a3a9..1870a3a9 100644 --- a/src/qfiledialogitem.h +++ b/src/qtdesktop/qfiledialogitem.h diff --git a/imports/QtDesktop/qmldir b/src/qtdesktop/qmldir index c3863d8c..c3863d8c 100644 --- a/imports/QtDesktop/qmldir +++ b/src/qtdesktop/qmldir diff --git a/src/qquickcomponentsprivate.cpp b/src/qtdesktop/qquickcomponentsprivate.cpp index 54b41b4c..54b41b4c 100644 --- a/src/qquickcomponentsprivate.cpp +++ b/src/qtdesktop/qquickcomponentsprivate.cpp diff --git a/src/qquickcomponentsprivate.h b/src/qtdesktop/qquickcomponentsprivate.h index 5a5fa794..5a5fa794 100644 --- a/src/qquickcomponentsprivate.h +++ b/src/qtdesktop/qquickcomponentsprivate.h diff --git a/src/qquicklayout.cpp b/src/qtdesktop/qquicklayout.cpp index 36619359..36619359 100644 --- a/src/qquicklayout.cpp +++ b/src/qtdesktop/qquicklayout.cpp diff --git a/src/qquicklayout.h b/src/qtdesktop/qquicklayout.h index 86f50266..86f50266 100644 --- a/src/qquicklayout.h +++ b/src/qtdesktop/qquicklayout.h diff --git a/src/qquicklayoutengine.cpp b/src/qtdesktop/qquicklayoutengine.cpp index f11a2107..f11a2107 100644 --- a/src/qquicklayoutengine.cpp +++ b/src/qtdesktop/qquicklayoutengine.cpp diff --git a/src/qquicklayoutengine_p.h b/src/qtdesktop/qquicklayoutengine_p.h index c4cdaf08..c4cdaf08 100644 --- a/src/qquicklayoutengine_p.h +++ b/src/qtdesktop/qquicklayoutengine_p.h diff --git a/src/qquicklinearlayout.cpp b/src/qtdesktop/qquicklinearlayout.cpp index 995551d1..995551d1 100644 --- a/src/qquicklinearlayout.cpp +++ b/src/qtdesktop/qquicklinearlayout.cpp diff --git a/src/qquicklinearlayout.h b/src/qtdesktop/qquicklinearlayout.h index 8cd73e86..8cd73e86 100644 --- a/src/qquicklinearlayout.h +++ b/src/qtdesktop/qquicklinearlayout.h diff --git a/src/qrangemodel.cpp b/src/qtdesktop/qrangemodel.cpp index ac876824..ac876824 100644 --- a/src/qrangemodel.cpp +++ b/src/qtdesktop/qrangemodel.cpp diff --git a/src/qrangemodel.h b/src/qtdesktop/qrangemodel.h index 675967ae..675967ae 100644 --- a/src/qrangemodel.h +++ b/src/qtdesktop/qrangemodel.h diff --git a/src/qrangemodel_p.h b/src/qtdesktop/qrangemodel_p.h index 83b28949..83b28949 100644 --- a/src/qrangemodel_p.h +++ b/src/qtdesktop/qrangemodel_p.h diff --git a/src/qstyleitem.cpp b/src/qtdesktop/qstyleitem.cpp index 1acfb8b5..1acfb8b5 100644 --- a/src/qstyleitem.cpp +++ b/src/qtdesktop/qstyleitem.cpp diff --git a/src/qstyleitem.h b/src/qtdesktop/qstyleitem.h index 6b274060..6b274060 100644 --- a/src/qstyleitem.h +++ b/src/qtdesktop/qstyleitem.h diff --git a/src/qstyleplugin.cpp b/src/qtdesktop/qstyleplugin.cpp index 500d4ee6..500d4ee6 100644 --- a/src/qstyleplugin.cpp +++ b/src/qtdesktop/qstyleplugin.cpp diff --git a/src/qstyleplugin.h b/src/qtdesktop/qstyleplugin.h index 2bdb2a81..2bdb2a81 100644 --- a/src/qstyleplugin.h +++ b/src/qtdesktop/qstyleplugin.h diff --git a/src/qtdesktop/qtdesktop.pro b/src/qtdesktop/qtdesktop.pro new file mode 100644 index 00000000..d348cd71 --- /dev/null +++ b/src/qtdesktop/qtdesktop.pro @@ -0,0 +1,58 @@ +QT += qml quick widgets + +TARGETPATH = QtDesktop + +QML_FILES = \ + ApplicationWindow.qml \ + Button.qml \ + ButtonColumn.qml \ + ButtonRow.qml \ + CheckBox.qml \ + ComboBox.qml \ + ContextMenu.qml \ + Dial.qml \ + Dialog.qml \ + Frame.qml \ + GroupBox.qml \ + Label.qml \ + ProgressBar.qml \ + RadioButton.qml \ + ScrollArea.qml \ + ScrollBar.qml \ + Slider.qml \ + SpinBox.qml \ + SplitterColumn.qml \ + SplitterRow.qml \ + StatusBar.qml \ + Tab.qml \ + TabBar.qml \ + TabFrame.qml \ + TableColumn.qml \ + TableView.qml \ + TextArea.qml \ + TextField.qml \ + ToolBar.qml \ + ToolButton.qml + +# private qml files +QML_FILES += \ + private/BasicButton.qml \ + private/ButtonBehavior.qml \ + private/ButtonGroup.js \ + private/ModalPopupBehavior.qml \ + private/ScrollAreaHelper.qml \ + private/Splitter.qml + +include(styleplugin.pri) + +DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 + +mac { + LIBS += -framework Carbon +} + +load(qml_plugin) + +#tmp solution for QTBUG-28200 +TARGET = $$qtLibraryTarget(styleplugin) +DESTDIR = $$QT.core.qml/QtDesktop/plugin diff --git a/src/qtmenu.cpp b/src/qtdesktop/qtmenu.cpp index 34710293..34710293 100644 --- a/src/qtmenu.cpp +++ b/src/qtdesktop/qtmenu.cpp diff --git a/src/qtmenu.h b/src/qtdesktop/qtmenu.h index d718b55b..d718b55b 100644 --- a/src/qtmenu.h +++ b/src/qtdesktop/qtmenu.h diff --git a/src/qtmenubar.cpp b/src/qtdesktop/qtmenubar.cpp index f63f5562..f63f5562 100644 --- a/src/qtmenubar.cpp +++ b/src/qtdesktop/qtmenubar.cpp diff --git a/src/qtmenubar.h b/src/qtdesktop/qtmenubar.h index 6f762bb7..6f762bb7 100644 --- a/src/qtmenubar.h +++ b/src/qtdesktop/qtmenubar.h diff --git a/src/qtmenuitem.cpp b/src/qtdesktop/qtmenuitem.cpp index 9dc58af7..9dc58af7 100644 --- a/src/qtmenuitem.cpp +++ b/src/qtdesktop/qtmenuitem.cpp diff --git a/src/qtmenuitem.h b/src/qtdesktop/qtmenuitem.h index 5ee11671..5ee11671 100644 --- a/src/qtmenuitem.h +++ b/src/qtdesktop/qtmenuitem.h diff --git a/src/qtsplitterbase.cpp b/src/qtdesktop/qtsplitterbase.cpp index c2a26fbf..c2a26fbf 100644 --- a/src/qtsplitterbase.cpp +++ b/src/qtdesktop/qtsplitterbase.cpp diff --git a/src/qtsplitterbase.h b/src/qtdesktop/qtsplitterbase.h index 8bf4ee4d..8bf4ee4d 100644 --- a/src/qtsplitterbase.h +++ b/src/qtdesktop/qtsplitterbase.h diff --git a/src/qwheelarea.cpp b/src/qtdesktop/qwheelarea.cpp index 97aac522..97aac522 100644 --- a/src/qwheelarea.cpp +++ b/src/qtdesktop/qwheelarea.cpp diff --git a/src/qwheelarea.h b/src/qtdesktop/qwheelarea.h index a112607c..a112607c 100644 --- a/src/qwheelarea.h +++ b/src/qtdesktop/qwheelarea.h diff --git a/src/styleplugin.json b/src/qtdesktop/styleplugin.json index 0967ef42..0967ef42 100644 --- a/src/styleplugin.json +++ b/src/qtdesktop/styleplugin.json diff --git a/src/qtdesktop/styleplugin.pri b/src/qtdesktop/styleplugin.pri new file mode 100644 index 00000000..5083a873 --- /dev/null +++ b/src/qtdesktop/styleplugin.pri @@ -0,0 +1,35 @@ +HEADERS += \ + qdesktopitem.h \ + qfiledialogitem.h \ + qquickcomponentsprivate.h \ + qquicklayout.h \ + qquicklayoutengine_p.h \ + qquicklinearlayout.h \ + qrangemodel.h \ + qrangemodel_p.h \ + qstyleitem.h \ + qstyleplugin.h \ + qtmenu.h \ + qtmenubar.h \ + qtmenuitem.h \ + qtsplitterbase.h \ + qwheelarea.h + +SOURCES += \ + qdesktopitem.cpp \ + qfiledialogitem.cpp \ + qquickcomponentsprivate.cpp \ + qquicklayout.cpp \ + qquicklayoutengine.cpp \ + qquicklinearlayout.cpp \ + qrangemodel.cpp \ + qstyleitem.cpp \ + qstyleplugin.cpp \ + qtmenu.cpp \ + qtmenubar.cpp \ + qtmenuitem.cpp \ + qtsplitterbase.cpp \ + qwheelarea.cpp + +OTHER_FILES += \ + styleplugin.json diff --git a/src/src.pro b/src/src.pro index 2114df78..3b0d512e 100644 --- a/src/src.pro +++ b/src/src.pro @@ -1,58 +1,3 @@ -TEMPLATE = lib -CONFIG += qt plugin -QT += qml -QT += quick -QT += widgets +TEMPLATE = subdirs -TARGET = styleplugin - -DESTDIR = ../imports/QtDesktop/plugin -OBJECTS_DIR = obj -MOC_DIR = moc - -HEADERS += qtmenu.h \ - qtmenubar.h \ - qrangemodel_p.h \ - qrangemodel.h \ - qstyleplugin.h \ - qstyleitem.h \ - qwheelarea.h \ - qtmenuitem.h \ - qdesktopitem.h \ - qquicklayoutengine_p.h \ - qquicklayout.h \ - qquicklinearlayout.h \ - qquickcomponentsprivate.h \ - qtsplitterbase.h \ - qfiledialogitem.h - -SOURCES += qtmenu.cpp \ - qtmenubar.cpp \ - qrangemodel.cpp \ - qstyleplugin.cpp \ - qstyleitem.cpp \ - qwheelarea.cpp \ - qtmenuitem.cpp \ - qdesktopitem.cpp \ - qquicklayout.cpp \ - qquicklayoutengine.cpp \ - qquicklinearlayout.cpp \ - qquickcomponentsprivate.cpp \ - qtsplitterbase.cpp \ - qfiledialogitem.cpp - -TARGETPATH = QtDesktop/plugin - -target.path = $$[QT_INSTALL_IMPORTS]/$$TARGETPATH - -win32 { - CONFIG(debug, debug|release) { - TARGET = $$member(TARGET, 0)d - } -} - -mac { - LIBS += -framework Carbon -} - -INSTALLS += target +SUBDIRS += qtdesktop styles diff --git a/imports/QtDesktop/Styles/ButtonStyle.qml b/src/styles/ButtonStyle.qml index b37fbba8..b37fbba8 100644 --- a/imports/QtDesktop/Styles/ButtonStyle.qml +++ b/src/styles/ButtonStyle.qml diff --git a/imports/QtDesktop/Styles/CheckBoxStyle.qml b/src/styles/CheckBoxStyle.qml index efb3a4ef..efb3a4ef 100644 --- a/imports/QtDesktop/Styles/CheckBoxStyle.qml +++ b/src/styles/CheckBoxStyle.qml diff --git a/imports/QtDesktop/Styles/ComboBoxStyle.qml b/src/styles/ComboBoxStyle.qml index 2333dcc0..2333dcc0 100644 --- a/imports/QtDesktop/Styles/ComboBoxStyle.qml +++ b/src/styles/ComboBoxStyle.qml diff --git a/imports/QtDesktop/Styles/Desktop/ButtonStyle.qml b/src/styles/Desktop/ButtonStyle.qml index c35e78f6..c35e78f6 100644 --- a/imports/QtDesktop/Styles/Desktop/ButtonStyle.qml +++ b/src/styles/Desktop/ButtonStyle.qml diff --git a/imports/QtDesktop/Styles/Desktop/CheckBoxStyle.qml b/src/styles/Desktop/CheckBoxStyle.qml index f950e7d8..f950e7d8 100644 --- a/imports/QtDesktop/Styles/Desktop/CheckBoxStyle.qml +++ b/src/styles/Desktop/CheckBoxStyle.qml diff --git a/imports/QtDesktop/Styles/Desktop/ComboBoxStyle.qml b/src/styles/Desktop/ComboBoxStyle.qml index 5fbc120d..5fbc120d 100644 --- a/imports/QtDesktop/Styles/Desktop/ComboBoxStyle.qml +++ b/src/styles/Desktop/ComboBoxStyle.qml diff --git a/imports/QtDesktop/Styles/Desktop/FrameStyle.qml b/src/styles/Desktop/FrameStyle.qml index 1d2e1543..1d2e1543 100644 --- a/imports/QtDesktop/Styles/Desktop/FrameStyle.qml +++ b/src/styles/Desktop/FrameStyle.qml diff --git a/imports/QtDesktop/Styles/Desktop/GroupBoxStyle.qml b/src/styles/Desktop/GroupBoxStyle.qml index c24d70a0..c24d70a0 100644 --- a/imports/QtDesktop/Styles/Desktop/GroupBoxStyle.qml +++ b/src/styles/Desktop/GroupBoxStyle.qml diff --git a/imports/QtDesktop/Styles/Desktop/ProgressBarStyle.qml b/src/styles/Desktop/ProgressBarStyle.qml index 42d72dcc..42d72dcc 100644 --- a/imports/QtDesktop/Styles/Desktop/ProgressBarStyle.qml +++ b/src/styles/Desktop/ProgressBarStyle.qml diff --git a/imports/QtDesktop/Styles/Desktop/RadioButtonStyle.qml b/src/styles/Desktop/RadioButtonStyle.qml index e37d7314..e37d7314 100644 --- a/imports/QtDesktop/Styles/Desktop/RadioButtonStyle.qml +++ b/src/styles/Desktop/RadioButtonStyle.qml diff --git a/imports/QtDesktop/Styles/Desktop/ScrollAreaStyle.qml b/src/styles/Desktop/ScrollAreaStyle.qml index c1c1b8c5..c1c1b8c5 100644 --- a/imports/QtDesktop/Styles/Desktop/ScrollAreaStyle.qml +++ b/src/styles/Desktop/ScrollAreaStyle.qml diff --git a/imports/QtDesktop/Styles/Desktop/ScrollBarStyle.qml b/src/styles/Desktop/ScrollBarStyle.qml index 491c3fe7..491c3fe7 100644 --- a/imports/QtDesktop/Styles/Desktop/ScrollBarStyle.qml +++ b/src/styles/Desktop/ScrollBarStyle.qml diff --git a/imports/QtDesktop/Styles/Desktop/SliderStyle.qml b/src/styles/Desktop/SliderStyle.qml index da00df15..da00df15 100644 --- a/imports/QtDesktop/Styles/Desktop/SliderStyle.qml +++ b/src/styles/Desktop/SliderStyle.qml diff --git a/imports/QtDesktop/Styles/Desktop/SpinBoxStyle.qml b/src/styles/Desktop/SpinBoxStyle.qml index fba04d5d..fba04d5d 100644 --- a/imports/QtDesktop/Styles/Desktop/SpinBoxStyle.qml +++ b/src/styles/Desktop/SpinBoxStyle.qml diff --git a/imports/QtDesktop/Styles/Desktop/TabBarStyle.qml b/src/styles/Desktop/TabBarStyle.qml index d741a70b..d741a70b 100644 --- a/imports/QtDesktop/Styles/Desktop/TabBarStyle.qml +++ b/src/styles/Desktop/TabBarStyle.qml diff --git a/imports/QtDesktop/Styles/Desktop/TabFrameStyle.qml b/src/styles/Desktop/TabFrameStyle.qml index e46fa6df..e46fa6df 100644 --- a/imports/QtDesktop/Styles/Desktop/TabFrameStyle.qml +++ b/src/styles/Desktop/TabFrameStyle.qml diff --git a/imports/QtDesktop/Styles/Desktop/TextFieldStyle.qml b/src/styles/Desktop/TextFieldStyle.qml index 1ef5c18e..1ef5c18e 100644 --- a/imports/QtDesktop/Styles/Desktop/TextFieldStyle.qml +++ b/src/styles/Desktop/TextFieldStyle.qml diff --git a/imports/QtDesktop/Styles/Desktop/ToolBarStyle.qml b/src/styles/Desktop/ToolBarStyle.qml index 9e8de799..9e8de799 100644 --- a/imports/QtDesktop/Styles/Desktop/ToolBarStyle.qml +++ b/src/styles/Desktop/ToolBarStyle.qml diff --git a/imports/QtDesktop/Styles/Desktop/ToolButtonStyle.qml b/src/styles/Desktop/ToolButtonStyle.qml index 0fdce1a4..0fdce1a4 100644 --- a/imports/QtDesktop/Styles/Desktop/ToolButtonStyle.qml +++ b/src/styles/Desktop/ToolButtonStyle.qml diff --git a/imports/QtDesktop/Styles/FrameStyle.qml b/src/styles/FrameStyle.qml index 88cb80b2..88cb80b2 100644 --- a/imports/QtDesktop/Styles/FrameStyle.qml +++ b/src/styles/FrameStyle.qml diff --git a/imports/QtDesktop/Styles/GroupBoxStyle.qml b/src/styles/GroupBoxStyle.qml index a37782bf..a37782bf 100644 --- a/imports/QtDesktop/Styles/GroupBoxStyle.qml +++ b/src/styles/GroupBoxStyle.qml diff --git a/imports/QtDesktop/Styles/ProgressBarStyle.qml b/src/styles/ProgressBarStyle.qml index d379347e..d379347e 100644 --- a/imports/QtDesktop/Styles/ProgressBarStyle.qml +++ b/src/styles/ProgressBarStyle.qml diff --git a/imports/QtDesktop/Styles/RadioButtonStyle.qml b/src/styles/RadioButtonStyle.qml index 4c1f4c43..4c1f4c43 100644 --- a/imports/QtDesktop/Styles/RadioButtonStyle.qml +++ b/src/styles/RadioButtonStyle.qml diff --git a/imports/QtDesktop/Styles/ScrollAreaStyle.qml b/src/styles/ScrollAreaStyle.qml index 0fff6a41..0fff6a41 100644 --- a/imports/QtDesktop/Styles/ScrollAreaStyle.qml +++ b/src/styles/ScrollAreaStyle.qml diff --git a/imports/QtDesktop/Styles/ScrollBarStyle.qml b/src/styles/ScrollBarStyle.qml index b60c2fa5..b60c2fa5 100644 --- a/imports/QtDesktop/Styles/ScrollBarStyle.qml +++ b/src/styles/ScrollBarStyle.qml diff --git a/imports/QtDesktop/Styles/Settings.js b/src/styles/Settings.js index 28ef8ee9..28ef8ee9 100644 --- a/imports/QtDesktop/Styles/Settings.js +++ b/src/styles/Settings.js diff --git a/imports/QtDesktop/Styles/SliderStyle.qml b/src/styles/SliderStyle.qml index 7066f44b..7066f44b 100644 --- a/imports/QtDesktop/Styles/SliderStyle.qml +++ b/src/styles/SliderStyle.qml diff --git a/imports/QtDesktop/Styles/SpinBoxStyle.qml b/src/styles/SpinBoxStyle.qml index 6c8af767..6c8af767 100644 --- a/imports/QtDesktop/Styles/SpinBoxStyle.qml +++ b/src/styles/SpinBoxStyle.qml diff --git a/imports/QtDesktop/Styles/TabBarStyle.qml b/src/styles/TabBarStyle.qml index a05345f8..a05345f8 100644 --- a/imports/QtDesktop/Styles/TabBarStyle.qml +++ b/src/styles/TabBarStyle.qml diff --git a/imports/QtDesktop/Styles/TabFrameStyle.qml b/src/styles/TabFrameStyle.qml index 0b329502..0b329502 100644 --- a/imports/QtDesktop/Styles/TabFrameStyle.qml +++ b/src/styles/TabFrameStyle.qml diff --git a/imports/QtDesktop/Styles/TextFieldStyle.qml b/src/styles/TextFieldStyle.qml index a148a0fd..a148a0fd 100644 --- a/imports/QtDesktop/Styles/TextFieldStyle.qml +++ b/src/styles/TextFieldStyle.qml diff --git a/imports/QtDesktop/Styles/ToolBarStyle.qml b/src/styles/ToolBarStyle.qml index 504d68ee..504d68ee 100644 --- a/imports/QtDesktop/Styles/ToolBarStyle.qml +++ b/src/styles/ToolBarStyle.qml diff --git a/imports/QtDesktop/Styles/ToolButtonStyle.qml b/src/styles/ToolButtonStyle.qml index 1c2a6894..1c2a6894 100644 --- a/imports/QtDesktop/Styles/ToolButtonStyle.qml +++ b/src/styles/ToolButtonStyle.qml diff --git a/imports/QtDesktop/Styles/qmldir b/src/styles/qmldir index b279be3b..b279be3b 100644 --- a/imports/QtDesktop/Styles/qmldir +++ b/src/styles/qmldir diff --git a/src/styles/styles.pro b/src/styles/styles.pro new file mode 100644 index 00000000..23dd37f1 --- /dev/null +++ b/src/styles/styles.pro @@ -0,0 +1,41 @@ +TARGETPATH = QtDesktop/Styles + +QML_FILES = \ + ButtonStyle.qml \ + CheckBoxStyle.qml \ + ComboBoxStyle.qml \ + FrameStyle.qml \ + GroupBoxStyle.qml \ + ProgressBarStyle.qml \ + RadioButtonStyle.qml \ + ScrollAreaStyle.qml \ + ScrollBarStyle.qml \ + Settings.js \ + SliderStyle.qml \ + SpinBoxStyle.qml \ + TabBarStyle.qml \ + TabFrameStyle.qml \ + TextFieldStyle.qml \ + ToolBarStyle.qml \ + ToolButtonStyle.qml + +# Desktop +QML_FILES += \ + Desktop/ButtonStyle.qml \ + Desktop/CheckBoxStyle.qml \ + Desktop/ComboBoxStyle.qml \ + Desktop/FrameStyle.qml \ + Desktop/GroupBoxStyle.qml \ + Desktop/ProgressBarStyle.qml \ + Desktop/RadioButtonStyle.qml \ + Desktop/ScrollAreaStyle.qml \ + Desktop/ScrollBarStyle.qml \ + Desktop/SliderStyle.qml \ + Desktop/SpinBoxStyle.qml \ + Desktop/TabBarStyle.qml \ + Desktop/TabFrameStyle.qml \ + Desktop/TextFieldStyle.qml \ + Desktop/ToolBarStyle.qml \ + Desktop/ToolButtonStyle.qml + +load(qml_module) diff --git a/sync.profile b/sync.profile index 28dcdcba..169a092f 100644 --- a/sync.profile +++ b/sync.profile @@ -1,5 +1,4 @@ %modules = ( # path to module name map - "QtDesktopComponents" => "$basedir", ); %moduleheaders = ( # restrict the module headers to those found in relative path ); diff --git a/qmlwidget/main.cpp b/tools/qmlwidget/main.cpp index cec4059c..cec4059c 100644 --- a/qmlwidget/main.cpp +++ b/tools/qmlwidget/main.cpp diff --git a/qmlwidget/qmlwidget.pro b/tools/qmlwidget/qmlwidget.pro index 890ce76a..890ce76a 100644 --- a/qmlwidget/qmlwidget.pro +++ b/tools/qmlwidget/qmlwidget.pro |