4 files changed, 48 insertions, 108 deletions

diff --git a/tests/auto/gui/painting/qcolor/tst_qcolor.cpp b/tests/auto/gui/painting/qcolor/tst_qcolor.cpp
index 6c66519dce..07c820dc86 100644
--- a/tests/auto/gui/painting/qcolor/tst_qcolor.cpp
+++ b/tests/auto/gui/painting/qcolor/tst_qcolor.cpp
@@ -115,10 +115,6 @@ private slots:
 
     void qcolorprofile_data();
     void qcolorprofile();
-
-#if 0 // Used to be included in Qt4 for Q_WS_X11
-    void setallowX11ColorNames();
-#endif
 };
 
 // Testing get/set functions
@@ -1649,62 +1645,6 @@ void tst_QColor::achromaticHslHue()
     QCOMPARE(hsl.hslHue(), -1);
 }
 
-#if 0 // Used to be included in Qt4 for Q_WS_X11
-void tst_QColor::setallowX11ColorNames()
-{
-    RGBData x11RgbTbl[] = {
-        // a few standard X11 color names
-        { "DodgerBlue1", qRgb(30, 144, 255) },
-        { "DodgerBlue2", qRgb(28, 134, 238) },
-        { "DodgerBlue3", qRgb(24, 116, 205) },
-        { "DodgerBlue4", qRgb(16, 78, 139) },
-        { "SteelBlue1", qRgb(99, 184, 255) },
-        { "SteelBlue2", qRgb(92, 172, 238) },
-        { "SteelBlue3", qRgb(79, 148, 205) },
-        { "SteelBlue4", qRgb(54, 100, 139) },
-        { "DeepSkyBlue1", qRgb(0, 191, 255) },
-        { "DeepSkyBlue2", qRgb(0, 178, 238) },
-        { "DeepSkyBlue3", qRgb(0, 154, 205) },
-        { "DeepSkyBlue4", qRgb(0, 104, 139) },
-        { "SkyBlue1", qRgb(135, 206, 255) },
-        { "SkyBlue2", qRgb(126, 192, 238) },
-        { "SkyBlue3", qRgb(108, 166, 205) },
-        { "SkyBlue4", qRgb(74, 112, 139) }
-    };
-    static const int x11RgbTblSize = sizeof(x11RgbTbl) / sizeof(RGBData);
-
-    // X11 color names should not work by default
-    QVERIFY(!QColor::allowX11ColorNames());
-    for (int i = 0; i < x11RgbTblSize; ++i) {
-        QString colorName = QLatin1String(x11RgbTbl[i].name);
-        QColor color;
-        color.setNamedColor(colorName);
-        QVERIFY(!color.isValid());
-    }
-
-    // enable X11 color names
-    QColor::setAllowX11ColorNames(true);
-    QVERIFY(QColor::allowX11ColorNames());
-    for (int i = 0; i < x11RgbTblSize; ++i) {
-        QString colorName = QLatin1String(x11RgbTbl[i].name);
-        QColor color;
-        color.setNamedColor(colorName);
-        QColor expected(x11RgbTbl[i].value);
-        QCOMPARE(color, expected);
-    }
-
-    // should be able to turn off X11 color names
-    QColor::setAllowX11ColorNames(false);
-    QVERIFY(!QColor::allowX11ColorNames());
-    for (int i = 0; i < x11RgbTblSize; ++i) {
-        QString colorName = QLatin1String(x11RgbTbl[i].name);
-        QColor color;
-        color.setNamedColor(colorName);
-        QVERIFY(!color.isValid());
-    }
-}
-#endif
-
 void tst_QColor::premultiply()
 {
     // Tests that qPremultiply(qUnpremultiply(x)) returns x.
diff --git a/tests/auto/gui/painting/qcolorspace/tst_qcolorspace.cpp b/tests/auto/gui/painting/qcolorspace/tst_qcolorspace.cpp
index bc1a45013c..d51cfdee2f 100644
--- a/tests/auto/gui/painting/qcolorspace/tst_qcolorspace.cpp
+++ b/tests/auto/gui/painting/qcolorspace/tst_qcolorspace.cpp
@@ -35,7 +35,7 @@
 
 #include <private/qcolorspace_p.h>
 
-Q_DECLARE_METATYPE(QColorSpace::ColorSpaceId)
+Q_DECLARE_METATYPE(QColorSpace::NamedColorSpace)
 Q_DECLARE_METATYPE(QColorSpace::Primaries)
 Q_DECLARE_METATYPE(QColorSpace::TransferFunction)
 
@@ -47,6 +47,7 @@ public:
     tst_QColorSpace();
 
 private slots:
+    void movable();
     void namedColorSpaces_data();
     void namedColorSpaces();
 
@@ -63,8 +64,12 @@ private slots:
 
     void primaries();
     void primariesXyz();
+
+#ifdef QT_BUILD_INTERNAL
     void primaries2_data();
     void primaries2();
+#endif
+
     void invalidPrimaries();
 
     void changeTransferFunction();
@@ -75,9 +80,31 @@ tst_QColorSpace::tst_QColorSpace()
 { }
 
 
+void tst_QColorSpace::movable()
+{
+    QColorSpace cs1 = QColorSpace::SRgb;
+    QColorSpace cs2 = QColorSpace::SRgbLinear;
+    QVERIFY(cs1.isValid());
+    QVERIFY(cs2.isValid());
+    QCOMPARE(cs1, QColorSpace::SRgb);
+
+    cs2 = std::move(cs1);
+    QVERIFY(!cs1.isValid());
+    QVERIFY(cs2.isValid());
+    QCOMPARE(cs2, QColorSpace::SRgb);
+    QVERIFY(cs1 != QColorSpace::SRgb);
+    QCOMPARE(cs1, QColorSpace());
+
+    QColorSpace cs3(std::move(cs2));
+    QVERIFY(!cs2.isValid());
+    QVERIFY(cs3.isValid());
+    QCOMPARE(cs3, QColorSpace::SRgb);
+    QCOMPARE(cs2, QColorSpace());
+}
+
 void tst_QColorSpace::namedColorSpaces_data()
 {
-    QTest::addColumn<QColorSpace::ColorSpaceId>("colorSpaceId");
+    QTest::addColumn<QColorSpace::NamedColorSpace>("namedColorSpace");
     QTest::addColumn<QColorSpace::Primaries>("primariesId");
     QTest::addColumn<QColorSpace::TransferFunction>("transferFunctionId");
 
@@ -103,15 +130,15 @@ void tst_QColorSpace::namedColorSpaces_data()
 
 void tst_QColorSpace::namedColorSpaces()
 {
-    QFETCH(QColorSpace::ColorSpaceId, colorSpaceId);
+    QFETCH(QColorSpace::NamedColorSpace, namedColorSpace);
     QFETCH(QColorSpace::Primaries, primariesId);
     QFETCH(QColorSpace::TransferFunction, transferFunctionId);
 
-    QColorSpace colorSpace = colorSpaceId;
+    QColorSpace colorSpace = namedColorSpace;
 
     QVERIFY(colorSpace.isValid());
 
-    QCOMPARE(colorSpace.colorSpaceId(), colorSpaceId);
+    QCOMPARE(colorSpace, namedColorSpace);
     QCOMPARE(colorSpace.primaries(), primariesId);
     QCOMPARE(colorSpace.transferFunction(), transferFunctionId);
 }
@@ -124,14 +151,14 @@ void tst_QColorSpace::toIccProfile_data()
 
 void tst_QColorSpace::toIccProfile()
 {
-    QFETCH(QColorSpace::ColorSpaceId, colorSpaceId);
+    QFETCH(QColorSpace::NamedColorSpace, namedColorSpace);
     QFETCH(QColorSpace::Primaries, primariesId);
     QFETCH(QColorSpace::TransferFunction, transferFunctionId);
 
     Q_UNUSED(primariesId);
     Q_UNUSED(transferFunctionId);
 
-    QColorSpace colorSpace = colorSpaceId;
+    QColorSpace colorSpace = namedColorSpace;
     QByteArray iccProfile = colorSpace.iccProfile();
     QVERIFY(!iccProfile.isEmpty());
 
@@ -149,7 +176,7 @@ void tst_QColorSpace::toIccProfile()
 void tst_QColorSpace::fromIccProfile_data()
 {
     QTest::addColumn<QString>("testProfile");
-    QTest::addColumn<QColorSpace::ColorSpaceId>("colorSpaceId");
+    QTest::addColumn<QColorSpace::NamedColorSpace>("namedColorSpace");
     QTest::addColumn<QColorSpace::TransferFunction>("transferFunction");
     QTest::addColumn<QString>("description");
 
@@ -158,14 +185,14 @@ void tst_QColorSpace::fromIccProfile_data()
     QTest::newRow("sRGB2014 (ICCv2)") << prefix + "sRGB2014.icc" << QColorSpace::SRgb
                                            << QColorSpace::TransferFunction::SRgb << QString("sRGB2014");
     // My monitor's profile:
-    QTest::newRow("HP ZR30w (ICCv4)") << prefix + "HP_ZR30w.icc" << QColorSpace::Unknown
+    QTest::newRow("HP ZR30w (ICCv4)") << prefix + "HP_ZR30w.icc" << QColorSpace::NamedColorSpace(0)
                                       << QColorSpace::TransferFunction::Gamma << QString("HP Z30i");
 }
 
 void tst_QColorSpace::fromIccProfile()
 {
     QFETCH(QString, testProfile);
-    QFETCH(QColorSpace::ColorSpaceId, colorSpaceId);
+    QFETCH(QColorSpace::NamedColorSpace, namedColorSpace);
     QFETCH(QColorSpace::TransferFunction, transferFunction);
     QFETCH(QString, description);
 
@@ -175,15 +202,17 @@ void tst_QColorSpace::fromIccProfile()
     QColorSpace fileColorSpace = QColorSpace::fromIccProfile(iccProfile);
     QVERIFY(fileColorSpace.isValid());
 
-    QCOMPARE(fileColorSpace.colorSpaceId(), colorSpaceId);
+    if (namedColorSpace)
+        QCOMPARE(fileColorSpace, namedColorSpace);
+
     QCOMPARE(fileColorSpace.transferFunction(), transferFunction);
     QCOMPARE(QColorSpacePrivate::get(fileColorSpace)->description, description);
 }
 
 void tst_QColorSpace::imageConversion_data()
 {
-    QTest::addColumn<QColorSpace::ColorSpaceId>("fromColorSpace");
-    QTest::addColumn<QColorSpace::ColorSpaceId>("toColorSpace");
+    QTest::addColumn<QColorSpace::NamedColorSpace>("fromColorSpace");
+    QTest::addColumn<QColorSpace::NamedColorSpace>("toColorSpace");
     QTest::addColumn<int>("tolerance");
 
     QTest::newRow("sRGB -> Display-P3") << QColorSpace::SRgb << QColorSpace::DisplayP3 << 0;
@@ -197,8 +226,8 @@ void tst_QColorSpace::imageConversion_data()
 
 void tst_QColorSpace::imageConversion()
 {
-    QFETCH(QColorSpace::ColorSpaceId, fromColorSpace);
-    QFETCH(QColorSpace::ColorSpaceId, toColorSpace);
+    QFETCH(QColorSpace::NamedColorSpace, fromColorSpace);
+    QFETCH(QColorSpace::NamedColorSpace, toColorSpace);
     QFETCH(int, tolerance);
 
     QImage testImage(256, 1, QImage::Format_RGB32);
@@ -252,7 +281,7 @@ void tst_QColorSpace::loadImage()
 
     QVERIFY(!image.isNull());
     QVERIFY(image.colorSpace().isValid());
-    QCOMPARE(image.colorSpace().colorSpaceId(), QColorSpace::ProPhotoRgb);
+    QCOMPARE(image.colorSpace(), QColorSpace::ProPhotoRgb);
     QVERIFY(!image.colorSpace().iccProfile().isEmpty());
 
     QColorSpace defaultProPhotoRgb = QColorSpace::ProPhotoRgb;
@@ -332,6 +361,7 @@ void tst_QColorSpace::primariesXyz()
     QCOMPARE(QColorSpacePrivate::get(bt2020)->toXyz, QColorMatrix::toXyzFromBt2020());
 }
 
+#ifdef QT_BUILD_INTERNAL
 void tst_QColorSpace::primaries2_data()
 {
     QTest::addColumn<QColorSpace::Primaries>("primariesId");
@@ -370,12 +400,12 @@ void tst_QColorSpace::primaries2()
     QCOMPARE(color3.blue(),  color1.blue());
     QCOMPARE(color3.alpha(), color1.alpha());
 }
+#endif
 
 void tst_QColorSpace::invalidPrimaries()
 {
     QColorSpace custom(QPointF(), QPointF(), QPointF(), QPointF(), QColorSpace::TransferFunction::Linear);
     QVERIFY(!custom.isValid());
-    QCOMPARE(custom.colorSpaceId(), QColorSpace::Undefined);
 }
 
 void tst_QColorSpace::changeTransferFunction()
@@ -386,7 +416,7 @@ void tst_QColorSpace::changeTransferFunction()
     QCOMPARE(sRgbLinear.transferFunction(), QColorSpace::TransferFunction::Linear);
     QCOMPARE(sRgbLinear.gamma(), 1.0f);
     QCOMPARE(sRgbLinear.primaries(), QColorSpace::Primaries::SRgb);
-    QCOMPARE(sRgbLinear.colorSpaceId(), QColorSpace::SRgbLinear);
+    QCOMPARE(sRgbLinear, QColorSpace::SRgbLinear);
     QCOMPARE(sRgbLinear, QColorSpace(QColorSpace::SRgbLinear));
     QVERIFY(sRgbLinear != sRgb);
     QCOMPARE(sRgbLinear.withTransferFunction(QColorSpace::TransferFunction::SRgb), sRgb);
@@ -395,7 +425,6 @@ void tst_QColorSpace::changeTransferFunction()
     aRgb.setTransferFunction(QColorSpace::TransferFunction::SRgb);
     QCOMPARE(aRgb.transferFunction(), QColorSpace::TransferFunction::SRgb);
     QCOMPARE(aRgb.primaries(), QColorSpace::Primaries::AdobeRgb);
-    QCOMPARE(aRgb.colorSpaceId(), QColorSpace::Unknown);
     QVERIFY(aRgb != QColorSpace(QColorSpace::AdobeRgb));
     QVERIFY(aRgb != sRgb);
     QCOMPARE(aRgb.withTransferFunction(QColorSpace::TransferFunction::Gamma, 2.2f),
diff --git a/tests/auto/gui/painting/qpainter/tst_qpainter.cpp b/tests/auto/gui/painting/qpainter/tst_qpainter.cpp
index 61867ec65a..d2a4dfc3e9 100644
--- a/tests/auto/gui/painting/qpainter/tst_qpainter.cpp
+++ b/tests/auto/gui/painting/qpainter/tst_qpainter.cpp
@@ -461,11 +461,6 @@ void tst_QPainter::drawPixmap_comp()
     destPm.fill(c1);
     srcPm.fill(c2);
 
-#if 0 // Used to be included in Qt4 for Q_WS_X11
-    if (!destPm.x11PictureHandle())
-        QSKIP("Requires XRender support");
-#endif
-
     QPainter p(&destPm);
     p.drawPixmap(0, 0, srcPm);
     p.end();
diff --git a/tests/auto/gui/painting/qregion/tst_qregion.cpp b/tests/auto/gui/painting/qregion/tst_qregion.cpp
index 24c4583819..d1ea7706b9 100644
--- a/tests/auto/gui/painting/qregion/tst_qregion.cpp
+++ b/tests/auto/gui/painting/qregion/tst_qregion.cpp
@@ -33,9 +33,6 @@
 #include <qbitmap.h>
 #include <qpainter.h>
 #include <qpolygon.h>
-#if 0 // Used to be included in Qt4 for Q_WS_X11
-#include <private/qt_x11_p.h>
-#endif
 
 class tst_QRegion : public QObject
 {
@@ -79,9 +76,6 @@ private slots:
 
     void isEmpty_data();
     void isEmpty();
-#if 0 /* Used to be included in Qt4 for Q_WS_X11 */ && defined(QT_BUILD_INTERNAL)
-    void clipRectangles();
-#endif
 
     void regionFromPath();
     void scaleRegions_data();
@@ -910,24 +904,6 @@ void tst_QRegion::isEmpty()
 #endif
 }
 
-#if 0 /* Used to be included in Qt4 for Q_WS_X11 */ && defined(QT_BUILD_INTERNAL)
-void tst_QRegion::clipRectangles()
-{
-    QRegion region(30, 30, 30, 30);
-    int num = 0;
-    qt_getClipRects(region, num);
-    QCOMPARE(num, 1);
-
-    region += QRegion(10, 10, 10, 10);
-    XRectangle *rects2 = static_cast<XRectangle *>(qt_getClipRects(region, num));
-    QCOMPARE(num, 2);
-
-    // Here's the important part (Y-sorted):
-    QCOMPARE(int(rects2[0].y), 10);
-    QCOMPARE(int(rects2[1].y), 30);
-}
-#endif
-
 void tst_QRegion::regionFromPath()
 {
     {