feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Do not use QDir::separator() in QML reformatter test

Browse Source 
That created a mix of / and \\ while building the path. Qt promises to
build paths that conforms to underlying OS if we always use /.

Amends  ffcbbecf27

Change-Id: Iebcb739cc02f0a2d6dd8953943ecfa9cf8fc9aea
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Semih Yavuz
2023-11-09 13:44:32 +01:00
parent e3c1179abb
commit 5b1aa26e47
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
tests/auto/qml/reformatter/tst_reformatter.cpp
View File

@@ -50,8 +50,8 @@ void tst_Reformatter::test_data()
// makes a change inline, for example whitespace removal. We omit // makes a change inline, for example whitespace removal. We omit
// those files in this test. // those files in this test.
QSet<QString> excludedFiles; QSet<QString> excludedFiles;
excludedFiles << QString::fromLatin1(TESTSRCDIR) + QDir::separator() + "typeAnnotations.qml"; excludedFiles << QString::fromLatin1(TESTSRCDIR) + "/typeAnnotations.qml";
excludedFiles << QString::fromLatin1(TESTSRCDIR) + QDir::separator() + "typeAnnotations.formatted.qml"; excludedFiles << QString::fromLatin1(TESTSRCDIR) + "/typeAnnotations.formatted.qml";
QDirIterator it(TESTSRCDIR, QStringList() << QLatin1String("*.qml") << QLatin1String("*.js"), QDir::Files); QDirIterator it(TESTSRCDIR, QStringList() << QLatin1String("*.qml") << QLatin1String("*.js"), QDir::Files);
while (it.hasNext()) { while (it.hasNext()) {
@@ -103,8 +103,8 @@ void tst_Reformatter::reformatter_data()
QTest::addColumn<QString>("formattedFilePath"); QTest::addColumn<QString>("formattedFilePath");
QTest::newRow("typeAnnotations") QTest::newRow("typeAnnotations")
<< QString::fromLatin1(TESTSRCDIR) + QDir::separator() + "typeAnnotations.qml" << QString::fromLatin1(TESTSRCDIR) + "/typeAnnotations.qml"
<< QString::fromLatin1(TESTSRCDIR) + QDir::separator() + "typeAnnotations.formatted.qml"; << QString::fromLatin1(TESTSRCDIR) +"/typeAnnotations.formatted.qml";
} }
void tst_Reformatter::reformatter() void tst_Reformatter::reformatter()