diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-04-26 10:12:21 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-04-26 13:08:13 +0200 |
| commit | 1169242f14f9e27cbe4e3360dd47d0825eaf9e60 (patch) | |
| tree | 63e79e41bc48b9dc3cd40d3c29bacfd303c3c7b6 /tools/qmlprofiler/qmlprofilerapplication.cpp | |
| parent | 9f731b6841bbc9b7425a95303369d05be895f949 (diff) | |
| parent | f95c18b04e260a633d7a1d7cb0d3aaca01f9782f (diff) | |
Merge remote-tracking branch 'origin/5.11' into dev
Conflicts:
src/imports/imports.pro
src/src.pro
Change-Id: Icdc39b6169d15b2102acd0e4d550a8d91e4b0744
Diffstat (limited to 'tools/qmlprofiler/qmlprofilerapplication.cpp')
| -rw-r--r-- | tools/qmlprofiler/qmlprofilerapplication.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/tools/qmlprofiler/qmlprofilerapplication.cpp b/tools/qmlprofiler/qmlprofilerapplication.cpp index 64cd4ec87f..6732766b46 100644 --- a/tools/qmlprofiler/qmlprofilerapplication.cpp +++ b/tools/qmlprofiler/qmlprofilerapplication.cpp @@ -70,8 +70,7 @@ static const char *features[] = { "debugmessages" }; -Q_STATIC_ASSERT(sizeof(features) == - QQmlProfilerDefinitions::MaximumProfileFeature * sizeof(char *)); +Q_STATIC_ASSERT(sizeof(features) == MaximumProfileFeature * sizeof(char *)); QmlProfilerApplication::QmlProfilerApplication(int &argc, char **argv) : QCoreApplication(argc, argv), @@ -168,7 +167,7 @@ void QmlProfilerApplication::parseArguments() parser.addOption(record); QStringList featureList; - for (int i = 0; i < QQmlProfilerDefinitions::MaximumProfileFeature; ++i) + for (int i = 0; i < MaximumProfileFeature; ++i) featureList << QLatin1String(features[i]); QCommandLineOption include(QLatin1String("include"), |