Merge remote branch 'origin/2.0'

Conflicts: share/qtcreator/gdbmacros/dumper.py src/libs/qmljs/qmljs-lib.pri src/plugins/fakevim/fakevimhandler.cpp
2010-07-06 15:34:50 +02:00
parent 7feed7318b 15047f8816
commit 1a2a4f6387
50 changed files with 1838 additions and 119 deletions
--- a/src/libs/qmljs/qmljs-lib.pri
+++ b/src/libs/qmljs/qmljs-lib.pri
@@ -24,6 +24,7 @@ HEADERS += \
    $$PWD/qmljscompletioncontextfinder.h \
    $$PWD/qmljscomponentversion.h \
    $$PWD/qmljsmodelmanagerinterface.h \
+    $$PWD/qmljsicontextpane.h \
    $$PWD/qmljspropertyreader.h \
    $$PWD/qmljsrewriter.h