diff options
| author | Eike Ziller <eike.ziller@nokia.com> | 2011-10-28 10:17:44 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@nokia.com> | 2011-10-28 10:17:44 +0200 |
| commit | 81cce8902ee0383c57d90792e5dd52fe5d7f0b84 (patch) | |
| tree | 0ff6facd20b82a61803b1f8d22d3576aa0016469 /src/plugins/designer | |
| parent | 2ee0b36342446dd8816480d849138496321b154a (diff) | |
| parent | 5dcf7d2ef03827329e2d57ac33ac391abf278d57 (diff) | |
| download | qt-creator-81cce8902ee0383c57d90792e5dd52fe5d7f0b84.tar.gz | |
Merge remote-tracking branch 'origin/2.4'
Conflicts:
qtcreator.pri
src/libs/qmljs/qmljscheck.cpp
src/plugins/debugger/gdb/gdbengine.cpp
src/plugins/debugger/gdb/remotegdbserveradapter.cpp
src/plugins/plugins.pro
src/plugins/projectexplorer/buildmanager.cpp
src/plugins/qmldesigner/designercore/metainfo/nodemetainfo.cpp
Change-Id: Id2dcebf95b94dc46c1d85908ba1d1378aaf362ac
Diffstat (limited to 'src/plugins/designer')
| -rw-r--r-- | src/plugins/designer/qtcreatorintegration.cpp | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/src/plugins/designer/qtcreatorintegration.cpp b/src/plugins/designer/qtcreatorintegration.cpp index 421854a364..f756c8c196 100644 --- a/src/plugins/designer/qtcreatorintegration.cpp +++ b/src/plugins/designer/qtcreatorintegration.cpp @@ -68,6 +68,7 @@ #include <QtGui/QMessageBox> #include <QtCore/QFileInfo> +#include <QtCore/QDir> #include <QtCore/QDebug> #include <QtCore/QUrl> @@ -81,11 +82,13 @@ static QString msgClassNotFound(const QString &uiClassName, const QList<Document { QString files; foreach (const Document::Ptr &doc, docList) { - if (!files.isEmpty()) - files += QLatin1String(", "); - files += doc->fileName(); + files += QLatin1Char('\n'); + files += QDir::toNativeSeparators(doc->fileName()); } - return QtCreatorIntegration::tr("The class definition of '%1' could not be found in %2.").arg(uiClassName, files); + return QtCreatorIntegration::tr( + "The class containing '%1' could not be found in %2.\n" + "Please verify the #include-directives.") + .arg(uiClassName, files); } QtCreatorIntegration::QtCreatorIntegration(QDesignerFormEditorInterface *core, FormEditorW *parent) : |