diff options
| author | Eike Ziller <eike.ziller@digia.com> | 2012-11-16 15:31:02 +0100 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@digia.com> | 2012-11-16 15:31:02 +0100 |
| commit | 3e7d94c3626c6904320018d2eedb1407925ed3d5 (patch) | |
| tree | 57479823338e07de3c3ce41bdda46abf58f4ac57 /src/plugins/qtsupport/qtoptionspage.cpp | |
| parent | 51bca851174c347edcc6b148ee3a67d70e5fa9eb (diff) | |
| parent | 5981b1e5509395bc0eb0ff7071e63a529b31fb11 (diff) | |
| download | qt-creator-3e7d94c3626c6904320018d2eedb1407925ed3d5.tar.gz | |
Merge remote-tracking branch 'origin/2.6'
Conflicts:
qtcreator.pri
qtcreator.qbs
Change-Id: Ib5e7c433606406d123b4a384ae1b48e2dbb26824
Diffstat (limited to 'src/plugins/qtsupport/qtoptionspage.cpp')
| -rw-r--r-- | src/plugins/qtsupport/qtoptionspage.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/qtsupport/qtoptionspage.cpp b/src/plugins/qtsupport/qtoptionspage.cpp index 6bdb044dd6..8cfc89763d 100644 --- a/src/plugins/qtsupport/qtoptionspage.cpp +++ b/src/plugins/qtsupport/qtoptionspage.cpp @@ -702,7 +702,7 @@ void QtOptionsPageWidget::editPath() if (current->type() != version->type()) { // not the same type, error out QMessageBox::critical(this, tr("Incompatible Qt Versions"), - tr("The Qt version selected must be for the same target."), + tr("The Qt version selected must be for the same device type."), QMessageBox::Ok); delete version; return; |