diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2018-06-11 16:01:18 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2018-06-11 16:01:18 +0200 |
| commit | 9b43b55dc0ac4457d05da0c422854754addc2aa9 (patch) | |
| tree | 84b924487688c15ef1329aab77a316489136df7f /src/plugins/qmlprojectmanager | |
| parent | 168e89e0a2bd475a4f4b7bf4aa6f207466e8a9bd (diff) | |
| parent | 4cba1d7c71484cc7250d9a7b12efa174817bdc95 (diff) | |
Merge remote-tracking branch 'origin/4.7'
Change-Id: I762dbddb0f337e9a5fc4b113c7876813e9f45c9c
Diffstat (limited to 'src/plugins/qmlprojectmanager')
| -rw-r--r-- | src/plugins/qmlprojectmanager/qmlproject.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/qmlprojectmanager/qmlproject.cpp b/src/plugins/qmlprojectmanager/qmlproject.cpp index ed77c217495..a9a883d63f4 100644 --- a/src/plugins/qmlprojectmanager/qmlproject.cpp +++ b/src/plugins/qmlprojectmanager/qmlproject.cpp @@ -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. |