diff options
Diffstat (limited to 'tests/auto/qquickiconimage')
18 files changed, 48 insertions, 47 deletions
diff --git a/tests/auto/qquickiconimage/CMakeLists.txt b/tests/auto/qquickiconimage/CMakeLists.txt index 9f6d0494..2ee0d295 100644 --- a/tests/auto/qquickiconimage/CMakeLists.txt +++ b/tests/auto/qquickiconimage/CMakeLists.txt @@ -23,7 +23,7 @@ qt_add_test(tst_qquickiconimage DEFINES QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../src/imports\\\" LIBRARIES - Qt::QuickControls2Private + Qt::QuickControls2ImplPrivate Qt::QuickPrivate PUBLIC_LIBRARIES Qt::CorePrivate @@ -33,6 +33,7 @@ qt_add_test(tst_qquickiconimage Qt::QmlPrivate Qt::Quick Qt::QuickControls2 + Qt::QuickControls2Private Qt::QuickPrivate Qt::QuickTemplates2Private Qt::TestPrivate diff --git a/tests/auto/qquickiconimage/data/alignment.qml b/tests/auto/qquickiconimage/data/alignment.qml index 4e5ac6e7..e6861520 100644 --- a/tests/auto/qquickiconimage/data/alignment.qml +++ b/tests/auto/qquickiconimage/data/alignment.qml @@ -1,6 +1,6 @@ -import QtQuick 2.12 -import QtQuick.Controls 2.12 -import QtQuick.Controls.impl 2.12 +import QtQuick +import QtQuick.Controls +import QtQuick.Controls.impl Row { width: 200 diff --git a/tests/auto/qquickiconimage/data/color.qml b/tests/auto/qquickiconimage/data/color.qml index b5d40d70..b44b4388 100644 --- a/tests/auto/qquickiconimage/data/color.qml +++ b/tests/auto/qquickiconimage/data/color.qml @@ -1,6 +1,6 @@ -import QtQuick 2.12 -import QtQuick.Controls 2.12 -import QtQuick.Controls.impl 2.12 +import QtQuick +import QtQuick.Controls +import QtQuick.Controls.impl Row { width: 200 diff --git a/tests/auto/qquickiconimage/data/fileSelectors.qml b/tests/auto/qquickiconimage/data/fileSelectors.qml index 4e5ac6e7..e6861520 100644 --- a/tests/auto/qquickiconimage/data/fileSelectors.qml +++ b/tests/auto/qquickiconimage/data/fileSelectors.qml @@ -1,6 +1,6 @@ -import QtQuick 2.12 -import QtQuick.Controls 2.12 -import QtQuick.Controls.impl 2.12 +import QtQuick +import QtQuick.Controls +import QtQuick.Controls.impl Row { width: 200 diff --git a/tests/auto/qquickiconimage/data/imageProvider.qml b/tests/auto/qquickiconimage/data/imageProvider.qml index cf03ac7e..9b18a99e 100644 --- a/tests/auto/qquickiconimage/data/imageProvider.qml +++ b/tests/auto/qquickiconimage/data/imageProvider.qml @@ -1,7 +1,7 @@ -import QtQuick 2.12 -import QtQuick.Controls 2.12 -import QtQuick.Controls.impl 2.12 -import QtQuick.Templates 2.12 as T +import QtQuick +import QtQuick.Controls +import QtQuick.Controls.impl +import QtQuick.Templates as T IconLabel { icon.color: "transparent" diff --git a/tests/auto/qquickiconimage/data/nameBindingNoSizes.qml b/tests/auto/qquickiconimage/data/nameBindingNoSizes.qml index d0ea13c2..d457d205 100644 --- a/tests/auto/qquickiconimage/data/nameBindingNoSizes.qml +++ b/tests/auto/qquickiconimage/data/nameBindingNoSizes.qml @@ -1,6 +1,6 @@ -import QtQuick 2.12 -import QtQuick.Controls 2.12 -import QtQuick.Controls.impl 2.12 +import QtQuick +import QtQuick.Controls +import QtQuick.Controls.impl IconImage { name: "appointment-new" diff --git a/tests/auto/qquickiconimage/data/nameBindingSourceSize.qml b/tests/auto/qquickiconimage/data/nameBindingSourceSize.qml index 4e5ac6e7..e6861520 100644 --- a/tests/auto/qquickiconimage/data/nameBindingSourceSize.qml +++ b/tests/auto/qquickiconimage/data/nameBindingSourceSize.qml @@ -1,6 +1,6 @@ -import QtQuick 2.12 -import QtQuick.Controls 2.12 -import QtQuick.Controls.impl 2.12 +import QtQuick +import QtQuick.Controls +import QtQuick.Controls.impl Row { width: 200 diff --git a/tests/auto/qquickiconimage/data/nameBindingSourceSizeWidthHeight.qml b/tests/auto/qquickiconimage/data/nameBindingSourceSizeWidthHeight.qml index db6697d0..5e7ebefc 100644 --- a/tests/auto/qquickiconimage/data/nameBindingSourceSizeWidthHeight.qml +++ b/tests/auto/qquickiconimage/data/nameBindingSourceSizeWidthHeight.qml @@ -1,6 +1,6 @@ -import QtQuick 2.12 -import QtQuick.Controls 2.12 -import QtQuick.Controls.impl 2.12 +import QtQuick +import QtQuick.Controls +import QtQuick.Controls.impl IconImage { name: "appointment-new" diff --git a/tests/auto/qquickiconimage/data/root.qml b/tests/auto/qquickiconimage/data/root.qml index 31ad7265..ed02d2df 100644 --- a/tests/auto/qquickiconimage/data/root.qml +++ b/tests/auto/qquickiconimage/data/root.qml @@ -1,4 +1,4 @@ -import QtQuick 2.12 +import QtQuick Item { width: 200 diff --git a/tests/auto/qquickiconimage/data/sourceBindingNoSizes.qml b/tests/auto/qquickiconimage/data/sourceBindingNoSizes.qml index 08dcd55e..34fc6b33 100644 --- a/tests/auto/qquickiconimage/data/sourceBindingNoSizes.qml +++ b/tests/auto/qquickiconimage/data/sourceBindingNoSizes.qml @@ -1,6 +1,6 @@ -import QtQuick 2.12 -import QtQuick.Controls 2.12 -import QtQuick.Controls.impl 2.12 +import QtQuick +import QtQuick.Controls +import QtQuick.Controls.impl Row { width: 200 diff --git a/tests/auto/qquickiconimage/data/sourceBindingSourceSize.qml b/tests/auto/qquickiconimage/data/sourceBindingSourceSize.qml index 24678f8c..9f1b6290 100644 --- a/tests/auto/qquickiconimage/data/sourceBindingSourceSize.qml +++ b/tests/auto/qquickiconimage/data/sourceBindingSourceSize.qml @@ -1,6 +1,6 @@ -import QtQuick 2.12 -import QtQuick.Controls 2.12 -import QtQuick.Controls.impl 2.12 +import QtQuick +import QtQuick.Controls +import QtQuick.Controls.impl Row { width: 200 diff --git a/tests/auto/qquickiconimage/data/sourceBindingSourceSizeWidthHeight.qml b/tests/auto/qquickiconimage/data/sourceBindingSourceSizeWidthHeight.qml index 9ac26e22..4dc3ac75 100644 --- a/tests/auto/qquickiconimage/data/sourceBindingSourceSizeWidthHeight.qml +++ b/tests/auto/qquickiconimage/data/sourceBindingSourceSizeWidthHeight.qml @@ -1,6 +1,6 @@ -import QtQuick 2.12 -import QtQuick.Controls 2.12 -import QtQuick.Controls.impl 2.12 +import QtQuick +import QtQuick.Controls +import QtQuick.Controls.impl IconImage { source: "qrc:/icons/testtheme/22x22/actions/appointment-new.png" diff --git a/tests/auto/qquickiconimage/data/sourceBindingSourceTooLarge.qml b/tests/auto/qquickiconimage/data/sourceBindingSourceTooLarge.qml index 655add7b..a54d998a 100644 --- a/tests/auto/qquickiconimage/data/sourceBindingSourceTooLarge.qml +++ b/tests/auto/qquickiconimage/data/sourceBindingSourceTooLarge.qml @@ -1,6 +1,6 @@ -import QtQuick 2.12 -import QtQuick.Controls 2.12 -import QtQuick.Controls.impl 2.12 +import QtQuick +import QtQuick.Controls +import QtQuick.Controls.impl IconImage { source: "qrc:/icons/testtheme/22x22/actions/appointment-new.png" diff --git a/tests/auto/qquickiconimage/data/svgNoSizes.qml b/tests/auto/qquickiconimage/data/svgNoSizes.qml index d2652827..e29c23c5 100644 --- a/tests/auto/qquickiconimage/data/svgNoSizes.qml +++ b/tests/auto/qquickiconimage/data/svgNoSizes.qml @@ -1,6 +1,6 @@ -import QtQuick 2.12 -import QtQuick.Controls 2.12 -import QtQuick.Controls.impl 2.12 +import QtQuick +import QtQuick.Controls +import QtQuick.Controls.impl Row { width: 200 diff --git a/tests/auto/qquickiconimage/data/svgSourceBindingSourceSize.qml b/tests/auto/qquickiconimage/data/svgSourceBindingSourceSize.qml index c9157700..4674e8f1 100644 --- a/tests/auto/qquickiconimage/data/svgSourceBindingSourceSize.qml +++ b/tests/auto/qquickiconimage/data/svgSourceBindingSourceSize.qml @@ -1,6 +1,6 @@ -import QtQuick 2.12 -import QtQuick.Controls 2.12 -import QtQuick.Controls.impl 2.12 +import QtQuick +import QtQuick.Controls +import QtQuick.Controls.impl Row { width: 200 diff --git a/tests/auto/qquickiconimage/data/translucentColors.qml b/tests/auto/qquickiconimage/data/translucentColors.qml index fd208235..ad67bfe5 100644 --- a/tests/auto/qquickiconimage/data/translucentColors.qml +++ b/tests/auto/qquickiconimage/data/translucentColors.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 -import QtQuick.Controls.impl 2.12 +import QtQuick +import QtQuick.Controls +import QtQuick.Controls.impl ApplicationWindow { width: 500 diff --git a/tests/auto/qquickiconimage/qquickiconimage.pro b/tests/auto/qquickiconimage/qquickiconimage.pro index 1a37d4ba..91b6985a 100644 --- a/tests/auto/qquickiconimage/qquickiconimage.pro +++ b/tests/auto/qquickiconimage/qquickiconimage.pro @@ -3,7 +3,7 @@ macos:CONFIG -= app_bundle TARGET = tst_qquickiconimage QT += core gui qml quick testlib -QT_PRIVATE += quick-private quickcontrols2-private +QT_PRIVATE += quick-private quickcontrols2impl-private qtHaveModule(svg): QT += svg include (../shared/util.pri) diff --git a/tests/auto/qquickiconimage/tst_qquickiconimage.cpp b/tests/auto/qquickiconimage/tst_qquickiconimage.cpp index bc24c4fb..bcf1231f 100644 --- a/tests/auto/qquickiconimage/tst_qquickiconimage.cpp +++ b/tests/auto/qquickiconimage/tst_qquickiconimage.cpp @@ -39,7 +39,7 @@ #include <QtQuick/qquickimageprovider.h> #include <QtQuick/qquickitemgrabresult.h> #include <QtQuick/private/qquickimage_p.h> -#include <QtQuickControls2/private/qquickiconimage_p.h> +#include <QtQuickControls2Impl/private/qquickiconimage_p.h> #include "../shared/util.h" #include "../shared/visualtestutil.h" |