diff options
| author | Eike Ziller <eike.ziller@digia.com> | 2014-09-03 16:07:46 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@digia.com> | 2014-09-03 16:08:02 +0200 |
| commit | 49db3a450a6d15ae0327b8e3713920ac19320972 (patch) | |
| tree | 309c83eb1dbb6321845d6a1db8fbc49428b20340 /src/plugins/winrt | |
| parent | afd56bd8ada761b87c40d80a07cd3b3766b2d2f8 (diff) | |
| parent | d030a960a0e6e1dda89e20b60e5252842fe83f49 (diff) | |
| download | qt-creator-49db3a450a6d15ae0327b8e3713920ac19320972.tar.gz | |
Merge remote-tracking branch 'origin/3.2'
Conflicts:
qtcreator.pri
qtcreator.qbs
src/plugins/coreplugin/editormanager/editormanager.cpp
src/plugins/cppeditor/cppeditor.cpp
src/plugins/remotelinux/remotelinuxdebugsupport.cpp
src/plugins/texteditor/basetexteditor.cpp
Change-Id: I0da7c1cf2506b12d0563795aa8177fc45e97050f
Diffstat (limited to 'src/plugins/winrt')
| -rw-r--r-- | src/plugins/winrt/winrtdebugsupport.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/winrt/winrtdebugsupport.cpp b/src/plugins/winrt/winrtdebugsupport.cpp index bb6bd4a373..ae6d322814 100644 --- a/src/plugins/winrt/winrtdebugsupport.cpp +++ b/src/plugins/winrt/winrtdebugsupport.cpp @@ -84,7 +84,7 @@ RunControl *WinRtDebugSupport::createDebugRunControl(WinRtRunConfiguration *runC + QLatin1String("/winrtdebughelper.exe")); if (!debuggerHelper.isExecutable()) { *errorMessage = tr("The WinRT debugging helper is missing from your Qt Creator " - "installation. It was assumed to be located at").arg( + "installation. It was assumed to be located at %1").arg( debuggerHelper.absoluteFilePath()); return 0; } |