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

6 files changed, 7 insertions, 7 deletions

diff --git a/src/plugins/debugger/debuggerprotocol.cpp b/src/plugins/debugger/debuggerprotocol.cpp
index 83fa67abe6..1897527e49 100644
--- a/src/plugins/debugger/debuggerprotocol.cpp
+++ b/src/plugins/debugger/debuggerprotocol.cpp
@@ -56,7 +56,7 @@ uchar fromhex(uchar c)
         return 10 + c - 'a';
     if (c >= 'A' && c <= 'Z')
         return 10 + c - 'A';
-    return -1;
+    return UCHAR_MAX;
 }
 
 void skipCommas(const char *&from, const char *to)
@@ -147,7 +147,7 @@ QByteArray GdbMi::parseCString(const char *&from, const char *to)
                         uchar prod = 0;
                         while (true) {
                             uchar val = fromhex(c);
-                            if (val == uchar(-1))
+                            if (val == UCHAR_MAX)
                                 break;
                             prod = prod * 16 + val;
                             if (++chars == 3 || src == end)
diff --git a/src/plugins/debugger/debuggersourcepathmappingwidget.cpp b/src/plugins/debugger/debuggersourcepathmappingwidget.cpp
index 86d3c673f9..dd5ed64d51 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
diff --git a/src/plugins/debugger/debuggerstartparameters.h b/src/plugins/debugger/debuggerstartparameters.h
index 52d1054b0a..17dc02a7b6 100644
--- a/src/plugins/debugger/debuggerstartparameters.h
+++ b/src/plugins/debugger/debuggerstartparameters.h
@@ -86,6 +86,7 @@ public:
     DebuggerEngineType secondSlaveEngineType;
     DebuggerEngineType cppEngineType;
     QString sysRoot;
+    QString deviceSymbolsRoot;
     QString debuggerCommand;
     ProjectExplorer::Abi toolChainAbi;
     ProjectExplorer::IDevice::ConstPtr device;
diff --git a/src/plugins/debugger/lldb/lldbengine.cpp b/src/plugins/debugger/lldb/lldbengine.cpp
index 9b8d686f10..624200d840 100644
--- a/src/plugins/debugger/lldb/lldbengine.cpp
+++ b/src/plugins/debugger/lldb/lldbengine.cpp
@@ -208,7 +208,7 @@ void LldbEngine::setupInferior()
     QTC_CHECK(sp.attachPID <= 0 || (sp.startMode == AttachCrashedExternal
                                 || sp.startMode == AttachExternal));
     cmd.arg("attachPid", sp.attachPID);
-    cmd.arg("sysRoot", sp.sysRoot);
+    cmd.arg("sysRoot", sp.deviceSymbolsRoot.isEmpty() ? sp.sysRoot : sp.deviceSymbolsRoot);
     cmd.arg("remoteChannel", ((sp.startMode == AttachToRemoteProcess
                                || sp.startMode == AttachToRemoteServer)
                               ? sp.remoteChannel : QString()));
diff --git a/src/plugins/debugger/qml/qmllivetextpreview.cpp b/src/plugins/debugger/qml/qmllivetextpreview.cpp
index ec82d9c280..ed9ee11245 100644
--- a/src/plugins/debugger/qml/qmllivetextpreview.cpp
+++ b/src/plugins/debugger/qml/qmllivetextpreview.cpp
@@ -642,7 +642,7 @@ void QmlLiveTextPreview::editorContentsChanged()
 
 void QmlLiveTextPreview::onAutomaticUpdateFailed()
 {
-    showSyncWarning(AutomaticUpdateFailed, QString(), -1, -1);
+    showSyncWarning(AutomaticUpdateFailed, QString(), UINT_MAX, UINT_MAX);
 }
 
 QList<int> QmlLiveTextPreview::objectReferencesForOffset(quint32 offset)
diff --git a/src/plugins/debugger/registerhandler.cpp b/src/plugins/debugger/registerhandler.cpp
index 71904f1ac4..4b068a9cad 100644
--- a/src/plugins/debugger/registerhandler.cpp
+++ b/src/plugins/debugger/registerhandler.cpp
@@ -293,7 +293,7 @@ static int bitWidthFromType(int type, int subType)
     return 0;
 }
 
-static const int TopLevelId = -1;
+static const uint TopLevelId = UINT_MAX;
 static bool isTopLevelItem(const QModelIndex &index)
 {
     return quintptr(index.internalId()) == quintptr(TopLevelId);