Merge remote-tracking branch 'origin/tqtc/lts-6.2.6' into tqtc/lts-6.2-opensource

Change-Id: Ib45506323f2bb46e518a816591ae806cfec53dfa

36 files changed, 79 insertions, 38 deletions

diff --git a/.cmake.conf b/.cmake.conf
index 940e347a..6f32ba4d 100644
--- a/.cmake.conf
+++ b/.cmake.conf
@@ -1,2 +1,2 @@
-set(QT_REPO_MODULE_VERSION "6.2.5")
+set(QT_REPO_MODULE_VERSION "6.2.6")
 set(QT_REPO_MODULE_PRERELEASE_VERSION_SEGMENT "")
diff --git a/.qmake.conf b/.qmake.conf
index d85cadd9..6e30923d 100644
--- a/.qmake.conf
+++ b/.qmake.conf
@@ -2,4 +2,4 @@ load(qt_build_config)
 
 DEFINES += QT_NO_JAVA_STYLE_ITERATORS
 
-MODULE_VERSION = 6.2.5
+MODULE_VERSION = 6.2.6
diff --git a/examples/charts/piechartcustomization/mainwidget.cpp b/examples/charts/piechartcustomization/mainwidget.cpp
index 5d2ac832..8c2d9b71 100644
--- a/examples/charts/piechartcustomization/mainwidget.cpp
+++ b/examples/charts/piechartcustomization/mainwidget.cpp
@@ -81,7 +81,7 @@ MainWidget::MainWidget(QWidget *parent)
 
     m_legendCheckBox = new QCheckBox();
 
-    QScrollArea *settingsScrollBar = new QScrollArea();
+    settingsScrollBar = new QScrollArea();
     QWidget *settingsContentWidget = new QWidget();
 
     QFormLayout *chartSettingsLayout = new QFormLayout(settingsContentWidget);
@@ -212,6 +212,7 @@ MainWidget::MainWidget(QWidget *parent)
     sliceSettingsLayout->addRow("Explode distance", m_sliceExplodedFactor);
     QGroupBox *sliceSettings = new QGroupBox("Selected slice");
     sliceSettings->setLayout(sliceSettingsLayout);
+    sliceSettings->setSizePolicy(QSizePolicy::Ignored, QSizePolicy::Preferred);
 
     connect(m_sliceName, &QLineEdit::textChanged, this, &MainWidget::updateSliceSettings);
     connect(m_sliceValue,
@@ -244,12 +245,16 @@ MainWidget::MainWidget(QWidget *parent)
     settingsLayout->addWidget(sliceSettings);
 
     settingsContentWidget->setLayout(settingsLayout);
+
     settingsScrollBar->setWidget(settingsContentWidget);
-    settingsScrollBar->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Preferred);
+    settingsScrollBar->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);    
+    settingsScrollBar->setWidgetResizable(true);
+    settingsScrollBar->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Preferred);
+    m_chartView->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::Preferred);
 
-    QGridLayout *baseLayout = new QGridLayout();
+    baseLayout = new QGridLayout();
     baseLayout->addWidget(settingsScrollBar, 0, 0);
-    baseLayout->addWidget(m_chartView, 0, 1);
+    baseLayout->addWidget(m_chartView, 1, 0);
     setLayout(baseLayout);
 
     updateSerieSettings();
@@ -393,4 +398,32 @@ void MainWidget::removeSlice()
     m_slice = 0;
 }
 
+void MainWidget::resizeEvent(QResizeEvent *e)
+{
+    if (width() == 0 || height() == 0)
+        return;
+
+    const double aspectRatio = double(width()) / double(height());
+
+    if ((aspectRatio < 1.0) && (oldAspectRatio > 1.0)) {
+        baseLayout->removeWidget(m_chartView);
+        baseLayout->removeWidget(settingsScrollBar);
+
+        baseLayout->addWidget(m_chartView, 0, 0);
+        baseLayout->addWidget(settingsScrollBar, 1, 0);
+
+        oldAspectRatio = aspectRatio;
+    }
+    else if ((aspectRatio > 1.0) && (oldAspectRatio < 1.0)) {
+        baseLayout->removeWidget(m_chartView);
+        baseLayout->removeWidget(settingsScrollBar);
+
+        baseLayout->addWidget(m_chartView, 0, 0);
+        baseLayout->addWidget(settingsScrollBar, 0, 1);
+
+        oldAspectRatio = aspectRatio;
+    }
+}
+
+
 #include "moc_mainwidget.cpp"
