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

QmlProfiler: Fix Qt version comparison for connection type

Browse Source 
The previous code would fail on Qt versions n.0 to n.5 with n > 5.

Change-Id: I7e9d512bab269137862370db86e0da19e250059e
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
This commit is contained in:
Ulf Hermann
2016-02-09 10:46:36 +01:00
parent 5e81050450
commit 6980ccf8e1
1 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/plugins/qmlprofiler/qmlprofilerruncontrolfactory.cpp
View File

@@ -86,8 +86,7 @@ RunControl *QmlProfilerRunControlFactory::create(RunConfiguration *runConfigurat
AnalyzerConnection connection; AnalyzerConnection connection;
const QtSupport::BaseQtVersion *version = QtSupport::QtKitInformation::qtVersion(kit); const QtSupport::BaseQtVersion *version = QtSupport::QtKitInformation::qtVersion(kit);
if (version) { if (version) {
QtSupport::QtVersionNumber versionNumber = version->qtVersion(); if (version->qtVersion() >= QtSupport::QtVersionNumber(5, 6, 0))
if (versionNumber.majorVersion >= 5 && versionNumber.minorVersion >= 6)
connection.analyzerSocket = LocalQmlProfilerRunner::findFreeSocket(); connection.analyzerSocket = LocalQmlProfilerRunner::findFreeSocket();
else else
connection.analyzerPort = LocalQmlProfilerRunner::findFreePort(connection.analyzerHost); connection.analyzerPort = LocalQmlProfilerRunner::findFreePort(connection.analyzerHost);