Merge remote branch 'origin/2.0'

Conflicts:
	src/libs/qmljs/qmljs-lib.pri
	src/plugins/debugger/gdb/gdbengine.cpp
	src/plugins/debugger/gdb/gdbengine.h
	src/plugins/qmldesigner/components/itemlibrary/itemlibrary.cpp

diff --cc src/libs/qmljs/qmljs-lib.pri
index 5a030a0,aed9d8f..f04185e
--- 1/src/libs/qmljs/qmljs-lib.pri
--- 2/src/libs/qmljs/qmljs-lib.pri
+++ b/src/libs/qmljs/qmljs-lib.pri
@@@ -22,8 -22,7 +22,9 @@@ HEADERS += 
      $$PWD/qmljsscopebuilder.h \
      $$PWD/qmljslineinfo.h \
      $$PWD/qmljscompletioncontextfinder.h \
 +    $$PWD/qmljscomponentversion.h \
 +    $$PWD/qmljsmodelmanagerinterface.h \
+     $$PWD/qmljspropertyreader.h \
      $$PWD/qmljsrewriter.h
  
  SOURCES += \
@@@ -37,8 -36,7 +38,9 @@@
      $$PWD/qmljsscopebuilder.cpp \
      $$PWD/qmljslineinfo.cpp \
      $$PWD/qmljscompletioncontextfinder.cpp \
 +    $$PWD/qmljscomponentversion.cpp \
 +    $$PWD/qmljsmodelmanagerinterface.cpp \
+     $$PWD/qmljspropertyreader.cpp \
      $$PWD/qmljsrewriter.cpp
  
  OTHER_FILES += \