summaryrefslogtreecommitdiffstats
path: root/tests/auto/tools
diff options
context:
space:
mode:
authorEdward Welbourne <edward.welbourne@qt.io>2020-02-25 17:19:30 +0100
committerEdward Welbourne <edward.welbourne@qt.io>2020-02-28 15:37:11 +0100
commit26b1cf2bbaa5a847f8b03137f666b7f32b16d843 (patch)
tree7dcf3a2f9d32ee2c834e481edb72f249348bc5bf /tests/auto/tools
parent00f0863cbe7236742403a591b6409e480402cddf (diff)
QMake: Use Qt::SplitBehavior in preference to QString::SplitBehavior
The Qt version was added in 5.14 "for use as eventual replacement for QString::SplitBehavior." Move another step closer to that goal. Change-Id: I3f1b836cfb47bba0fdc27f2c3aa7b0576d123dca Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'tests/auto/tools')
-rw-r--r--tests/auto/tools/qmakelib/evaltest.cpp2
-rw-r--r--tests/auto/tools/qmakelib/parsertest.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/tests/auto/tools/qmakelib/evaltest.cpp b/tests/auto/tools/qmakelib/evaltest.cpp
index 948e2b3121..3a01590707 100644
--- a/tests/auto/tools/qmakelib/evaltest.cpp
+++ b/tests/auto/tools/qmakelib/evaltest.cpp
@@ -2859,7 +2859,7 @@ void tst_qmakelib::proEval()
QString infile = m_indir + "/test.pro";
bool verified = true;
QMakeTestHandler handler;
- handler.setExpectedMessages(msgs.replace("##:", infile + ':').split('\n', QString::SkipEmptyParts));
+ handler.setExpectedMessages(msgs.replace("##:", infile + ':').split('\n', Qt::SkipEmptyParts));
QMakeVfs vfs;
ProFileCache cache;
QMakeParser parser(&cache, &vfs, &handler);
diff --git a/tests/auto/tools/qmakelib/parsertest.cpp b/tests/auto/tools/qmakelib/parsertest.cpp
index f736bf38bf..b57ea75c34 100644
--- a/tests/auto/tools/qmakelib/parsertest.cpp
+++ b/tests/auto/tools/qmakelib/parsertest.cpp
@@ -2028,7 +2028,7 @@ void tst_qmakelib::proParser()
bool verified = true;
QMakeTestHandler handler;
- handler.setExpectedMessages(msgs.split('\n', QString::SkipEmptyParts));
+ handler.setExpectedMessages(msgs.split('\n', Qt::SkipEmptyParts));
QMakeVfs vfs;
QMakeParser parser(0, &vfs, &handler);
ProFile *pro = parser.parsedProBlock(QStringRef(&in), 0, "in", 1, QMakeParser::FullGrammar);