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

All: Use Utils::SkipEmptyParts

Browse Source 
Task-number: QTCREATORBUG-24098
Change-Id: Iab45de9a9c17ddc39a0e343b1175d4f6cb94b098
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
hjk
2020-06-17 06:35:31 +02:00
parent 6e798401a0
commit 1c81a3b3e8
65 changed files with 236 additions and 156 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp
View File

@@ -41,11 +41,13 @@
#include <projectexplorer/projectexplorer.h>
#include <projectexplorer/projectmacroexpander.h>
#include <projectexplorer/target.h>
#include <qtsupport/baseqtversion.h>
#include <qtsupport/qtbuildaspects.h>
#include <qtsupport/qtkitinformation.h>
#include <utils/qtcassert.h>
#include <utils/stringutils.h>
#include <QDir>
#include <QLoggingCategory>
@@ -283,13 +285,7 @@ QStringList CMakeBuildConfiguration::extraCMakeArguments() const
QStringList CMakeBuildConfiguration::initialCMakeArguments() const
{
return aspect<InitialCMakeArgumentsAspect>()->value().split('\n',
#if QT_VERSION < QT_VERSION_CHECK(5, 14, 0)
QString::SkipEmptyParts
#else
Qt::SkipEmptyParts
#endif
);
return aspect<InitialCMakeArgumentsAspect>()->value().split('\n', Utils::SkipEmptyParts);
}
void CMakeBuildConfiguration::setExtraCMakeArguments(const QStringList &args)