From e558d0794b4b22e35ce217818dd96d1e45957b10 Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Mon, 9 Mar 2020 16:41:38 +0100 Subject: CMake: Regenerate projects Change-Id: Ifd6b2289de6465a010f5f2a32789221767b4d5be Reviewed-by: Leander Beernaert Reviewed-by: Alexandru Croitor --- examples/quickcontrols2/texteditor/CMakeLists.txt | 2 +- src/imports/controls/CMakeLists.txt | 173 ++++++++++++++++++++ src/imports/controls/fusion/CMakeLists.txt | 164 +++++++++++++++++++ src/imports/controls/imagine/CMakeLists.txt | 146 +++++++++++++++++ src/imports/controls/material/CMakeLists.txt | 176 +++++++++++++++++++++ src/imports/controls/universal/CMakeLists.txt | 158 ++++++++++++++++++ src/quicktemplates2/CMakeLists.txt | 4 + src/quicktemplates2/qquickpalette.cpp | 2 + tests/.prev_CMakeLists.txt | 10 +- tests/CMakeLists.txt | 12 +- tests/auto/CMakeLists.txt | 2 + tests/auto/accessibility/CMakeLists.txt | 14 +- tests/auto/cursor/CMakeLists.txt | 14 +- tests/auto/customization/CMakeLists.txt | 14 +- tests/auto/designer/CMakeLists.txt | 3 +- tests/auto/focus/CMakeLists.txt | 14 +- tests/auto/font/CMakeLists.txt | 14 +- tests/auto/palette/CMakeLists.txt | 14 +- tests/auto/qquickapplicationwindow/CMakeLists.txt | 14 +- tests/auto/qquickdrawer/CMakeLists.txt | 14 +- tests/auto/qquickheaderview/CMakeLists.txt | 49 ++++++ tests/auto/qquickiconimage/CMakeLists.txt | 16 +- tests/auto/qquickiconlabel/CMakeLists.txt | 16 +- tests/auto/qquickimaginestyle/CMakeLists.txt | 2 + tests/auto/qquickmaterialstyleconf/CMakeLists.txt | 14 +- tests/auto/qquickmenu/CMakeLists.txt | 14 +- tests/auto/qquickmenubar/CMakeLists.txt | 14 +- tests/auto/qquickninepatchimage/CMakeLists.txt | 15 +- tests/auto/qquickpopup/CMakeLists.txt | 14 +- tests/auto/qquickstyle/CMakeLists.txt | 17 +- tests/auto/qquickstyleselector/CMakeLists.txt | 14 +- tests/auto/qquickuniversalstyleconf/CMakeLists.txt | 14 +- tests/auto/sanity/CMakeLists.txt | 15 +- tests/auto/translation/CMakeLists.txt | 61 +++++++ tests/benchmarks/creationtime/CMakeLists.txt | 15 +- tests/benchmarks/objectcount/CMakeLists.txt | 15 +- 36 files changed, 1065 insertions(+), 204 deletions(-) create mode 100644 tests/auto/qquickheaderview/CMakeLists.txt create mode 100644 tests/auto/translation/CMakeLists.txt diff --git a/examples/quickcontrols2/texteditor/CMakeLists.txt b/examples/quickcontrols2/texteditor/CMakeLists.txt index 9ae1a04d..d9e24479 100644 --- a/examples/quickcontrols2/texteditor/CMakeLists.txt +++ b/examples/quickcontrols2/texteditor/CMakeLists.txt @@ -52,7 +52,7 @@ if(TARGET Qt::Widgets) ) endif() -if(cross_compile) +if(CMAKE_CROSSCOMPILING) target_compile_definitions(texteditor PUBLIC QT_EXTRA_FILE_SELECTOR=\\\"touch\\\" ) diff --git a/src/imports/controls/CMakeLists.txt b/src/imports/controls/CMakeLists.txt index ae0d1e60..626155f8 100644 --- a/src/imports/controls/CMakeLists.txt +++ b/src/imports/controls/CMakeLists.txt @@ -98,6 +98,7 @@ set(qml_files "Drawer.qml" "Frame.qml" "GroupBox.qml" + "HorizontalHeaderView.qml" "ItemDelegate.qml" "Label.qml" "Menu.qml" @@ -134,6 +135,178 @@ set(qml_files "ToolSeparator.qml" "ToolTip.qml" "Tumbler.qml" + "VerticalHeaderView.qml" +) +set_source_files_properties(AbstractButton.qml PROPERTIES + QT_QML_SKIP_QMLDIR_ENTRY TRUE +) +set_source_files_properties(Action.qml PROPERTIES + QT_QML_SKIP_QMLDIR_ENTRY TRUE +) +set_source_files_properties(ActionGroup.qml PROPERTIES + QT_QML_SKIP_QMLDIR_ENTRY TRUE +) +set_source_files_properties(ApplicationWindow.qml PROPERTIES + QT_QML_SKIP_QMLDIR_ENTRY TRUE +) +set_source_files_properties(BusyIndicator.qml PROPERTIES + QT_QML_SKIP_QMLDIR_ENTRY TRUE +) +set_source_files_properties(Button.qml PROPERTIES + QT_QML_SKIP_QMLDIR_ENTRY TRUE +) +set_source_files_properties(ButtonGroup.qml PROPERTIES + QT_QML_SKIP_QMLDIR_ENTRY TRUE +) +set_source_files_properties(CheckBox.qml PROPERTIES + QT_QML_SKIP_QMLDIR_ENTRY TRUE +) +set_source_files_properties(CheckDelegate.qml PROPERTIES + QT_QML_SKIP_QMLDIR_ENTRY TRUE +) +set_source_files_properties(ComboBox.qml PROPERTIES + QT_QML_SKIP_QMLDIR_ENTRY TRUE +) +set_source_files_properties(Container.qml PROPERTIES + QT_QML_SKIP_QMLDIR_ENTRY TRUE +) +set_source_files_properties(Control.qml PROPERTIES + QT_QML_SKIP_QMLDIR_ENTRY TRUE +) +set_source_files_properties(DelayButton.qml PROPERTIES + QT_QML_SKIP_QMLDIR_ENTRY TRUE +) +set_source_files_properties(Dial.qml PROPERTIES + QT_QML_SKIP_QMLDIR_ENTRY TRUE +) +set_source_files_properties(Dialog.qml PROPERTIES + QT_QML_SKIP_QMLDIR_ENTRY TRUE +) +set_source_files_properties(DialogButtonBox.qml PROPERTIES + QT_QML_SKIP_QMLDIR_ENTRY TRUE +) +set_source_files_properties(Drawer.qml PROPERTIES + QT_QML_SKIP_QMLDIR_ENTRY TRUE +) +set_source_files_properties(Frame.qml PROPERTIES + QT_QML_SKIP_QMLDIR_ENTRY TRUE +) +set_source_files_properties(GroupBox.qml PROPERTIES + QT_QML_SKIP_QMLDIR_ENTRY TRUE +) +set_source_files_properties(HorizontalHeaderView.qml PROPERTIES + QT_QML_SKIP_QMLDIR_ENTRY TRUE +) +set_source_files_properties(ItemDelegate.qml PROPERTIES + QT_QML_SKIP_QMLDIR_ENTRY TRUE +) +set_source_files_properties(Label.qml PROPERTIES + QT_QML_SKIP_QMLDIR_ENTRY TRUE +) +set_source_files_properties(Menu.qml PROPERTIES + QT_QML_SKIP_QMLDIR_ENTRY TRUE +) +set_source_files_properties(MenuBar.qml PROPERTIES + QT_QML_SKIP_QMLDIR_ENTRY TRUE +) +set_source_files_properties(MenuBarItem.qml PROPERTIES + QT_QML_SKIP_QMLDIR_ENTRY TRUE +) +set_source_files_properties(MenuItem.qml PROPERTIES + QT_QML_SKIP_QMLDIR_ENTRY TRUE +) +set_source_files_properties(MenuSeparator.qml PROPERTIES + QT_QML_SKIP_QMLDIR_ENTRY TRUE +) +set_source_files_properties(Page.qml PROPERTIES + QT_QML_SKIP_QMLDIR_ENTRY TRUE +) +set_source_files_properties(PageIndicator.qml PROPERTIES + QT_QML_SKIP_QMLDIR_ENTRY TRUE +) +set_source_files_properties(Pane.qml PROPERTIES + QT_QML_SKIP_QMLDIR_ENTRY TRUE +) +set_source_files_properties(Popup.qml PROPERTIES + QT_QML_SKIP_QMLDIR_ENTRY TRUE +) +set_source_files_properties(ProgressBar.qml PROPERTIES + QT_QML_SKIP_QMLDIR_ENTRY TRUE +) +set_source_files_properties(RadioButton.qml PROPERTIES + QT_QML_SKIP_QMLDIR_ENTRY TRUE +) +set_source_files_properties(RadioDelegate.qml PROPERTIES + QT_QML_SKIP_QMLDIR_ENTRY TRUE +) +set_source_files_properties(RangeSlider.qml PROPERTIES + QT_QML_SKIP_QMLDIR_ENTRY TRUE +) +set_source_files_properties(RoundButton.qml PROPERTIES + QT_QML_SKIP_QMLDIR_ENTRY TRUE +) +set_source_files_properties(ScrollBar.qml PROPERTIES + QT_QML_SKIP_QMLDIR_ENTRY TRUE +) +set_source_files_properties(ScrollIndicator.qml PROPERTIES + QT_QML_SKIP_QMLDIR_ENTRY TRUE +) +set_source_files_properties(ScrollView.qml PROPERTIES + QT_QML_SKIP_QMLDIR_ENTRY TRUE +) +set_source_files_properties(Slider.qml PROPERTIES + QT_QML_SKIP_QMLDIR_ENTRY TRUE +) +set_source_files_properties(SpinBox.qml PROPERTIES + QT_QML_SKIP_QMLDIR_ENTRY TRUE +) +set_source_files_properties(SplitView.qml PROPERTIES + QT_QML_SKIP_QMLDIR_ENTRY TRUE +) +set_source_files_properties(StackView.qml PROPERTIES + QT_QML_SKIP_QMLDIR_ENTRY TRUE +) +set_source_files_properties(SwipeDelegate.qml PROPERTIES + QT_QML_SKIP_QMLDIR_ENTRY TRUE +) +set_source_files_properties(Switch.qml PROPERTIES + QT_QML_SKIP_QMLDIR_ENTRY TRUE +) +set_source_files_properties(SwitchDelegate.qml PROPERTIES + QT_QML_SKIP_QMLDIR_ENTRY TRUE +) +set_source_files_properties(SwipeView.qml PROPERTIES + QT_QML_SKIP_QMLDIR_ENTRY TRUE +) +set_source_files_properties(TabBar.qml PROPERTIES + QT_QML_SKIP_QMLDIR_ENTRY TRUE +) +set_source_files_properties(TabButton.qml PROPERTIES + QT_QML_SKIP_QMLDIR_ENTRY TRUE +) +set_source_files_properties(TextArea.qml PROPERTIES + QT_QML_SKIP_QMLDIR_ENTRY TRUE +) +set_source_files_properties(TextField.qml PROPERTIES + QT_QML_SKIP_QMLDIR_ENTRY TRUE +) +set_source_files_properties(ToolBar.qml PROPERTIES + QT_QML_SKIP_QMLDIR_ENTRY TRUE +) +set_source_files_properties(ToolButton.qml PROPERTIES + QT_QML_SKIP_QMLDIR_ENTRY TRUE +) +set_source_files_properties(ToolSeparator.qml PROPERTIES + QT_QML_SKIP_QMLDIR_ENTRY TRUE +) +set_source_files_properties(ToolTip.qml PROPERTIES + QT_QML_SKIP_QMLDIR_ENTRY TRUE +) +set_source_files_properties(Tumbler.qml PROPERTIES + QT_QML_SKIP_QMLDIR_ENTRY TRUE +) +set_source_files_properties(VerticalHeaderView.qml PROPERTIES + QT_QML_SKIP_QMLDIR_ENTRY TRUE ) qt6_target_qml_files(qtquickcontrols2plugin diff --git a/src/imports/controls/fusion/CMakeLists.txt b/src/imports/controls/fusion/CMakeLists.txt index ee8f2c92..59b06842 100644 --- a/src/imports/controls/fusion/CMakeLists.txt +++ b/src/imports/controls/fusion/CMakeLists.txt @@ -83,6 +83,7 @@ set(qml_files "Drawer.qml" "Frame.qml" "GroupBox.qml" + "HorizontalHeaderView.qml" "ItemDelegate.qml" "Label.qml" "Menu.qml" @@ -120,6 +121,169 @@ set(qml_files "ToolSeparator.qml" "ToolTip.qml" "Tumbler.qml" + "VerticalHeaderView.qml" +) +set_source_files_properties(ApplicationWindow.qml PROPERTIES + QT_QML_SKIP_QMLDIR_ENTRY TRUE +) +set_source_files_properties(BusyIndicator.qml PROPERTIES + QT_QML_SKIP_QMLDIR_ENTRY TRUE +) +set_source_files_properties(Button.qml PROPERTIES + QT_QML_SKIP_QMLDIR_ENTRY TRUE +) +set_source_files_properties(ButtonPanel.qml PROPERTIES + QT_QML_SKIP_QMLDIR_ENTRY TRUE +) +set_source_files_properties(CheckBox.qml PROPERTIES + QT_QML_SKIP_QMLDIR_ENTRY TRUE +) +set_source_files_properties(CheckDelegate.qml PROPERTIES + QT_QML_SKIP_QMLDIR_ENTRY TRUE +) +set_source_files_properties(CheckIndicator.qml PROPERTIES + QT_QML_SKIP_QMLDIR_ENTRY TRUE +) +set_source_files_properties(ComboBox.qml PROPERTIES + QT_QML_SKIP_QMLDIR_ENTRY TRUE +) +set_source_files_properties(DelayButton.qml PROPERTIES + QT_QML_SKIP_QMLDIR_ENTRY TRUE +) +set_source_files_properties(Dial.qml PROPERTIES + QT_QML_SKIP_QMLDIR_ENTRY TRUE +) +set_source_files_properties(Dialog.qml PROPERTIES + QT_QML_SKIP_QMLDIR_ENTRY TRUE +) +set_source_files_properties(DialogButtonBox.qml PROPERTIES + QT_QML_SKIP_QMLDIR_ENTRY TRUE +) +set_source_files_properties(Drawer.qml PROPERTIES + QT_QML_SKIP_QMLDIR_ENTRY TRUE +) +set_source_files_properties(Frame.qml PROPERTIES + QT_QML_SKIP_QMLDIR_ENTRY TRUE +) +set_source_files_properties(GroupBox.qml PROPERTIES + QT_QML_SKIP_QMLDIR_ENTRY TRUE +) +set_source_files_properties(HorizontalHeaderView.qml PROPERTIES + QT_QML_SKIP_QMLDIR_ENTRY TRUE +) +set_source_files_properties(ItemDelegate.qml PROPERTIES + QT_QML_SKIP_QMLDIR_ENTRY TRUE +) +set_source_files_properties(Label.qml PROPERTIES + QT_QML_SKIP_QMLDIR_ENTRY TRUE +) +set_source_files_properties(Menu.qml PROPERTIES + QT_QML_SKIP_QMLDIR_ENTRY TRUE +) +set_source_files_properties(MenuBar.qml PROPERTIES + QT_QML_SKIP_QMLDIR_ENTRY TRUE +) +set_source_files_properties(MenuBarItem.qml PROPERTIES + QT_QML_SKIP_QMLDIR_ENTRY TRUE +) +set_source_files_properties(MenuItem.qml PROPERTIES + QT_QML_SKIP_QMLDIR_ENTRY TRUE +) +set_source_files_properties(MenuSeparator.qml PROPERTIES + QT_QML_SKIP_QMLDIR_ENTRY TRUE +) +set_source_files_properties(Page.qml PROPERTIES + QT_QML_SKIP_QMLDIR_ENTRY TRUE +) +set_source_files_properties(PageIndicator.qml PROPERTIES + QT_QML_SKIP_QMLDIR_ENTRY TRUE +) +set_source_files_properties(Pane.qml PROPERTIES + QT_QML_SKIP_QMLDIR_ENTRY TRUE +) +set_source_files_properties(Popup.qml PROPERTIES + QT_QML_SKIP_QMLDIR_ENTRY TRUE +) +set_source_files_properties(ProgressBar.qml PROPERTIES + QT_QML_SKIP_QMLDIR_ENTRY TRUE +) +set_source_files_properties(RadioButton.qml PROPERTIES + QT_QML_SKIP_QMLDIR_ENTRY TRUE +) +set_source_files_properties(RadioDelegate.qml PROPERTIES + QT_QML_SKIP_QMLDIR_ENTRY TRUE +) +set_source_files_properties(RadioIndicator.qml PROPERTIES + QT_QML_SKIP_QMLDIR_ENTRY TRUE +) +set_source_files_properties(RangeSlider.qml PROPERTIES + QT_QML_SKIP_QMLDIR_ENTRY TRUE +) +set_source_files_properties(RoundButton.qml PROPERTIES + QT_QML_SKIP_QMLDIR_ENTRY TRUE +) +set_source_files_properties(ScrollBar.qml PROPERTIES + QT_QML_SKIP_QMLDIR_ENTRY TRUE +) +set_source_files_properties(ScrollIndicator.qml PROPERTIES + QT_QML_SKIP_QMLDIR_ENTRY TRUE +) +set_source_files_properties(Slider.qml PROPERTIES + QT_QML_SKIP_QMLDIR_ENTRY TRUE +) +set_source_files_properties(SliderGroove.qml PROPERTIES + QT_QML_SKIP_QMLDIR_ENTRY TRUE +) +set_source_files_properties(SliderHandle.qml PROPERTIES + QT_QML_SKIP_QMLDIR_ENTRY TRUE +) +set_source_files_properties(SpinBox.qml PROPERTIES + QT_QML_SKIP_QMLDIR_ENTRY TRUE +) +set_source_files_properties(SplitView.qml PROPERTIES + QT_QML_SKIP_QMLDIR_ENTRY TRUE +) +set_source_files_properties(SwipeDelegate.qml PROPERTIES + QT_QML_SKIP_QMLDIR_ENTRY TRUE +) +set_source_files_properties(SwitchDelegate.qml PROPERTIES + QT_QML_SKIP_QMLDIR_ENTRY TRUE +) +set_source_files_properties(SwitchIndicator.qml PROPERTIES + QT_QML_SKIP_QMLDIR_ENTRY TRUE +) +set_source_files_properties(Switch.qml PROPERTIES + QT_QML_SKIP_QMLDIR_ENTRY TRUE +) +set_source_files_properties(TabBar.qml PROPERTIES + QT_QML_SKIP_QMLDIR_ENTRY TRUE +) +set_source_files_properties(TabButton.qml PROPERTIES + QT_QML_SKIP_QMLDIR_ENTRY TRUE +) +set_source_files_properties(TextArea.qml PROPERTIES + QT_QML_SKIP_QMLDIR_ENTRY TRUE +) +set_source_files_properties(TextField.qml PROPERTIES + QT_QML_SKIP_QMLDIR_ENTRY TRUE +) +set_source_files_properties(ToolBar.qml PROPERTIES + QT_QML_SKIP_QMLDIR_ENTRY TRUE +) +set_source_files_properties(ToolButton.qml PROPERTIES + QT_QML_SKIP_QMLDIR_ENTRY TRUE +) +set_source_files_properties(ToolSeparator.qml PROPERTIES + QT_QML_SKIP_QMLDIR_ENTRY TRUE +) +set_source_files_properties(ToolTip.qml PROPERTIES + QT_QML_SKIP_QMLDIR_ENTRY TRUE +) +set_source_files_properties(Tumbler.qml PROPERTIES + QT_QML_SKIP_QMLDIR_ENTRY TRUE +) +set_source_files_properties(VerticalHeaderView.qml PROPERTIES + QT_QML_SKIP_QMLDIR_ENTRY TRUE ) qt6_target_qml_files(qtquickcontrols2fusionstyleplugin diff --git a/src/imports/controls/imagine/CMakeLists.txt b/src/imports/controls/imagine/CMakeLists.txt index f0435255..ee7e8242 100644 --- a/src/imports/controls/imagine/CMakeLists.txt +++ b/src/imports/controls/imagine/CMakeLists.txt @@ -81,6 +81,7 @@ set(qml_files "Drawer.qml" "Frame.qml" "GroupBox.qml" + "HorizontalHeaderView.qml" "ItemDelegate.qml" "Label.qml" "Menu.qml" @@ -114,6 +115,151 @@ set(qml_files "ToolSeparator.qml" "ToolTip.qml" "Tumbler.qml" + "VerticalHeaderView.qml" +) +set_source_files_properties(ApplicationWindow.qml PROPERTIES + QT_QML_SKIP_QMLDIR_ENTRY TRUE +) +set_source_files_properties(BusyIndicator.qml PROPERTIES + QT_QML_SKIP_QMLDIR_ENTRY TRUE +) +set_source_files_properties(Button.qml PROPERTIES + QT_QML_SKIP_QMLDIR_ENTRY TRUE +) +set_source_files_properties(CheckBox.qml PROPERTIES + QT_QML_SKIP_QMLDIR_ENTRY TRUE +) +set_source_files_properties(CheckDelegate.qml PROPERTIES + QT_QML_SKIP_QMLDIR_ENTRY TRUE +) +set_source_files_properties(ComboBox.qml PROPERTIES + QT_QML_SKIP_QMLDIR_ENTRY TRUE +) +set_source_files_properties(DelayButton.qml PROPERTIES + QT_QML_SKIP_QMLDIR_ENTRY TRUE +) +set_source_files_properties(Dial.qml PROPERTIES + QT_QML_SKIP_QMLDIR_ENTRY TRUE +) +set_source_files_properties(Dialog.qml PROPERTIES + QT_QML_SKIP_QMLDIR_ENTRY TRUE +) +set_source_files_properties(DialogButtonBox.qml PROPERTIES + QT_QML_SKIP_QMLDIR_ENTRY TRUE +) +set_source_files_properties(Drawer.qml PROPERTIES + QT_QML_SKIP_QMLDIR_ENTRY TRUE +) +set_source_files_properties(Frame.qml PROPERTIES + QT_QML_SKIP_QMLDIR_ENTRY TRUE +) +set_source_files_properties(GroupBox.qml PROPERTIES + QT_QML_SKIP_QMLDIR_ENTRY TRUE +) +set_source_files_properties(HorizontalHeaderView.qml PROPERTIES + QT_QML_SKIP_QMLDIR_ENTRY TRUE +) +set_source_files_properties(ItemDelegate.qml PROPERTIES + QT_QML_SKIP_QMLDIR_ENTRY TRUE +) +set_source_files_properties(Label.qml PROPERTIES + QT_QML_SKIP_QMLDIR_ENTRY TRUE +) +set_source_files_properties(Menu.qml PROPERTIES + QT_QML_SKIP_QMLDIR_ENTRY TRUE +) +set_source_files_properties(MenuItem.qml PROPERTIES + QT_QML_SKIP_QMLDIR_ENTRY TRUE +) +set_source_files_properties(MenuSeparator.qml PROPERTIES + QT_QML_SKIP_QMLDIR_ENTRY TRUE +) +set_source_files_properties(PageIndicator.qml PROPERTIES + QT_QML_SKIP_QMLDIR_ENTRY TRUE +) +set_source_files_properties(Page.qml PROPERTIES + QT_QML_SKIP_QMLDIR_ENTRY TRUE +) +set_source_files_properties(Pane.qml PROPERTIES + QT_QML_SKIP_QMLDIR_ENTRY TRUE +) +set_source_files_properties(Popup.qml PROPERTIES + QT_QML_SKIP_QMLDIR_ENTRY TRUE +) +set_source_files_properties(ProgressBar.qml PROPERTIES + QT_QML_SKIP_QMLDIR_ENTRY TRUE +) +set_source_files_properties(RadioButton.qml PROPERTIES + QT_QML_SKIP_QMLDIR_ENTRY TRUE +) +set_source_files_properties(RadioDelegate.qml PROPERTIES + QT_QML_SKIP_QMLDIR_ENTRY TRUE +) +set_source_files_properties(RangeSlider.qml PROPERTIES + QT_QML_SKIP_QMLDIR_ENTRY TRUE +) +set_source_files_properties(RoundButton.qml PROPERTIES + QT_QML_SKIP_QMLDIR_ENTRY TRUE +) +set_source_files_properties(ScrollBar.qml PROPERTIES + QT_QML_SKIP_QMLDIR_ENTRY TRUE +) +set_source_files_properties(ScrollIndicator.qml PROPERTIES + QT_QML_SKIP_QMLDIR_ENTRY TRUE +) +set_source_files_properties(Slider.qml PROPERTIES + QT_QML_SKIP_QMLDIR_ENTRY TRUE +) +set_source_files_properties(SpinBox.qml PROPERTIES + QT_QML_SKIP_QMLDIR_ENTRY TRUE +) +set_source_files_properties(SplitView.qml PROPERTIES + QT_QML_SKIP_QMLDIR_ENTRY TRUE +) +set_source_files_properties(StackView.qml PROPERTIES + QT_QML_SKIP_QMLDIR_ENTRY TRUE +) +set_source_files_properties(SwipeDelegate.qml PROPERTIES + QT_QML_SKIP_QMLDIR_ENTRY TRUE +) +set_source_files_properties(SwipeView.qml PROPERTIES + QT_QML_SKIP_QMLDIR_ENTRY TRUE +) +set_source_files_properties(Switch.qml PROPERTIES + QT_QML_SKIP_QMLDIR_ENTRY TRUE +) +set_source_files_properties(SwitchDelegate.qml PROPERTIES + QT_QML_SKIP_QMLDIR_ENTRY TRUE +) +set_source_files_properties(TextField.qml PROPERTIES + QT_QML_SKIP_QMLDIR_ENTRY TRUE +) +set_source_files_properties(TextArea.qml PROPERTIES + QT_QML_SKIP_QMLDIR_ENTRY TRUE +) +set_source_files_properties(TabBar.qml PROPERTIES + QT_QML_SKIP_QMLDIR_ENTRY TRUE +) +set_source_files_properties(TabButton.qml PROPERTIES + QT_QML_SKIP_QMLDIR_ENTRY TRUE +) +set_source_files_properties(ToolBar.qml PROPERTIES + QT_QML_SKIP_QMLDIR_ENTRY TRUE +) +set_source_files_properties(ToolButton.qml PROPERTIES + QT_QML_SKIP_QMLDIR_ENTRY TRUE +) +set_source_files_properties(ToolSeparator.qml PROPERTIES + QT_QML_SKIP_QMLDIR_ENTRY TRUE +) +set_source_files_properties(ToolTip.qml PROPERTIES + QT_QML_SKIP_QMLDIR_ENTRY TRUE +) +set_source_files_properties(Tumbler.qml PROPERTIES + QT_QML_SKIP_QMLDIR_ENTRY TRUE +) +set_source_files_properties(VerticalHeaderView.qml PROPERTIES + QT_QML_SKIP_QMLDIR_ENTRY TRUE ) qt6_target_qml_files(qtquickcontrols2imaginestyleplugin diff --git a/src/imports/controls/material/CMakeLists.txt b/src/imports/controls/material/CMakeLists.txt index c6a2be63..1270bfc6 100644 --- a/src/imports/controls/material/CMakeLists.txt +++ b/src/imports/controls/material/CMakeLists.txt @@ -89,6 +89,7 @@ set(qml_files "ElevationEffect.qml" "Frame.qml" "GroupBox.qml" + "HorizontalHeaderView.qml" "ItemDelegate.qml" "Label.qml" "Menu.qml" @@ -128,6 +129,181 @@ set(qml_files "ToolSeparator.qml" "ToolTip.qml" "Tumbler.qml" + "VerticalHeaderView.qml" +) +set_source_files_properties(ApplicationWindow.qml PROPERTIES + QT_QML_SKIP_QMLDIR_ENTRY TRUE +) +set_source_files_properties(BoxShadow.qml PROPERTIES + QT_QML_SKIP_QMLDIR_ENTRY TRUE +) +set_source_files_properties(BusyIndicator.qml PROPERTIES + QT_QML_SKIP_QMLDIR_ENTRY TRUE +) +set_source_files_properties(Button.qml PROPERTIES + QT_QML_SKIP_QMLDIR_ENTRY TRUE +) +set_source_files_properties(CheckBox.qml PROPERTIES + QT_QML_SKIP_QMLDIR_ENTRY TRUE +) +set_source_files_properties(CheckDelegate.qml PROPERTIES + QT_QML_SKIP_QMLDIR_ENTRY TRUE +) +set_source_files_properties(CheckIndicator.qml PROPERTIES + QT_QML_SKIP_QMLDIR_ENTRY TRUE +) +set_source_files_properties(ComboBox.qml PROPERTIES + QT_QML_SKIP_QMLDIR_ENTRY TRUE +) +set_source_files_properties(CursorDelegate.qml PROPERTIES + QT_QML_SKIP_QMLDIR_ENTRY TRUE +) +set_source_files_properties(DelayButton.qml PROPERTIES + QT_QML_SKIP_QMLDIR_ENTRY TRUE +) +set_source_files_properties(Dial.qml PROPERTIES + QT_QML_SKIP_QMLDIR_ENTRY TRUE +) +set_source_files_properties(Dialog.qml PROPERTIES + QT_QML_SKIP_QMLDIR_ENTRY TRUE +) +set_source_files_properties(DialogButtonBox.qml PROPERTIES + QT_QML_SKIP_QMLDIR_ENTRY TRUE +) +set_source_files_properties(Drawer.qml PROPERTIES + QT_QML_SKIP_QMLDIR_ENTRY TRUE +) +set_source_files_properties(ElevationEffect.qml PROPERTIES + QT_QML_SKIP_QMLDIR_ENTRY TRUE +) +set_source_files_properties(Frame.qml PROPERTIES + QT_QML_SKIP_QMLDIR_ENTRY TRUE +) +set_source_files_properties(GroupBox.qml PROPERTIES + QT_QML_SKIP_QMLDIR_ENTRY TRUE +) +set_source_files_properties(HorizontalHeaderView.qml PROPERTIES + QT_QML_SKIP_QMLDIR_ENTRY TRUE +) +set_source_files_properties(ItemDelegate.qml PROPERTIES + QT_QML_SKIP_QMLDIR_ENTRY TRUE +) +set_source_files_properties(Label.qml PROPERTIES + QT_QML_SKIP_QMLDIR_ENTRY TRUE +) +set_source_files_properties(Menu.qml PROPERTIES + QT_QML_SKIP_QMLDIR_ENTRY TRUE +) +set_source_files_properties(MenuBar.qml PROPERTIES + QT_QML_SKIP_QMLDIR_ENTRY TRUE +) +set_source_files_properties(MenuBarItem.qml PROPERTIES + QT_QML_SKIP_QMLDIR_ENTRY TRUE +) +set_source_files_properties(MenuItem.qml PROPERTIES + QT_QML_SKIP_QMLDIR_ENTRY TRUE +) +set_source_files_properties(MenuSeparator.qml PROPERTIES + QT_QML_SKIP_QMLDIR_ENTRY TRUE +) +set_source_files_properties(Page.qml PROPERTIES + QT_QML_SKIP_QMLDIR_ENTRY TRUE +) +set_source_files_properties(PageIndicator.qml PROPERTIES + QT_QML_SKIP_QMLDIR_ENTRY TRUE +) +set_source_files_properties(Pane.qml PROPERTIES + QT_QML_SKIP_QMLDIR_ENTRY TRUE +) +set_source_files_properties(Popup.qml PROPERTIES + QT_QML_SKIP_QMLDIR_ENTRY TRUE +) +set_source_files_properties(ProgressBar.qml PROPERTIES + QT_QML_SKIP_QMLDIR_ENTRY TRUE +) +set_source_files_properties(RadioButton.qml PROPERTIES + QT_QML_SKIP_QMLDIR_ENTRY TRUE +) +set_source_files_properties(RadioDelegate.qml PROPERTIES + QT_QML_SKIP_QMLDIR_ENTRY TRUE +) +set_source_files_properties(RadioIndicator.qml PROPERTIES + QT_QML_SKIP_QMLDIR_ENTRY TRUE +) +set_source_files_properties(RangeSlider.qml PROPERTIES + QT_QML_SKIP_QMLDIR_ENTRY TRUE +) +set_source_files_properties(RoundButton.qml PROPERTIES + QT_QML_SKIP_QMLDIR_ENTRY TRUE +) +set_source_files_properties(RectangularGlow.qml PROPERTIES + QT_QML_SKIP_QMLDIR_ENTRY TRUE +) +set_source_files_properties(ScrollBar.qml PROPERTIES + QT_QML_SKIP_QMLDIR_ENTRY TRUE +) +set_source_files_properties(ScrollIndicator.qml PROPERTIES + QT_QML_SKIP_QMLDIR_ENTRY TRUE +) +set_source_files_properties(Slider.qml PROPERTIES + QT_QML_SKIP_QMLDIR_ENTRY TRUE +) +set_source_files_properties(SliderHandle.qml PROPERTIES + QT_QML_SKIP_QMLDIR_ENTRY TRUE +) +set_source_files_properties(SpinBox.qml PROPERTIES + QT_QML_SKIP_QMLDIR_ENTRY TRUE +) +set_source_files_properties(SplitView.qml PROPERTIES + QT_QML_SKIP_QMLDIR_ENTRY TRUE +) +set_source_files_properties(StackView.qml PROPERTIES + QT_QML_SKIP_QMLDIR_ENTRY TRUE +) +set_source_files_properties(SwipeDelegate.qml PROPERTIES + QT_QML_SKIP_QMLDIR_ENTRY TRUE +) +set_source_files_properties(SwipeView.qml PROPERTIES + QT_QML_SKIP_QMLDIR_ENTRY TRUE +) +set_source_files_properties(Switch.qml PROPERTIES + QT_QML_SKIP_QMLDIR_ENTRY TRUE +) +set_source_files_properties(SwitchDelegate.qml PROPERTIES + QT_QML_SKIP_QMLDIR_ENTRY TRUE +) +set_source_files_properties(SwitchIndicator.qml PROPERTIES + QT_QML_SKIP_QMLDIR_ENTRY TRUE +) +set_source_files_properties(TabBar.qml PROPERTIES + QT_QML_SKIP_QMLDIR_ENTRY TRUE +) +set_source_files_properties(TabButton.qml PROPERTIES + QT_QML_SKIP_QMLDIR_ENTRY TRUE +) +set_source_files_properties(TextArea.qml PROPERTIES + QT_QML_SKIP_QMLDIR_ENTRY TRUE +) +set_source_files_properties(TextField.qml PROPERTIES + QT_QML_SKIP_QMLDIR_ENTRY TRUE +) +set_source_files_properties(ToolBar.qml PROPERTIES + QT_QML_SKIP_QMLDIR_ENTRY TRUE +) +set_source_files_properties(ToolButton.qml PROPERTIES + QT_QML_SKIP_QMLDIR_ENTRY TRUE +) +set_source_files_properties(ToolSeparator.qml PROPERTIES + QT_QML_SKIP_QMLDIR_ENTRY TRUE +) +set_source_files_properties(ToolTip.qml PROPERTIES + QT_QML_SKIP_QMLDIR_ENTRY TRUE +) +set_source_files_properties(Tumbler.qml PROPERTIES + QT_QML_SKIP_QMLDIR_ENTRY TRUE +) +set_source_files_properties(VerticalHeaderView.qml PROPERTIES + QT_QML_SKIP_QMLDIR_ENTRY TRUE ) qt6_target_qml_files(qtquickcontrols2materialstyleplugin diff --git a/src/imports/controls/universal/CMakeLists.txt b/src/imports/controls/universal/CMakeLists.txt index 802e40f2..cf0464f3 100644 --- a/src/imports/controls/universal/CMakeLists.txt +++ b/src/imports/controls/universal/CMakeLists.txt @@ -86,6 +86,7 @@ set(qml_files "Drawer.qml" "Frame.qml" "GroupBox.qml" + "HorizontalHeaderView.qml" "ItemDelegate.qml" "Label.qml" "Menu.qml" @@ -122,6 +123,163 @@ set(qml_files "ToolSeparator.qml" "ToolTip.qml" "Tumbler.qml" + "VerticalHeaderView.qml" +) +set_source_files_properties(ApplicationWindow.qml PROPERTIES + QT_QML_SKIP_QMLDIR_ENTRY TRUE +) +set_source_files_properties(BusyIndicator.qml PROPERTIES + QT_QML_SKIP_QMLDIR_ENTRY TRUE +) +set_source_files_properties(Button.qml PROPERTIES + QT_QML_SKIP_QMLDIR_ENTRY TRUE +) +set_source_files_properties(CheckBox.qml PROPERTIES + QT_QML_SKIP_QMLDIR_ENTRY TRUE +) +set_source_files_properties(CheckDelegate.qml PROPERTIES + QT_QML_SKIP_QMLDIR_ENTRY TRUE +) +set_source_files_properties(CheckIndicator.qml PROPERTIES + QT_QML_SKIP_QMLDIR_ENTRY TRUE +) +set_source_files_properties(ComboBox.qml PROPERTIES + QT_QML_SKIP_QMLDIR_ENTRY TRUE +) +set_source_files_properties(DelayButton.qml PROPERTIES + QT_QML_SKIP_QMLDIR_ENTRY TRUE +) +set_source_files_properties(Dial.qml PROPERTIES + QT_QML_SKIP_QMLDIR_ENTRY TRUE +) +set_source_files_properties(Dialog.qml PROPERTIES + QT_QML_SKIP_QMLDIR_ENTRY TRUE +) +set_source_files_properties(DialogButtonBox.qml PROPERTIES + QT_QML_SKIP_QMLDIR_ENTRY TRUE +) +set_source_files_properties(Drawer.qml PROPERTIES + QT_QML_SKIP_QMLDIR_ENTRY TRUE +) +set_source_files_properties(Frame.qml PROPERTIES + QT_QML_SKIP_QMLDIR_ENTRY TRUE +) +set_source_files_properties(GroupBox.qml PROPERTIES + QT_QML_SKIP_QMLDIR_ENTRY TRUE +) +set_source_files_properties(HorizontalHeaderView.qml PROPERTIES + QT_QML_SKIP_QMLDIR_ENTRY TRUE +) +set_source_files_properties(ItemDelegate.qml PROPERTIES + QT_QML_SKIP_QMLDIR_ENTRY TRUE +) +set_source_files_properties(Label.qml PROPERTIES + QT_QML_SKIP_QMLDIR_ENTRY TRUE +) +set_source_files_properties(Menu.qml PROPERTIES + QT_QML_SKIP_QMLDIR_ENTRY TRUE +) +set_source_files_properties(MenuBar.qml PROPERTIES + QT_QML_SKIP_QMLDIR_ENTRY TRUE +) +set_source_files_properties(MenuBarItem.qml PROPERTIES + QT_QML_SKIP_QMLDIR_ENTRY TRUE +) +set_source_files_properties(MenuItem.qml PROPERTIES + QT_QML_SKIP_QMLDIR_ENTRY TRUE +) +set_source_files_properties(MenuSeparator.qml PROPERTIES + QT_QML_SKIP_QMLDIR_ENTRY TRUE +) +set_source_files_properties(Page.qml PROPERTIES + QT_QML_SKIP_QMLDIR_ENTRY TRUE +) +set_source_files_properties(PageIndicator.qml PROPERTIES + QT_QML_SKIP_QMLDIR_ENTRY TRUE +) +set_source_files_properties(Pane.qml PROPERTIES + QT_QML_SKIP_QMLDIR_ENTRY TRUE +) +set_source_files_properties(Popup.qml PROPERTIES + QT_QML_SKIP_QMLDIR_ENTRY TRUE +) +set_source_files_properties(ProgressBar.qml PROPERTIES + QT_QML_SKIP_QMLDIR_ENTRY TRUE +) +set_source_files_properties(RadioButton.qml PROPERTIES + QT_QML_SKIP_QMLDIR_ENTRY TRUE +) +set_source_files_properties(RadioDelegate.qml PROPERTIES + QT_QML_SKIP_QMLDIR_ENTRY TRUE +) +set_source_files_properties(RadioIndicator.qml PROPERTIES + QT_QML_SKIP_QMLDIR_ENTRY TRUE +) +set_source_files_properties(RangeSlider.qml PROPERTIES + QT_QML_SKIP_QMLDIR_ENTRY TRUE +) +set_source_files_properties(RoundButton.qml PROPERTIES + QT_QML_SKIP_QMLDIR_ENTRY TRUE +) +set_source_files_properties(ScrollBar.qml PROPERTIES + QT_QML_SKIP_QMLDIR_ENTRY TRUE +) +set_source_files_properties(ScrollIndicator.qml PROPERTIES + QT_QML_SKIP_QMLDIR_ENTRY TRUE +) +set_source_files_properties(Slider.qml PROPERTIES + QT_QML_SKIP_QMLDIR_ENTRY TRUE +) +set_source_files_properties(SpinBox.qml PROPERTIES + QT_QML_SKIP_QMLDIR_ENTRY TRUE +) +set_source_files_properties(SplitView.qml PROPERTIES + QT_QML_SKIP_QMLDIR_ENTRY TRUE +) +set_source_files_properties(StackView.qml PROPERTIES + QT_QML_SKIP_QMLDIR_ENTRY TRUE +) +set_source_files_properties(SwipeDelegate.qml PROPERTIES + QT_QML_SKIP_QMLDIR_ENTRY TRUE +) +set_source_files_properties(SwitchDelegate.qml PROPERTIES + QT_QML_SKIP_QMLDIR_ENTRY TRUE +) +set_source_files_properties(SwitchIndicator.qml PROPERTIES + QT_QML_SKIP_QMLDIR_ENTRY TRUE +) +set_source_files_properties(Switch.qml PROPERTIES + QT_QML_SKIP_QMLDIR_ENTRY TRUE +) +set_source_files_properties(TabBar.qml PROPERTIES + QT_QML_SKIP_QMLDIR_ENTRY TRUE +) +set_source_files_properties(TabButton.qml PROPERTIES + QT_QML_SKIP_QMLDIR_ENTRY TRUE +) +set_source_files_properties(TextArea.qml PROPERTIES + QT_QML_SKIP_QMLDIR_ENTRY TRUE +) +set_source_files_properties(TextField.qml PROPERTIES + QT_QML_SKIP_QMLDIR_ENTRY TRUE +) +set_source_files_properties(ToolBar.qml PROPERTIES + QT_QML_SKIP_QMLDIR_ENTRY TRUE +) +set_source_files_properties(ToolButton.qml PROPERTIES + QT_QML_SKIP_QMLDIR_ENTRY TRUE +) +set_source_files_properties(ToolSeparator.qml PROPERTIES + QT_QML_SKIP_QMLDIR_ENTRY TRUE +) +set_source_files_properties(ToolTip.qml PROPERTIES + QT_QML_SKIP_QMLDIR_ENTRY TRUE +) +set_source_files_properties(Tumbler.qml PROPERTIES + QT_QML_SKIP_QMLDIR_ENTRY TRUE +) +set_source_files_properties(VerticalHeaderView.qml PROPERTIES + QT_QML_SKIP_QMLDIR_ENTRY TRUE ) qt6_target_qml_files(qtquickcontrols2universalstyleplugin diff --git a/src/quicktemplates2/CMakeLists.txt b/src/quicktemplates2/CMakeLists.txt index 98e39274..df8c6071 100644 --- a/src/quicktemplates2/CMakeLists.txt +++ b/src/quicktemplates2/CMakeLists.txt @@ -37,6 +37,8 @@ qt_add_module(QuickTemplates2 qquickframe.cpp qquickframe_p.h qquickframe_p_p.h qquickgroupbox.cpp qquickgroupbox_p.h + qquickheaderview.cpp qquickheaderview_p.h + qquickheaderview_p_p.h qquickicon.cpp qquickicon_p.h qquickitemdelegate.cpp qquickitemdelegate_p.h qquickitemdelegate_p_p.h @@ -138,6 +140,8 @@ qt_extend_target(QuickTemplates2 CONDITION TARGET Qt::QmlModels Qt::QmlModelsPrivate PUBLIC_LIBRARIES Qt::QmlModels + PRIVATE_MODULE_INTERFACE + Qt::QmlModelsPrivate ) qt_extend_target(QuickTemplates2 CONDITION QT_FEATURE_quick_listview AND QT_FEATURE_quick_pathview diff --git a/src/quicktemplates2/qquickpalette.cpp b/src/quicktemplates2/qquickpalette.cpp index 018d6fdc..ecf45cd2 100644 --- a/src/quicktemplates2/qquickpalette.cpp +++ b/src/quicktemplates2/qquickpalette.cpp @@ -324,3 +324,5 @@ void QQuickPalette::resetWindowText() } QT_END_NAMESPACE + +#include "moc_qquickpalette_p.cpp" diff --git a/tests/.prev_CMakeLists.txt b/tests/.prev_CMakeLists.txt index a639d2f1..22141371 100644 --- a/tests/.prev_CMakeLists.txt +++ b/tests/.prev_CMakeLists.txt @@ -1,11 +1,7 @@ # Generated from tests.pro. -if(NOT TARGET Qt::Test) - cmake_minimum_required(VERSION 3.15.0) - project(QtQuickControls2Tests VERSION 6.0.0 LANGUAGES C CXX) - find_package(Qt6 ${PROJECT_VERSION} REQUIRED COMPONENTS BuildInternals Core SET_ME_TO_SOMETHING_USEFUL) - find_package(Qt6 ${PROJECT_VERSION} OPTIONAL_COMPONENTS SET_ME_TO_SOMETHING_USEFUL) - qt_set_up_standalone_tests_build() +if(QT_BUILD_STANDALONE_TESTS) + # Add qt_find_package calls for extra dependencies that need to be found when building + # the standalone tests here. endif() qt_build_tests() - diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index d21be56a..22141371 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -1,13 +1,7 @@ # Generated from tests.pro. -if(NOT TARGET Qt::Test) - cmake_minimum_required(VERSION 3.15.0) - project(QtQuickControls2Tests VERSION 6.0.0 LANGUAGES C CXX) - find_package(Qt6 ${PROJECT_VERSION} REQUIRED COMPONENTS - BuildInternals Core Qml Quick QmlDevTools QmlDebug QuickTest # special case - QuickControls2 QuickTemplates2 # special case - ) - qt_set_up_standalone_tests_build() +if(QT_BUILD_STANDALONE_TESTS) + # Add qt_find_package calls for extra dependencies that need to be found when building + # the standalone tests here. endif() qt_build_tests() - diff --git a/tests/auto/CMakeLists.txt b/tests/auto/CMakeLists.txt index af891b6f..8976a7dd 100644 --- a/tests/auto/CMakeLists.txt +++ b/tests/auto/CMakeLists.txt @@ -14,6 +14,7 @@ add_subdirectory(pressandhold) add_subdirectory(qquickapplicationwindow) add_subdirectory(qquickcolor) add_subdirectory(qquickdrawer) +add_subdirectory(qquickheaderview) add_subdirectory(qquickiconimage) add_subdirectory(qquickiconlabel) add_subdirectory(qquickimaginestyle) @@ -30,3 +31,4 @@ add_subdirectory(qquickuniversalstyleconf) add_subdirectory(revisions) add_subdirectory(sanity) add_subdirectory(snippets) +add_subdirectory(translation) diff --git a/tests/auto/accessibility/CMakeLists.txt b/tests/auto/accessibility/CMakeLists.txt index 5d239ddc..a1f67d17 100644 --- a/tests/auto/accessibility/CMakeLists.txt +++ b/tests/auto/accessibility/CMakeLists.txt @@ -18,19 +18,15 @@ qt_add_test(tst_accessibility tst_accessibility.cpp DEFINES QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../src/imports\\\" - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate + Qt::Gui Qt::GuiPrivate Qt::QmlPrivate + Qt::QuickControls2 Qt::QuickPrivate Qt::QuickTemplates2Private Qt::TestPrivate - PUBLIC_LIBRARIES - Qt::Gui - Qt::Qml - Qt::Quick - Qt::QuickControls2 - Qt::QuickTemplates2 TESTDATA ${test_data} ) @@ -40,12 +36,12 @@ qt_add_test(tst_accessibility ## Scopes: ##################################################################### -qt_extend_target(tst_accessibility CONDITION ANDROID OR APPLE_IOS +qt_extend_target(tst_accessibility CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_accessibility CONDITION NOT ANDROID AND NOT APPLE_IOS +qt_extend_target(tst_accessibility CONDITION NOT ANDROID AND NOT IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/cursor/CMakeLists.txt b/tests/auto/cursor/CMakeLists.txt index 9d58b48e..8034a11a 100644 --- a/tests/auto/cursor/CMakeLists.txt +++ b/tests/auto/cursor/CMakeLists.txt @@ -18,19 +18,15 @@ qt_add_test(tst_cursor tst_cursor.cpp DEFINES QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../src/imports\\\" - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate + Qt::Gui Qt::GuiPrivate Qt::QmlPrivate + Qt::QuickControls2 Qt::QuickPrivate Qt::QuickTemplates2Private Qt::TestPrivate - PUBLIC_LIBRARIES - Qt::Gui - Qt::Qml - Qt::Quick - Qt::QuickControls2 - Qt::QuickTemplates2 TESTDATA ${test_data} ) @@ -40,12 +36,12 @@ qt_add_test(tst_cursor ## Scopes: ##################################################################### -qt_extend_target(tst_cursor CONDITION ANDROID OR APPLE_IOS +qt_extend_target(tst_cursor CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_cursor CONDITION NOT ANDROID AND NOT APPLE_IOS +qt_extend_target(tst_cursor CONDITION NOT ANDROID AND NOT IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/customization/CMakeLists.txt b/tests/auto/customization/CMakeLists.txt index 2e25d8a4..40e916a8 100644 --- a/tests/auto/customization/CMakeLists.txt +++ b/tests/auto/customization/CMakeLists.txt @@ -18,31 +18,27 @@ qt_add_test(tst_customization tst_customization.cpp DEFINES QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../src/imports\\\" - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate + Qt::Gui Qt::GuiPrivate Qt::QmlPrivate + Qt::QuickControls2 Qt::QuickPrivate Qt::QuickTemplates2Private Qt::TestPrivate - PUBLIC_LIBRARIES - Qt::Gui - Qt::Qml - Qt::Quick - Qt::QuickControls2 - Qt::QuickTemplates2 TESTDATA ${test_data} ) ## Scopes: ##################################################################### -qt_extend_target(tst_customization CONDITION ANDROID OR APPLE_IOS +qt_extend_target(tst_customization CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_customization CONDITION NOT ANDROID AND NOT APPLE_IOS +qt_extend_target(tst_customization CONDITION NOT ANDROID AND NOT IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/designer/CMakeLists.txt b/tests/auto/designer/CMakeLists.txt index 5731e570..59e7c5a0 100644 --- a/tests/auto/designer/CMakeLists.txt +++ b/tests/auto/designer/CMakeLists.txt @@ -7,12 +7,11 @@ qt_add_test(tst_designer SOURCES tst_designer.cpp - LIBRARIES - Qt::QuickPrivate PUBLIC_LIBRARIES Qt::Gui Qt::Quick Qt::QuickControls2 + Qt::QuickPrivate ) #### Keys ignored in scope 1:.:.:designer.pro:: diff --git a/tests/auto/focus/CMakeLists.txt b/tests/auto/focus/CMakeLists.txt index be2a3016..1cc44de4 100644 --- a/tests/auto/focus/CMakeLists.txt +++ b/tests/auto/focus/CMakeLists.txt @@ -18,31 +18,27 @@ qt_add_test(tst_focus tst_focus.cpp DEFINES QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../src/imports\\\" - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate + Qt::Gui Qt::GuiPrivate Qt::QmlPrivate + Qt::QuickControls2 Qt::QuickPrivate Qt::QuickTemplates2Private Qt::TestPrivate - PUBLIC_LIBRARIES - Qt::Gui - Qt::Qml - Qt::Quick - Qt::QuickControls2 - Qt::QuickTemplates2 TESTDATA ${test_data} ) ## Scopes: ##################################################################### -qt_extend_target(tst_focus CONDITION ANDROID OR APPLE_IOS +qt_extend_target(tst_focus CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_focus CONDITION NOT ANDROID AND NOT APPLE_IOS +qt_extend_target(tst_focus CONDITION NOT ANDROID AND NOT IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/font/CMakeLists.txt b/tests/auto/font/CMakeLists.txt index daeb391f..8529adb8 100644 --- a/tests/auto/font/CMakeLists.txt +++ b/tests/auto/font/CMakeLists.txt @@ -18,20 +18,16 @@ qt_add_test(tst_font tst_font.cpp DEFINES QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../src/imports\\\" - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate + Qt::Gui Qt::GuiPrivate Qt::QmlPrivate + Qt::QuickControls2 Qt::QuickControls2Private Qt::QuickPrivate Qt::QuickTemplates2Private Qt::TestPrivate - PUBLIC_LIBRARIES - Qt::Gui - Qt::Qml - Qt::Quick - Qt::QuickControls2 - Qt::QuickTemplates2 TESTDATA ${test_data} ) @@ -41,12 +37,12 @@ qt_add_test(tst_font ## Scopes: ##################################################################### -qt_extend_target(tst_font CONDITION ANDROID OR APPLE_IOS +qt_extend_target(tst_font CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_font CONDITION NOT ANDROID AND NOT APPLE_IOS +qt_extend_target(tst_font CONDITION NOT ANDROID AND NOT IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/palette/CMakeLists.txt b/tests/auto/palette/CMakeLists.txt index 6675af36..33f8b86b 100644 --- a/tests/auto/palette/CMakeLists.txt +++ b/tests/auto/palette/CMakeLists.txt @@ -18,20 +18,16 @@ qt_add_test(tst_palette tst_palette.cpp DEFINES QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../src/imports\\\" - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate + Qt::Gui Qt::GuiPrivate Qt::QmlPrivate + Qt::QuickControls2 Qt::QuickControls2Private Qt::QuickPrivate Qt::QuickTemplates2Private Qt::TestPrivate - PUBLIC_LIBRARIES - Qt::Gui - Qt::Qml - Qt::Quick - Qt::QuickControls2 - Qt::QuickTemplates2 TESTDATA ${test_data} ) @@ -54,12 +50,12 @@ qt_add_resource(tst_palette "qmake_immediate" ## Scopes: ##################################################################### -qt_extend_target(tst_palette CONDITION ANDROID OR APPLE_IOS +qt_extend_target(tst_palette CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_palette CONDITION NOT ANDROID AND NOT APPLE_IOS +qt_extend_target(tst_palette CONDITION NOT ANDROID AND NOT IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/qquickapplicationwindow/CMakeLists.txt b/tests/auto/qquickapplicationwindow/CMakeLists.txt index 26aa0331..6fa2e692 100644 --- a/tests/auto/qquickapplicationwindow/CMakeLists.txt +++ b/tests/auto/qquickapplicationwindow/CMakeLists.txt @@ -18,20 +18,16 @@ qt_add_test(tst_qquickapplicationwindow tst_qquickapplicationwindow.cpp DEFINES QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../src/imports\\\" - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate + Qt::Gui Qt::GuiPrivate Qt::QmlPrivate + Qt::QuickControls2 Qt::QuickControls2Private Qt::QuickPrivate Qt::QuickTemplates2Private Qt::TestPrivate - PUBLIC_LIBRARIES - Qt::Gui - Qt::Qml - Qt::Quick - Qt::QuickControls2 - Qt::QuickTemplates2 TESTDATA ${test_data} ) @@ -41,12 +37,12 @@ qt_add_test(tst_qquickapplicationwindow ## Scopes: ##################################################################### -qt_extend_target(tst_qquickapplicationwindow CONDITION ANDROID OR APPLE_IOS +qt_extend_target(tst_qquickapplicationwindow CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_qquickapplicationwindow CONDITION NOT ANDROID AND NOT APPLE_IOS +qt_extend_target(tst_qquickapplicationwindow CONDITION NOT ANDROID AND NOT IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/qquickdrawer/CMakeLists.txt b/tests/auto/qquickdrawer/CMakeLists.txt index db35045a..3679471a 100644 --- a/tests/auto/qquickdrawer/CMakeLists.txt +++ b/tests/auto/qquickdrawer/CMakeLists.txt @@ -18,19 +18,15 @@ qt_add_test(tst_qquickdrawer tst_qquickdrawer.cpp DEFINES QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../src/imports\\\" - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate + Qt::Gui Qt::GuiPrivate Qt::QmlPrivate + Qt::QuickControls2 Qt::QuickPrivate Qt::QuickTemplates2Private Qt::TestPrivate - PUBLIC_LIBRARIES - Qt::Gui - Qt::Qml - Qt::Quick - Qt::QuickControls2 - Qt::QuickTemplates2 TESTDATA ${test_data} ) @@ -40,12 +36,12 @@ qt_add_test(tst_qquickdrawer ## Scopes: ##################################################################### -qt_extend_target(tst_qquickdrawer CONDITION ANDROID OR APPLE_IOS +qt_extend_target(tst_qquickdrawer CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_qquickdrawer CONDITION NOT ANDROID AND NOT APPLE_IOS +qt_extend_target(tst_qquickdrawer CONDITION NOT ANDROID AND NOT IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/qquickheaderview/CMakeLists.txt b/tests/auto/qquickheaderview/CMakeLists.txt new file mode 100644 index 00000000..fe604d5c --- /dev/null +++ b/tests/auto/qquickheaderview/CMakeLists.txt @@ -0,0 +1,49 @@ +# Generated from qquickheaderview.pro. + +##################################################################### +## tst_qquickheaderview Test: +##################################################################### + +# Collect test data +file(GLOB_RECURSE test_data_glob + RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} + data/*) +list(APPEND test_data ${test_data_glob}) + +qt_add_test(tst_qquickheaderview + SOURCES + ../shared/qtest_quickcontrols.h + ../shared/util.cpp ../shared/util.h + ../shared/visualtestutil.cpp ../shared/visualtestutil.h + tst_qquickheaderview.cpp + DEFINES + QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../src/imports\\\" + PUBLIC_LIBRARIES + Qt::CorePrivate + Qt::Gui + Qt::GuiPrivate + Qt::QmlPrivate + Qt::QuickControls2 + Qt::QuickControls2Private + Qt::QuickPrivate + Qt::QuickTemplates2 + Qt::QuickTemplates2Private + Qt::TestPrivate + TESTDATA ${test_data} +) + +#### Keys ignored in scope 1:.:.:qquickheaderview.pro:: +# OTHER_FILES = "data/*.qml" + +## Scopes: +##################################################################### + +qt_extend_target(tst_qquickheaderview CONDITION ANDROID OR IOS + DEFINES + QT_QMLTEST_DATADIR=\\\":/data\\\" +) + +qt_extend_target(tst_qquickheaderview CONDITION NOT ANDROID AND NOT IOS + DEFINES + QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" +) diff --git a/tests/auto/qquickiconimage/CMakeLists.txt b/tests/auto/qquickiconimage/CMakeLists.txt index c2628782..9f6d0494 100644 --- a/tests/auto/qquickiconimage/CMakeLists.txt +++ b/tests/auto/qquickiconimage/CMakeLists.txt @@ -23,19 +23,19 @@ qt_add_test(tst_qquickiconimage DEFINES QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../src/imports\\\" LIBRARIES - Qt::CorePrivate - Qt::GuiPrivate - Qt::QmlPrivate Qt::QuickControls2Private Qt::QuickPrivate - Qt::QuickTemplates2Private - Qt::TestPrivate PUBLIC_LIBRARIES + Qt::CorePrivate Qt::Gui + Qt::GuiPrivate Qt::Qml + Qt::QmlPrivate Qt::Quick Qt::QuickControls2 - Qt::QuickTemplates2 + Qt::QuickPrivate + Qt::QuickTemplates2Private + Qt::TestPrivate TESTDATA ${test_data} ) @@ -72,12 +72,12 @@ qt_extend_target(tst_qquickiconimage CONDITION TARGET Qt::Svg Qt::Svg ) -qt_extend_target(tst_qquickiconimage CONDITION ANDROID OR APPLE_IOS +qt_extend_target(tst_qquickiconimage CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_qquickiconimage CONDITION NOT ANDROID AND NOT APPLE_IOS +qt_extend_target(tst_qquickiconimage CONDITION NOT ANDROID AND NOT IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/qquickiconlabel/CMakeLists.txt b/tests/auto/qquickiconlabel/CMakeLists.txt index fc3de622..bdbefd9d 100644 --- a/tests/auto/qquickiconlabel/CMakeLists.txt +++ b/tests/auto/qquickiconlabel/CMakeLists.txt @@ -19,31 +19,31 @@ qt_add_test(tst_qquickiconlabel DEFINES QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../src/imports\\\" LIBRARIES - Qt::CorePrivate - Qt::GuiPrivate - Qt::QmlPrivate Qt::QuickControls2Private Qt::QuickPrivate - Qt::QuickTemplates2Private - Qt::TestPrivate PUBLIC_LIBRARIES + Qt::CorePrivate Qt::Gui + Qt::GuiPrivate Qt::Qml + Qt::QmlPrivate Qt::Quick Qt::QuickControls2 - Qt::QuickTemplates2 + Qt::QuickPrivate + Qt::QuickTemplates2Private + Qt::TestPrivate TESTDATA ${test_data} ) ## Scopes: ##################################################################### -qt_extend_target(tst_qquickiconlabel CONDITION ANDROID OR APPLE_IOS +qt_extend_target(tst_qquickiconlabel CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_qquickiconlabel CONDITION NOT ANDROID AND NOT APPLE_IOS +qt_extend_target(tst_qquickiconlabel CONDITION NOT ANDROID AND NOT IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/qquickimaginestyle/CMakeLists.txt b/tests/auto/qquickimaginestyle/CMakeLists.txt index 5ab0176c..7a3ffe08 100644 --- a/tests/auto/qquickimaginestyle/CMakeLists.txt +++ b/tests/auto/qquickimaginestyle/CMakeLists.txt @@ -24,6 +24,8 @@ qt_add_test(tst_qquickimaginestyle set(qmake_immediate_resource_files "control-assets/button-background.9.png" "qtquickcontrols2.conf" + "test-assets/button-background-1.png" + "test-assets/button-background-2.png" ) qt_add_resource(tst_qquickimaginestyle "qmake_immediate" diff --git a/tests/auto/qquickmaterialstyleconf/CMakeLists.txt b/tests/auto/qquickmaterialstyleconf/CMakeLists.txt index 054b0cc3..fa0dde32 100644 --- a/tests/auto/qquickmaterialstyleconf/CMakeLists.txt +++ b/tests/auto/qquickmaterialstyleconf/CMakeLists.txt @@ -18,20 +18,16 @@ qt_add_test(tst_qquickmaterialstyleconf tst_qquickmaterialstyleconf.cpp DEFINES QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../src/imports\\\" - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate + Qt::Gui Qt::GuiPrivate Qt::QmlPrivate + Qt::QuickControls2 Qt::QuickControls2Private Qt::QuickPrivate Qt::QuickTemplates2Private Qt::TestPrivate - PUBLIC_LIBRARIES - Qt::Gui - Qt::Qml - Qt::Quick - Qt::QuickControls2 - Qt::QuickTemplates2 TESTDATA ${test_data} ) @@ -56,12 +52,12 @@ qt_add_resource(tst_qquickmaterialstyleconf "qquickmaterialstyleconf" ## Scopes: ##################################################################### -qt_extend_target(tst_qquickmaterialstyleconf CONDITION ANDROID OR APPLE_IOS +qt_extend_target(tst_qquickmaterialstyleconf CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_qquickmaterialstyleconf CONDITION NOT ANDROID AND NOT APPLE_IOS +qt_extend_target(tst_qquickmaterialstyleconf CONDITION NOT ANDROID AND NOT IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/qquickmenu/CMakeLists.txt b/tests/auto/qquickmenu/CMakeLists.txt index 4152869c..478aaa82 100644 --- a/tests/auto/qquickmenu/CMakeLists.txt +++ b/tests/auto/qquickmenu/CMakeLists.txt @@ -18,19 +18,15 @@ qt_add_test(tst_qquickmenu tst_qquickmenu.cpp DEFINES QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../src/imports\\\" - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate + Qt::Gui Qt::GuiPrivate Qt::QmlPrivate + Qt::QuickControls2 Qt::QuickPrivate Qt::QuickTemplates2Private Qt::TestPrivate - PUBLIC_LIBRARIES - Qt::Gui - Qt::Qml - Qt::Quick - Qt::QuickControls2 - Qt::QuickTemplates2 TESTDATA ${test_data} ) @@ -40,12 +36,12 @@ qt_add_test(tst_qquickmenu ## Scopes: ##################################################################### -qt_extend_target(tst_qquickmenu CONDITION ANDROID OR APPLE_IOS +qt_extend_target(tst_qquickmenu CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_qquickmenu CONDITION NOT ANDROID AND NOT APPLE_IOS +qt_extend_target(tst_qquickmenu CONDITION NOT ANDROID AND NOT IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/qquickmenubar/CMakeLists.txt b/tests/auto/qquickmenubar/CMakeLists.txt index c066ef01..0803b4ec 100644 --- a/tests/auto/qquickmenubar/CMakeLists.txt +++ b/tests/auto/qquickmenubar/CMakeLists.txt @@ -18,19 +18,15 @@ qt_add_test(tst_qquickmenubar tst_qquickmenubar.cpp DEFINES QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../src/imports\\\" - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate + Qt::Gui Qt::GuiPrivate Qt::QmlPrivate + Qt::QuickControls2 Qt::QuickPrivate Qt::QuickTemplates2Private Qt::TestPrivate - PUBLIC_LIBRARIES - Qt::Gui - Qt::Qml - Qt::Quick - Qt::QuickControls2 - Qt::QuickTemplates2 TESTDATA ${test_data} ) @@ -40,12 +36,12 @@ qt_add_test(tst_qquickmenubar ## Scopes: ##################################################################### -qt_extend_target(tst_qquickmenubar CONDITION ANDROID OR APPLE_IOS +qt_extend_target(tst_qquickmenubar CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_qquickmenubar CONDITION NOT ANDROID AND NOT APPLE_IOS +qt_extend_target(tst_qquickmenubar CONDITION NOT ANDROID AND NOT IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/qquickninepatchimage/CMakeLists.txt b/tests/auto/qquickninepatchimage/CMakeLists.txt index dc8e0a5b..23c2adb2 100644 --- a/tests/auto/qquickninepatchimage/CMakeLists.txt +++ b/tests/auto/qquickninepatchimage/CMakeLists.txt @@ -23,31 +23,32 @@ qt_add_test(tst_qquickninepatchimage DEFINES QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../src/imports\\\" LIBRARIES - Qt::CorePrivate Qt::GuiPrivate - Qt::QmlPrivate Qt::QuickControls2Private Qt::QuickPrivate - Qt::QuickTemplates2Private - Qt::TestPrivate PUBLIC_LIBRARIES + Qt::CorePrivate Qt::Gui + Qt::GuiPrivate Qt::Qml + Qt::QmlPrivate Qt::Quick Qt::QuickControls2 - Qt::QuickTemplates2 + Qt::QuickPrivate + Qt::QuickTemplates2Private + Qt::TestPrivate TESTDATA ${test_data} ) ## Scopes: ##################################################################### -qt_extend_target(tst_qquickninepatchimage CONDITION ANDROID OR APPLE_IOS +qt_extend_target(tst_qquickninepatchimage CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_qquickninepatchimage CONDITION NOT ANDROID AND NOT APPLE_IOS +qt_extend_target(tst_qquickninepatchimage CONDITION NOT ANDROID AND NOT IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/qquickpopup/CMakeLists.txt b/tests/auto/qquickpopup/CMakeLists.txt index 7df9ac8a..beb744a7 100644 --- a/tests/auto/qquickpopup/CMakeLists.txt +++ b/tests/auto/qquickpopup/CMakeLists.txt @@ -18,19 +18,15 @@ qt_add_test(tst_qquickpopup tst_qquickpopup.cpp DEFINES QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../src/imports\\\" - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate + Qt::Gui Qt::GuiPrivate Qt::QmlPrivate + Qt::QuickControls2 Qt::QuickPrivate Qt::QuickTemplates2Private Qt::TestPrivate - PUBLIC_LIBRARIES - Qt::Gui - Qt::Qml - Qt::Quick - Qt::QuickControls2 - Qt::QuickTemplates2 TESTDATA ${test_data} ) @@ -40,12 +36,12 @@ qt_add_test(tst_qquickpopup ## Scopes: ##################################################################### -qt_extend_target(tst_qquickpopup CONDITION ANDROID OR APPLE_IOS +qt_extend_target(tst_qquickpopup CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_qquickpopup CONDITION NOT ANDROID AND NOT APPLE_IOS +qt_extend_target(tst_qquickpopup CONDITION NOT ANDROID AND NOT IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/qquickstyle/CMakeLists.txt b/tests/auto/qquickstyle/CMakeLists.txt index ea824969..94aa7249 100644 --- a/tests/auto/qquickstyle/CMakeLists.txt +++ b/tests/auto/qquickstyle/CMakeLists.txt @@ -21,17 +21,16 @@ qt_add_test(tst_qquickstyle LIBRARIES Qt::CorePrivate Qt::GuiPrivate - Qt::QmlPrivate Qt::QuickControls2Private - Qt::QuickPrivate - Qt::QuickTemplates2Private - Qt::TestPrivate PUBLIC_LIBRARIES + Qt::CorePrivate Qt::Gui - Qt::Qml - Qt::Quick + Qt::GuiPrivate + Qt::QmlPrivate Qt::QuickControls2 - Qt::QuickTemplates2 + Qt::QuickPrivate + Qt::QuickTemplates2Private + Qt::TestPrivate TESTDATA ${test_data} ) @@ -101,12 +100,12 @@ qt_add_resource(tst_qquickstyle "qmake_qrcStyles4" ## Scopes: ##################################################################### -qt_extend_target(tst_qquickstyle CONDITION ANDROID OR APPLE_IOS +qt_extend_target(tst_qquickstyle CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_qquickstyle CONDITION NOT ANDROID AND NOT APPLE_IOS +qt_extend_target(tst_qquickstyle CONDITION NOT ANDROID AND NOT IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/qquickstyleselector/CMakeLists.txt b/tests/auto/qquickstyleselector/CMakeLists.txt index b9d8d671..3a489ccf 100644 --- a/tests/auto/qquickstyleselector/CMakeLists.txt +++ b/tests/auto/qquickstyleselector/CMakeLists.txt @@ -18,20 +18,16 @@ qt_add_test(tst_qquickstyleselector tst_qquickstyleselector.cpp DEFINES QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../src/imports\\\" - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate + Qt::Gui Qt::GuiPrivate Qt::QmlPrivate + Qt::QuickControls2 Qt::QuickControls2Private Qt::QuickPrivate Qt::QuickTemplates2Private Qt::TestPrivate - PUBLIC_LIBRARIES - Qt::Gui - Qt::Qml - Qt::Quick - Qt::QuickControls2 - Qt::QuickTemplates2 TESTDATA ${test_data} ) @@ -54,12 +50,12 @@ qt_add_resource(tst_qquickstyleselector "qmake_resourcestyle" ## Scopes: ##################################################################### -qt_extend_target(tst_qquickstyleselector CONDITION ANDROID OR APPLE_IOS +qt_extend_target(tst_qquickstyleselector CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_qquickstyleselector CONDITION NOT ANDROID AND NOT APPLE_IOS +qt_extend_target(tst_qquickstyleselector CONDITION NOT ANDROID AND NOT IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/qquickuniversalstyleconf/CMakeLists.txt b/tests/auto/qquickuniversalstyleconf/CMakeLists.txt index 361e690f..1125e75b 100644 --- a/tests/auto/qquickuniversalstyleconf/CMakeLists.txt +++ b/tests/auto/qquickuniversalstyleconf/CMakeLists.txt @@ -18,20 +18,16 @@ qt_add_test(tst_qquickuniversalstyleconf tst_qquickuniversalstyleconf.cpp DEFINES QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../src/imports\\\" - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate + Qt::Gui Qt::GuiPrivate Qt::QmlPrivate + Qt::QuickControls2 Qt::QuickControls2Private Qt::QuickPrivate Qt::QuickTemplates2Private Qt::TestPrivate - PUBLIC_LIBRARIES - Qt::Gui - Qt::Qml - Qt::Quick - Qt::QuickControls2 - Qt::QuickTemplates2 TESTDATA ${test_data} ) @@ -54,12 +50,12 @@ qt_add_resource(tst_qquickuniversalstyleconf "qquickuniversalstyleconf" ## Scopes: ##################################################################### -qt_extend_target(tst_qquickuniversalstyleconf CONDITION ANDROID OR APPLE_IOS +qt_extend_target(tst_qquickuniversalstyleconf CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_qquickuniversalstyleconf CONDITION NOT ANDROID AND NOT APPLE_IOS +qt_extend_target(tst_qquickuniversalstyleconf CONDITION NOT ANDROID AND NOT IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/sanity/CMakeLists.txt b/tests/auto/sanity/CMakeLists.txt index f4f6fcdc..f7539771 100644 --- a/tests/auto/sanity/CMakeLists.txt +++ b/tests/auto/sanity/CMakeLists.txt @@ -12,19 +12,16 @@ qt_add_test(tst_sanity tst_sanity.cpp DEFINES QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../src/imports\\\" - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate + Qt::Gui Qt::GuiPrivate + Qt::Qml Qt::QmlPrivate + Qt::QuickControls2 Qt::QuickPrivate Qt::QuickTemplates2Private Qt::TestPrivate - PUBLIC_LIBRARIES - Qt::Gui - Qt::Qml - Qt::Quick - Qt::QuickControls2 - Qt::QuickTemplates2 ) #### Keys ignored in scope 1:.:.:sanity.pro:: @@ -34,12 +31,12 @@ qt_add_test(tst_sanity ## Scopes: ##################################################################### -qt_extend_target(tst_sanity CONDITION ANDROID OR APPLE_IOS +qt_extend_target(tst_sanity CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_sanity CONDITION NOT ANDROID AND NOT APPLE_IOS +qt_extend_target(tst_sanity CONDITION NOT ANDROID AND NOT IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/auto/translation/CMakeLists.txt b/tests/auto/translation/CMakeLists.txt new file mode 100644 index 00000000..50e10171 --- /dev/null +++ b/tests/auto/translation/CMakeLists.txt @@ -0,0 +1,61 @@ +# Generated from translation.pro. + +##################################################################### +## tst_translation Test: +##################################################################### + +# Collect test data +file(GLOB_RECURSE test_data_glob + RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} + data/*) +list(APPEND test_data ${test_data_glob}) + +qt_add_test(tst_translation + SOURCES + ../shared/qtest_quickcontrols.h + ../shared/util.cpp ../shared/util.h + ../shared/visualtestutil.cpp ../shared/visualtestutil.h + tst_translation.cpp + DEFINES + QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../src/imports\\\" + PUBLIC_LIBRARIES + Qt::CorePrivate + Qt::Gui + Qt::GuiPrivate + Qt::QmlPrivate + Qt::QuickControls2 + Qt::QuickPrivate + Qt::QuickTemplates2Private + Qt::TestPrivate + TESTDATA ${test_data} +) + +# Resources: +set(qmake_immediate_resource_files + "qml_jp.qm" + "qtbase_fr.qm" +) + +qt_add_resource(tst_translation "qmake_immediate" + PREFIX + "/" + FILES + ${qmake_immediate_resource_files} +) + + +#### Keys ignored in scope 1:.:.:translation.pro:: +# OTHER_FILES = "data/*.qml" + +## Scopes: +##################################################################### + +qt_extend_target(tst_translation CONDITION ANDROID OR IOS + DEFINES + QT_QMLTEST_DATADIR=\\\":/data\\\" +) + +qt_extend_target(tst_translation CONDITION NOT ANDROID AND NOT IOS + DEFINES + QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" +) diff --git a/tests/benchmarks/creationtime/CMakeLists.txt b/tests/benchmarks/creationtime/CMakeLists.txt index 312c3970..1162bace 100644 --- a/tests/benchmarks/creationtime/CMakeLists.txt +++ b/tests/benchmarks/creationtime/CMakeLists.txt @@ -12,19 +12,16 @@ qt_add_test(tst_creationtime tst_creationtime.cpp DEFINES QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../src/imports\\\" - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate + Qt::Gui Qt::GuiPrivate + Qt::Qml Qt::QmlPrivate + Qt::QuickControls2 Qt::QuickPrivate Qt::QuickTemplates2Private Qt::TestPrivate - PUBLIC_LIBRARIES - Qt::Gui - Qt::Qml - Qt::Quick - Qt::QuickControls2 - Qt::QuickTemplates2 ) #### Keys ignored in scope 1:.:.:creationtime.pro:: @@ -33,12 +30,12 @@ qt_add_test(tst_creationtime ## Scopes: ##################################################################### -qt_extend_target(tst_creationtime CONDITION ANDROID OR APPLE_IOS +qt_extend_target(tst_creationtime CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_creationtime CONDITION NOT ANDROID AND NOT APPLE_IOS +qt_extend_target(tst_creationtime CONDITION NOT ANDROID AND NOT IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) diff --git a/tests/benchmarks/objectcount/CMakeLists.txt b/tests/benchmarks/objectcount/CMakeLists.txt index 1f284128..21ea537d 100644 --- a/tests/benchmarks/objectcount/CMakeLists.txt +++ b/tests/benchmarks/objectcount/CMakeLists.txt @@ -12,19 +12,16 @@ qt_add_test(tst_objectcount tst_objectcount.cpp DEFINES QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../src/imports\\\" - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate + Qt::Gui Qt::GuiPrivate Qt::QmlPrivate + Qt::Quick + Qt::QuickControls2 Qt::QuickPrivate Qt::QuickTemplates2Private Qt::TestPrivate - PUBLIC_LIBRARIES - Qt::Gui - Qt::Qml - Qt::Quick - Qt::QuickControls2 - Qt::QuickTemplates2 ) #### Keys ignored in scope 1:.:.:objectcount.pro:: @@ -33,12 +30,12 @@ qt_add_test(tst_objectcount ## Scopes: ##################################################################### -qt_extend_target(tst_objectcount CONDITION ANDROID OR APPLE_IOS +qt_extend_target(tst_objectcount CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_extend_target(tst_objectcount CONDITION NOT ANDROID AND NOT APPLE_IOS +qt_extend_target(tst_objectcount CONDITION NOT ANDROID AND NOT IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) -- cgit v1.2.3