From 657c26aff38d041f87d2771fcb1079c06e1d4031 Mon Sep 17 00:00:00 2001 From: Ivailo Monev Date: Sun, 7 Jul 2019 01:44:34 +0000 Subject: [PATCH] fix build of locale test with QT_NO_SYSTEMLOCALE defined Signed-off-by: Ivailo Monev --- tests/auto/qlocale/tst_qlocale.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tests/auto/qlocale/tst_qlocale.cpp b/tests/auto/qlocale/tst_qlocale.cpp index c2f19e499..0977fbc4e 100644 --- a/tests/auto/qlocale/tst_qlocale.cpp +++ b/tests/auto/qlocale/tst_qlocale.cpp @@ -121,9 +121,11 @@ private slots: void standaloneMonthName(); // QSystemLocale tests +#ifndef QT_NO_SYSTEMLOCALE void queryDateTime(); void queryMeasureSystem_data(); void queryMeasureSystem(); +#endif // defaultNumberingSystem test void defaultNumeringSystem(); @@ -1392,6 +1394,7 @@ void tst_QLocale::systemMeasurementSystems() qputenv("LANG", oldLang.toLocal8Bit()); } +#ifndef QT_NO_SYSTEMLOCALE class SystemLocale : public QSystemLocale { public: @@ -1429,7 +1432,6 @@ void tst_QLocale::queryDateTime() QString("01121974010203004")); } -#ifndef QT_NO_SYSTEMLOCALE void tst_QLocale::queryMeasureSystem_data() { QTest::addColumn("lcAllLocale"); -- 2.11.0