diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-03-01 01:00:23 +0100 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@qt.io> | 2020-03-03 14:13:02 +0100 |
| commit | 63312fe2ec1c1d8c0efabc02e3af8e5b47ca320e (patch) | |
| tree | fc850de8f31581cc6a64db7a78d1cca479e20ce9 /tests/auto/tools/qmakelib | |
| parent | 5ebb03c47604e0597502fbe1069de636987f33fc (diff) | |
| parent | fbebc93617d99d2bf8fed559f17dba8bed15a063 (diff) | |
Merge remote-tracking branch 'origin/5.15' into dev
Change-Id: If36d96c0fef3de5ab6503977501c55c62a2ecc97
Diffstat (limited to 'tests/auto/tools/qmakelib')
| -rw-r--r-- | tests/auto/tools/qmakelib/evaltest.cpp | 2 | ||||
| -rw-r--r-- | tests/auto/tools/qmakelib/parsertest.cpp | 2 |
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); |