diff --git a/examples/charts/piechartcustomization/mainwidget.h b/examples/charts/piechartcustomization/mainwidget.h
index d3c1e724..ba6c3670 100644
--- a/examples/charts/piechartcustomization/mainwidget.h
+++ b/examples/charts/piechartcustomization/mainwidget.h
@@ -29,6 +29,8 @@
 #ifndef MAINWIDGET_H
 #define MAINWIDGET_H
 
+#include "qgridlayout.h"
+#include "qscrollarea.h"
 #include <QtWidgets/QWidget>
 #include <QtCharts/QChartGlobal>
 
@@ -70,6 +72,8 @@ public Q_SLOTS:
     void removeSlice();
 
 private:
+    void resizeEvent(QResizeEvent *e);
+
     QComboBox *m_themeComboBox;
     QCheckBox *m_aaCheckBox;
     QCheckBox *m_animationsCheckBox;
@@ -100,6 +104,10 @@ private:
     QPushButton *m_labelBrush;
     QComboBox *m_labelPosition;
     BrushTool *m_labelBrushTool;
+    QGridLayout *baseLayout;
+    QScrollArea *settingsScrollBar;
+
+    double oldAspectRatio;
 };
 
 #endif // MAINWIDGET_H
diff --git a/src/charts/xychart/qxyseries.cpp b/src/charts/xychart/qxyseries.cpp
index 7de917f4..aba693b6 100644
--- a/src/charts/xychart/qxyseries.cpp
+++ b/src/charts/xychart/qxyseries.cpp
@@ -537,7 +537,7 @@ QT_BEGIN_NAMESPACE
 /*!
     \fn void QXYSeries::lightMarkerChanged(const QImage &lightMarker)
     This signal is emitted when the light marker image changes to \a lightMarker.
-    \sa QXYSeries::setLightMarker();
+    \sa QXYSeries::setLightMarker()
     \since 6.2
 */
 
diff --git a/tests/auto/chartdataset/CMakeLists.txt b/tests/auto/chartdataset/CMakeLists.txt
index d14bc68a..63988767 100644
--- a/tests/auto/chartdataset/CMakeLists.txt
+++ b/tests/auto/chartdataset/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## chartdataset Test:
 #####################################################################
 
