feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Merge remote-tracking branch 'origin/3.0'

Browse Source 
Conflicts:
	src/plugins/qmldesigner/components/formeditor/anchorindicatorgraphicsitem.cpp
	src/plugins/qmldesigner/components/propertyeditor/propertyeditorview.cpp
	src/plugins/qmlprofiler/qmlprofilertraceview.cpp

Change-Id: I778a0c2d0f1b4f799caaa2c2cc5daf94ec7ca352
This commit is contained in:
Eike Ziller
2014-01-15 14:04:41 +01:00
parent 8ab5b7ec0b 8d04b65ae9
commit 851f255b9d
39 changed files with 303 additions and 674 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/plugins/debugger/debuggersourcepathmappingwidget.cpp
View File

@@ -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