Merge commit 'origin/1.3'

Conflicts:
	src/plugins/cpptools/cppcodecompletion.h
	src/plugins/debugger/gdb/gdbengine.cpp
	src/plugins/qmleditor/QmlEditor.pluginspec

src/plugins/qmlprojectmanager/qmlproject.cpp

@@ -338,7 +338,12 @@ QmlRunConfiguration::QmlRunConfiguration(QmlProject *pro)
 {
     setName(tr("QML Viewer"));
 
-    m_qmlViewer = Utils::SynchronousProcess::locateBinary(QLatin1String("qmlviewer"));
+    // append creator/bin dir to search path (only useful for special creator-qml package)
+    const QString searchPath = QString(qgetenv("PATH"))
+                               + Utils::SynchronousProcess::pathSeparator()
+                               + QCoreApplication::applicationDirPath()
+;
+    m_qmlViewer = Utils::SynchronousProcess::locateBinary(searchPath, QLatin1String("qmlviewer"));
 }
 
 QmlRunConfiguration::~QmlRunConfiguration()

src/plugins/qmlprojectmanager/qmlprojectplugin.cpp

@@ -42,7 +42,6 @@
 #include <texteditor/texteditoractionhandler.h>
 
 #include <QtCore/QtPlugin>
-#include <QtCore/QDebug>
 
 using namespace QmlProjectManager;
 using namespace QmlProjectManager::Internal;