diff options
| author | Ahmad Samir <a.samirh78@gmail.com> | 2021-02-06 22:49:41 +0200 | 
|---|---|---|
| committer | Ahmad Samir <a.samirh78@gmail.com> | 2021-02-06 22:49:41 +0200 | 
| commit | 65e5f9f01078ec993648da3a132f60c7f07ff27d (patch) | |
| tree | 345aa4d698e254d80b03511c64fd60b8c4f66377 | |
| parent | dc878289c01011c59615746655b4e78d4bc90b91 (diff) | |
| download | kconfig-65e5f9f01078ec993648da3a132f60c7f07ff27d.tar.gz kconfig-65e5f9f01078ec993648da3a132f60c7f07ff27d.tar.bz2 | |
Fix windows build on the CI
I didn't consider the '#ifdef Q_OS_WIN' code paths (since that compiles
just fine locally).
GIT_SILENT
| -rw-r--r-- | autotests/kconfig_compiler/kconfigcompiler_test.cpp | 2 | ||||
| -rw-r--r-- | autotests/kconfigtest.cpp | 2 | ||||
| -rw-r--r-- | autotests/test_kconf_update.cpp | 2 | 
3 files changed, 3 insertions, 3 deletions
| diff --git a/autotests/kconfig_compiler/kconfigcompiler_test.cpp b/autotests/kconfig_compiler/kconfigcompiler_test.cpp index 014bc0f3..4467a211 100644 --- a/autotests/kconfig_compiler/kconfigcompiler_test.cpp +++ b/autotests/kconfig_compiler/kconfigcompiler_test.cpp @@ -143,7 +143,7 @@ void KConfigCompiler_Test::testRunning()      QFETCH(QString, testName);  #ifdef Q_OS_WIN -    testName += QStringLiteral(".exe"); +    testName += QLatin1String{".exe"};  #endif      QString program = QFINDTESTDATA(testName); diff --git a/autotests/kconfigtest.cpp b/autotests/kconfigtest.cpp index 0619f97f..2417d56e 100644 --- a/autotests/kconfigtest.cpp +++ b/autotests/kconfigtest.cpp @@ -1786,7 +1786,7 @@ void KConfigTest::testQStringUtf8()      QVERIFY(readFile.open(QFile::ReadOnly));      QByteArray fileBytes = readFile.readAll();  #ifdef Q_OS_WIN -    fileBytes.replace("\r\n", "\n"); +    fileBytes.replace(QLatin1String{"\r\n"}, QLatin1String{"\n"});  #endif      QCOMPARE(fileBytes, QByteArrayLiteral("[General]\nkey=") + serialized + QByteArrayLiteral("\n")); diff --git a/autotests/test_kconf_update.cpp b/autotests/test_kconf_update.cpp index 88ba385f..f08e06ca 100644 --- a/autotests/test_kconf_update.cpp +++ b/autotests/test_kconf_update.cpp @@ -47,7 +47,7 @@ static QString readFile(const QString &path)      QString ret = QString::fromUtf8(file.readAll());  #ifdef Q_OS_WIN      // KConfig always writes files with the native line ending, the test comparison uses \n -    ret.replace("\r\n", "\n"); +    ret.replace(QLatin1String{"\r\n"}, QLatin1String{"\n"});  #endif      return ret;  } | 
