[locale] Fix QString-vs-char* confusion

ci: switch to less volatile KDE Neon version
2018-05-17 23:19:00 +02:00 · 2018-04-26 10:10:05 -04:00
2 changed files with 2 additions and 2 deletions
--- a/2
+++ b/2
@@ -1,2 +1,2 @@
-FROM kdeneon/all:dev-stable
+FROM kdeneon/all:user
 RUN sudo apt-get update && sudo apt-get -y install build-essential cmake extra-cmake-modules gettext kio-dev libatasmart-dev libboost-python-dev libkf5config-dev libkf5coreaddons-dev libkf5i18n-dev libkf5iconthemes-dev libkf5parts-dev libkf5service-dev libkf5solid-dev libkpmcore-dev libparted-dev libpolkit-qt5-1-dev libqt5svg5-dev libqt5webkit5-dev libyaml-cpp-dev os-prober pkg-config python3-dev qtbase5-dev qtdeclarative5-dev qttools5-dev qttools5-dev-tools 
--- a/src/modules/locale/GeoIPTests.cpp
+++ b/src/modules/locale/GeoIPTests.cpp
@@ -57,7 +57,7 @@ GeoIPTests::testJSON()
    QCOMPARE( tz.second, QLatin1String( "Brussels" ) );

    tz = handler.processReply( "time_zone: America/New_York\n" );
-    QCOMPARE( tz.first, "America" );
+    QCOMPARE( tz.first, QLatin1String( "America" ) );
 }

 void
Author	SHA1	Message	Date
Adriaan de Groot	5ea2e1c2fe	[locale] Fix QString-vs-char* confusion	2018-05-17 23:19:00 +02:00
Adriaan de Groot	c9ced8c387	ci: switch to less volatile KDE Neon version	2018-04-26 10:10:05 -04:00