Merge remote-tracking branch 'origin/4.0'

Conflicts:
	qtcreator.pri
	qtcreator.qbs
	src/plugins/debugger/debuggerruncontrol.cpp

Change-Id: I81b43480a1369e3d7be60ae26e812dda6b962b0b

src/plugins/texteditor/codeassist/assistinterface.h

@@ -29,8 +29,8 @@
 
 #include <texteditor/texteditor_global.h>
 
-
 #include <QString>
+#include <QVector>
 
 QT_BEGIN_NAMESPACE
 class QTextDocument;
@@ -63,6 +63,7 @@ private:
     QString m_fileName;
     AssistReason m_reason;
     QString m_text;
+    QVector<int> m_userStates;
 };
 
 } // namespace TextEditor