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

Manual test: Silence deprecation warning of proparser test with Qt6

Browse Source 
Change-Id: I89fcc27e9d8f87fc35f677eea09a50ae3226a3a1
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
This commit is contained in:
Christian Stenger
2022-02-01 12:08:59 +01:00
parent 779c59a3e6
commit d9f1421841
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
tests/manual/proparser/main.cpp
View File

@@ -142,8 +142,13 @@ int main(int argc, char **argv)
QMakeGlobals option; QMakeGlobals option;
QString qmake = QString::fromLocal8Bit(qgetenv("TESTREADER_QMAKE")); QString qmake = QString::fromLocal8Bit(qgetenv("TESTREADER_QMAKE"));
if (qmake.isEmpty()) if (qmake.isEmpty()) {
#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
qmake = QLibraryInfo::location(QLibraryInfo::BinariesPath) + QLatin1String("/qmake"); qmake = QLibraryInfo::location(QLibraryInfo::BinariesPath) + QLatin1String("/qmake");
#else
qmake = QLibraryInfo::path(QLibraryInfo::BinariesPath) + QLatin1String("/qmake");
#endif
}
option.qmake_abslocation = QDir::cleanPath(qmake); option.qmake_abslocation = QDir::cleanPath(qmake);
option.initProperties(); option.initProperties();