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

Merge remote-tracking branch 'origin/4.7'

Browse Source 
Change-Id: I762dbddb0f337e9a5fc4b113c7876813e9f45c9c
This commit is contained in:
Eike Ziller
2018-06-11 16:01:18 +02:00
parent 168e89e0a2 4cba1d7c71
commit 9b43b55dc0
62 changed files with 519 additions and 399 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/qmlprojectmanager/qmlproject.cpp
View File

@@ -294,7 +294,7 @@ QList<Task> QmlProject::projectIssues(const Kit *k) const
} else {
// Non-desktop Qt on a desktop device? We don't support that.
result.append(createProjectTask(Task::TaskType::Error,
tr("Non-desktop Qt is used with a Desktop device.")));
tr("Non-desktop Qt is used with a desktop device.")));
}
} else {
// If not a desktop device, don't check the Qt version for qmlscene.