diff options
| author | Eike Ziller <[email protected]> | 2014-01-15 14:04:41 +0100 |
|---|---|---|
| committer | Eike Ziller <[email protected]> | 2014-01-15 14:04:41 +0100 |
| commit | 851f255b9dfc81c667f02994c0cd3f9cda3f973c (patch) | |
| tree | 0bb41ddef303f0ae8a8635bca360ce4f2489e5fa /src/plugins/debugger/debuggersourcepathmappingwidget.cpp | |
| parent | 8ab5b7ec0bc10fc35651f3a1046b26d815c24810 (diff) | |
| parent | 8d04b65ae9d5d35e763146d12023c794c743a3fd (diff) | |
Merge remote-tracking branch 'origin/3.0'
Conflicts:
src/plugins/qmldesigner/components/formeditor/anchorindicatorgraphicsitem.cpp
src/plugins/qmldesigner/components/propertyeditor/propertyeditorview.cpp
src/plugins/qmlprofiler/qmlprofilertraceview.cpp
Change-Id: I778a0c2d0f1b4f799caaa2c2cc5daf94ec7ca352
Diffstat (limited to 'src/plugins/debugger/debuggersourcepathmappingwidget.cpp')
| -rw-r--r-- | src/plugins/debugger/debuggersourcepathmappingwidget.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/plugins/debugger/debuggersourcepathmappingwidget.cpp b/src/plugins/debugger/debuggersourcepathmappingwidget.cpp index 86d3c673f96..dd5ed64d51d 100644 --- a/src/plugins/debugger/debuggersourcepathmappingwidget.cpp +++ b/src/plugins/debugger/debuggersourcepathmappingwidget.cpp @@ -49,8 +49,7 @@ using namespace Utils; #if defined(Q_OS_WIN) static const char* qtBuildPaths[] = { "Q:/qt5_workdir/w/s", - "C:/iwmake/build_mingw_opensource", - "C:/ndk_buildrepos/qt-desktop/src"}; + "C:/work/build/qt5_workdir/w/s"}; #elif defined(Q_OS_MAC) static const char* qtBuildPaths[] = {}; #else |