diff options
| author | hjk <hjk@qt.io> | 2020-01-29 07:45:27 +0100 |
|---|---|---|
| committer | hjk <hjk@qt.io> | 2020-01-29 07:46:56 +0000 |
| commit | 597445ff06b5af06113d2c4f2b865d77d6b6eecc (patch) | |
| tree | 29464c1a25621e8ad70cf0c5d2cc0da7af3b670b /src/plugins/qmakeprojectmanager | |
| parent | 10537d84694024063f279c93f7d173d5f402f63a (diff) | |
Qmake: Handle QFlags deprecation
Change-Id: I2565ce0b1b10d4cb663dc6ad2721b717ce48c17d
Reviewed-by: David Schulz <david.schulz@qt.io>
Diffstat (limited to 'src/plugins/qmakeprojectmanager')
| -rw-r--r-- | src/plugins/qmakeprojectmanager/librarydetailscontroller.cpp | 6 | ||||
| -rw-r--r-- | src/plugins/qmakeprojectmanager/makefileparse.cpp | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/plugins/qmakeprojectmanager/librarydetailscontroller.cpp b/src/plugins/qmakeprojectmanager/librarydetailscontroller.cpp index 0d152832279..4569ad9dfa0 100644 --- a/src/plugins/qmakeprojectmanager/librarydetailscontroller.cpp +++ b/src/plugins/qmakeprojectmanager/librarydetailscontroller.cpp @@ -120,7 +120,7 @@ QString LibraryDetailsController::libraryPlatformFilter() const void LibraryDetailsController::updateGui() { // read values from gui - m_platforms = nullptr; + m_platforms = {}; if (libraryDetailsWidget()->linCheckBox->isChecked()) m_platforms |= AddLibraryWizard::LinuxPlatform; if (libraryDetailsWidget()->macCheckBox->isChecked()) @@ -448,7 +448,7 @@ static QString generateLibsSnippet(AddLibraryWizard::Platforms platforms, | AddLibraryWizard::WindowsMSVCPlatform); AddLibraryWizard::Platforms diffPlatforms = platforms ^ commonPlatforms; - AddLibraryWizard::Platforms generatedPlatforms = nullptr; + AddLibraryWizard::Platforms generatedPlatforms; QString snippetMessage; QTextStream str(&snippetMessage); @@ -534,7 +534,7 @@ static QString generatePreTargetDepsSnippet(AddLibraryWizard::Platforms platform QString snippetMessage; QTextStream str(&snippetMessage); str << "\n"; - AddLibraryWizard::Platforms generatedPlatforms = nullptr; + AddLibraryWizard::Platforms generatedPlatforms; AddLibraryWizard::Platforms windowsPlatforms = platforms & (AddLibraryWizard::WindowsMinGWPlatform | AddLibraryWizard::WindowsMSVCPlatform); AddLibraryWizard::Platforms commonPlatforms = platforms; diff --git a/src/plugins/qmakeprojectmanager/makefileparse.cpp b/src/plugins/qmakeprojectmanager/makefileparse.cpp index 7c10fabe656..dff3a1b2613 100644 --- a/src/plugins/qmakeprojectmanager/makefileparse.cpp +++ b/src/plugins/qmakeprojectmanager/makefileparse.cpp @@ -520,7 +520,7 @@ void QmakeProjectManagerPlugin::testMakefileParser() QCOMPARE(Utils::QtcProcess::splitArgs(parser.unparsedArguments()), Utils::QtcProcess::splitArgs(unparsedArguments)); - QCOMPARE(parser.effectiveBuildConfig(nullptr), effectiveBuildConfig); + QCOMPARE(parser.effectiveBuildConfig({}), effectiveBuildConfig); const QMakeStepConfig qmsc = parser.config(); QCOMPARE(qmsc.archConfig, static_cast<QMakeStepConfig::TargetArchConfig>(archConfig)); |