-qt_internal_add_test(chartdataset
+qt_internal_add_test(tst_chartdataset
     SOURCES
         ../inc/tst_definitions.h
         tst_chartdataset.cpp
diff --git a/tests/auto/domain/CMakeLists.txt b/tests/auto/domain/CMakeLists.txt
index 6fbcaed6..870d286c 100644
--- a/tests/auto/domain/CMakeLists.txt
+++ b/tests/auto/domain/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## domain Test:
 #####################################################################
 
-qt_internal_add_test(domain
+qt_internal_add_test(tst_domain
     SOURCES
         ../inc/tst_definitions.h
         tst_domain.cpp
diff --git a/tests/auto/qareaseries/CMakeLists.txt b/tests/auto/qareaseries/CMakeLists.txt
index e7410fda..500ceb52 100644
--- a/tests/auto/qareaseries/CMakeLists.txt
+++ b/tests/auto/qareaseries/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## qareaseries Test:
 #####################################################################
 
-qt_internal_add_test(qareaseries
+qt_internal_add_test(tst_qareaseries
     SOURCES
         ../inc/tst_definitions.h
         tst_qareaseries.cpp
diff --git a/tests/auto/qbarcategoryaxis/CMakeLists.txt b/tests/auto/qbarcategoryaxis/CMakeLists.txt
index fa1d31cb..89189977 100644
--- a/tests/auto/qbarcategoryaxis/CMakeLists.txt
+++ b/tests/auto/qbarcategoryaxis/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## qbarcategoryaxis Test:
 #####################################################################
 
-qt_internal_add_test(qbarcategoryaxis
+qt_internal_add_test(tst_qbarcategoryaxis
     SOURCES
         ../inc/tst_definitions.h
         ../qabstractaxis/tst_qabstractaxis.cpp ../qabstractaxis/tst_qabstractaxis.h
diff --git a/tests/auto/qbarmodelmapper/CMakeLists.txt b/tests/auto/qbarmodelmapper/CMakeLists.txt
index 8a3d4aec..1e1a2c94 100644
--- a/tests/auto/qbarmodelmapper/CMakeLists.txt
+++ b/tests/auto/qbarmodelmapper/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## qbarmodelmapper Test:
 #####################################################################
 
-qt_internal_add_test(qbarmodelmapper
+qt_internal_add_test(tst_qbarmodelmapper
     SOURCES
         ../inc/tst_definitions.h
         tst_qbarmodelmapper.cpp
diff --git a/tests/auto/qbarseries/CMakeLists.txt b/tests/auto/qbarseries/CMakeLists.txt
index 3bad94b7..29aa4345 100644
--- a/tests/auto/qbarseries/CMakeLists.txt
+++ b/tests/auto/qbarseries/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## qbarseries Test:
 #####################################################################
 
-qt_internal_add_test(qbarseries
+qt_internal_add_test(tst_qbarseries
     SOURCES
         ../inc/tst_definitions.h
         tst_qbarseries.cpp
diff --git a/tests/auto/qbarset/CMakeLists.txt b/tests/auto/qbarset/CMakeLists.txt
index 842168bb..bcacb6e1 100644
--- a/tests/auto/qbarset/CMakeLists.txt
+++ b/tests/auto/qbarset/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## qbarset Test:
 #####################################################################
 
-qt_internal_add_test(qbarset
+qt_internal_add_test(tst_qbarset
     SOURCES
         ../inc/tst_definitions.h
         tst_qbarset.cpp
diff --git a/tests/auto/qcandlestickmodelmapper/CMakeLists.txt b/tests/auto/qcandlestickmodelmapper/CMakeLists.txt
index 89893b90..1260bee1 100644
--- a/tests/auto/qcandlestickmodelmapper/CMakeLists.txt
+++ b/tests/auto/qcandlestickmodelmapper/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## qcandlestickmodelmapper Test:
 #####################################################################
 
-qt_internal_add_test(qcandlestickmodelmapper
+qt_internal_add_test(tst_qcandlestickmodelmapper
     SOURCES
         ../inc/tst_definitions.h
         tst_qcandlestickmodelmapper.cpp
diff --git a/tests/auto/qcandlestickseries/CMakeLists.txt b/tests/auto/qcandlestickseries/CMakeLists.txt
index 66eca374..430744c7 100644
--- a/tests/auto/qcandlestickseries/CMakeLists.txt
+++ b/tests/auto/qcandlestickseries/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## qcandlestickseries Test:
 #####################################################################
 
-qt_internal_add_test(qcandlestickseries
+qt_internal_add_test(tst_qcandlestickseries
     SOURCES
         ../inc/tst_definitions.h
         tst_qcandlestickseries.cpp
diff --git a/tests/auto/qcandlestickset/CMakeLists.txt b/tests/auto/qcandlestickset/CMakeLists.txt
index c4376efa..4728a9b6 100644
--- a/tests/auto/qcandlestickset/CMakeLists.txt
+++ b/tests/auto/qcandlestickset/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## qcandlestickset Test:
 #####################################################################
 
-qt_internal_add_test(qcandlestickset
+qt_internal_add_test(tst_qcandlestickset
     SOURCES
         ../inc/tst_definitions.h
         tst_qcandlestickset.cpp
diff --git a/tests/auto/qcategoryaxis/CMakeLists.txt b/tests/auto/qcategoryaxis/CMakeLists.txt
index a3e2a6e8..1574866c 100644
--- a/tests/auto/qcategoryaxis/CMakeLists.txt
+++ b/tests/auto/qcategoryaxis/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## qcategoryaxis Test:
 #####################################################################
 
-qt_internal_add_test(qcategoryaxis
+qt_internal_add_test(tst_qcategoryaxis
     SOURCES
         ../inc/tst_definitions.h
         ../qabstractaxis/tst_qabstractaxis.cpp ../qabstractaxis/tst_qabstractaxis.h
diff --git a/tests/auto/qchart/CMakeLists.txt b/tests/auto/qchart/CMakeLists.txt
index dc81bc8c..3702470d 100644
--- a/tests/auto/qchart/CMakeLists.txt
+++ b/tests/auto/qchart/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## qchart Test:
 #####################################################################
 
-qt_internal_add_test(qchart
+qt_internal_add_test(tst_qchart
     SOURCES
         ../inc/tst_definitions.h
         tst_qchart.cpp
diff --git a/tests/auto/qchartview/CMakeLists.txt b/tests/auto/qchartview/CMakeLists.txt
index fca5fc13..c6c669ec 100644
--- a/tests/auto/qchartview/CMakeLists.txt
+++ b/tests/auto/qchartview/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## qchartview Test:
 #####################################################################
 
-qt_internal_add_test(qchartview
+qt_internal_add_test(tst_qchartview
     SOURCES
         ../inc/tst_definitions.h
         tst_qchartview.cpp
diff --git a/tests/auto/qdatetimeaxis/CMakeLists.txt b/tests/auto/qdatetimeaxis/CMakeLists.txt
index e5b277b9..2c30c2e4 100644
--- a/tests/auto/qdatetimeaxis/CMakeLists.txt
+++ b/tests/auto/qdatetimeaxis/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## qdatetimeaxis Test:
 #####################################################################
 
-qt_internal_add_test(qdatetimeaxis
+qt_internal_add_test(tst_qdatetimeaxis
     SOURCES
         ../inc/tst_definitions.h
         ../qabstractaxis/tst_qabstractaxis.cpp ../qabstractaxis/tst_qabstractaxis.h
diff --git a/tests/auto/qhorizontalbarseries/CMakeLists.txt b/tests/auto/qhorizontalbarseries/CMakeLists.txt
index 19cea05d..3c2fef19 100644
--- a/tests/auto/qhorizontalbarseries/CMakeLists.txt
+++ b/tests/auto/qhorizontalbarseries/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## qhorizontalbarseries Test:
 #####################################################################
 
-qt_internal_add_test(qhorizontalbarseries
+qt_internal_add_test(tst_qhorizontalbarseries
     SOURCES
         ../inc/tst_definitions.h
         tst_qhorizontalbarseries.cpp
diff --git a/tests/auto/qhorizontalpercentbarseries/CMakeLists.txt b/tests/auto/qhorizontalpercentbarseries/CMakeLists.txt
index cc630fc7..7102a26c 100644
--- a/tests/auto/qhorizontalpercentbarseries/CMakeLists.txt
+++ b/tests/auto/qhorizontalpercentbarseries/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## qhorizontalpercentbarseries Test:
 #####################################################################
 
-qt_internal_add_test(qhorizontalpercentbarseries
+qt_internal_add_test(tst_qhorizontalpercentbarseries
     SOURCES
         ../inc/tst_definitions.h
         tst_qhorizontalpercentbarseries.cpp
diff --git a/tests/auto/qhorizontalstackedbarseries/CMakeLists.txt b/tests/auto/qhorizontalstackedbarseries/CMakeLists.txt
index 6871a178..706841e4 100644
--- a/tests/auto/qhorizontalstackedbarseries/CMakeLists.txt
+++ b/tests/auto/qhorizontalstackedbarseries/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## qhorizontalstackedbarseries Test:
 #####################################################################
 
-qt_internal_add_test(qhorizontalstackedbarseries
+qt_internal_add_test(tst_qhorizontalstackedbarseries
     SOURCES
         ../inc/tst_definitions.h
         tst_qhorizontalstackedbarseries.cpp
diff --git a/tests/auto/qlegend/CMakeLists.txt b/tests/auto/qlegend/CMakeLists.txt
index 01566eee..c199288a 100644
--- a/tests/auto/qlegend/CMakeLists.txt
+++ b/tests/auto/qlegend/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## qlegend Test:
 #####################################################################
 
-qt_internal_add_test(qlegend
+qt_internal_add_test(tst_qlegend
     SOURCES
         ../inc/tst_definitions.h
         tst_qlegend.cpp
diff --git a/tests/auto/qlineseries/CMakeLists.txt b/tests/auto/qlineseries/CMakeLists.txt
index 152c36e0..75d9957a 100644
--- a/tests/auto/qlineseries/CMakeLists.txt
+++ b/tests/auto/qlineseries/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## qlineseries Test:
 #####################################################################
 
-qt_internal_add_test(qlineseries
+qt_internal_add_test(tst_qlineseries
     SOURCES
         ../inc/tst_definitions.h
         ../qxyseries/tst_qxyseries.cpp ../qxyseries/tst_qxyseries.h
diff --git a/tests/auto/qlogvalueaxis/CMakeLists.txt b/tests/auto/qlogvalueaxis/CMakeLists.txt
index 6c6ff9f1..a6d524cd 100644
--- a/tests/auto/qlogvalueaxis/CMakeLists.txt
+++ b/tests/auto/qlogvalueaxis/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## qlogvalueaxis Test:
 #####################################################################
 
-qt_internal_add_test(qlogvalueaxis
+qt_internal_add_test(tst_qlogvalueaxis
     SOURCES
         ../inc/tst_definitions.h
         ../qabstractaxis/tst_qabstractaxis.cpp ../qabstractaxis/tst_qabstractaxis.h
diff --git a/tests/auto/qml-qtquicktest/CMakeLists.txt b/tests/auto/qml-qtquicktest/CMakeLists.txt
index c95f1201..ad0462b7 100644
--- a/tests/auto/qml-qtquicktest/CMakeLists.txt
+++ b/tests/auto/qml-qtquicktest/CMakeLists.txt
@@ -8,7 +8,7 @@ file(GLOB_RECURSE test_data_glob
     data/*)
 list(APPEND test_data ${test_data_glob})
 
-qt_internal_add_test(qml-qtquicktest
+qt_internal_add_test(tst_qml-qtquicktest
     QMLTEST
     SOURCES
         ../inc/tst_definitions.h
diff --git a/tests/auto/qml/CMakeLists.txt b/tests/auto/qml/CMakeLists.txt
index 95e5663b..783ab119 100644
--- a/tests/auto/qml/CMakeLists.txt
+++ b/tests/auto/qml/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## qml Test:
 #####################################################################
 
-qt_internal_add_test(charts_qml
+qt_internal_add_test(tst_charts_qml
     SOURCES
         ../inc/tst_definitions.h
         tst_qml.cpp
diff --git a/tests/auto/qpercentbarseries/CMakeLists.txt b/tests/auto/qpercentbarseries/CMakeLists.txt
index aebb80c7..8b147b21 100644
--- a/tests/auto/qpercentbarseries/CMakeLists.txt
+++ b/tests/auto/qpercentbarseries/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## qpercentbarseries Test:
 #####################################################################
 
-qt_internal_add_test(qpercentbarseries
+qt_internal_add_test(tst_qpercentbarseries
     SOURCES
         ../inc/tst_definitions.h
         tst_qpercentbarseries.cpp
diff --git a/tests/auto/qpiemodelmapper/CMakeLists.txt b/tests/auto/qpiemodelmapper/CMakeLists.txt
index f72d6cb0..eb6cc5b5 100644
--- a/tests/auto/qpiemodelmapper/CMakeLists.txt
+++ b/tests/auto/qpiemodelmapper/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## qpiemodelmapper Test:
 #####################################################################
 
-qt_internal_add_test(qpiemodelmapper
+qt_internal_add_test(tst_qpiemodelmapper
     SOURCES
         ../inc/tst_definitions.h
         tst_qpiemodelmapper.cpp
diff --git a/tests/auto/qpieseries/CMakeLists.txt b/tests/auto/qpieseries/CMakeLists.txt
index 550478df..9db7c58f 100644
--- a/tests/auto/qpieseries/CMakeLists.txt
+++ b/tests/auto/qpieseries/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## qpieseries Test:
 #####################################################################
 
-qt_internal_add_test(qpieseries
+qt_internal_add_test(tst_qpieseries
     SOURCES
         ../inc/tst_definitions.h
         tst_qpieseries.cpp
diff --git a/tests/auto/qpieslice/CMakeLists.txt b/tests/auto/qpieslice/CMakeLists.txt
index 09b1f480..7361a46b 100644
--- a/tests/auto/qpieslice/CMakeLists.txt
+++ b/tests/auto/qpieslice/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## qpieslice Test:
 #####################################################################
 
-qt_internal_add_test(qpieslice
+qt_internal_add_test(tst_qpieslice
     SOURCES
         ../inc/tst_definitions.h
         tst_qpieslice.cpp
diff --git a/tests/auto/qscatterseries/CMakeLists.txt b/tests/auto/qscatterseries/CMakeLists.txt
index 56792b41..b3cb58a8 100644
--- a/tests/auto/qscatterseries/CMakeLists.txt
+++ b/tests/auto/qscatterseries/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## qscatterseries Test:
 #####################################################################
 
-qt_internal_add_test(qscatterseries
+qt_internal_add_test(tst_qscatterseries
     SOURCES
         ../inc/tst_definitions.h
         ../qxyseries/tst_qxyseries.cpp ../qxyseries/tst_qxyseries.h
diff --git a/tests/auto/qsplineseries/CMakeLists.txt b/tests/auto/qsplineseries/CMakeLists.txt
index b75b8197..5f580733 100644
--- a/tests/auto/qsplineseries/CMakeLists.txt
+++ b/tests/auto/qsplineseries/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## qsplineseries Test:
 #####################################################################
 
-qt_internal_add_test(qsplineseries
+qt_internal_add_test(tst_qsplineseries
     SOURCES
         ../inc/tst_definitions.h
         ../qxyseries/tst_qxyseries.cpp ../qxyseries/tst_qxyseries.h
diff --git a/tests/auto/qstackedbarseries/CMakeLists.txt b/tests/auto/qstackedbarseries/CMakeLists.txt
index fc076c52..ecb78bec 100644
--- a/tests/auto/qstackedbarseries/CMakeLists.txt
+++ b/tests/auto/qstackedbarseries/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## qstackedbarseries Test:
 #####################################################################
 
-qt_internal_add_test(qstackedbarseries
+qt_internal_add_test(tst_qstackedbarseries
     SOURCES
         ../inc/tst_definitions.h
         tst_qstackedbarseries.cpp
diff --git a/tests/auto/qvalueaxis/CMakeLists.txt b/tests/auto/qvalueaxis/CMakeLists.txt
index 2d2980c5..b8d253fd 100644
--- a/tests/auto/qvalueaxis/CMakeLists.txt
+++ b/tests/auto/qvalueaxis/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## qvalueaxis Test:
 #####################################################################
 
-qt_internal_add_test(qvalueaxis
+qt_internal_add_test(tst_qvalueaxis
     SOURCES
         ../inc/tst_definitions.h
         ../qabstractaxis/tst_qabstractaxis.cpp ../qabstractaxis/tst_qabstractaxis.h
diff --git a/tests/auto/qxymodelmapper/CMakeLists.txt b/tests/auto/qxymodelmapper/CMakeLists.txt
index 7dd66467..1f261a31 100644
--- a/tests/auto/qxymodelmapper/CMakeLists.txt
+++ b/tests/auto/qxymodelmapper/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## qxymodelmapper Test:
 #####################################################################
 
-qt_internal_add_test(qxymodelmapper
+qt_internal_add_test(tst_qxymodelmapper
     SOURCES
         ../inc/tst_definitions.h
         tst_qxymodelmapper.cpp