Merge remote branch 'origin/2.1'

Conflicts: share/qtcreator/templates/mobileapp/app.pro share/qtcreator/templates/qmlapp/app.pro src/plugins/cpptools/cpptools.pro
2010-10-04 16:07:46 +02:00
parent a84ad42741 c7142affef
commit 6b6d9871b8
386 changed files with 12674 additions and 4573 deletions
--- a/src/plugins/cpptools/cpptools.pro
+++ b/src/plugins/cpptools/cpptools.pro
@@ -26,7 +26,9 @@ HEADERS += completionsettingspage.h \
    cppfindreferences.h \
    cppcodeformatter.h \
    symbolsfindfilter.h \
-    uicodecompletionsupport.h
+    uicodecompletionsupport.h \
+    insertionpointlocator.h \
+    cpprefactoringchanges.h

 SOURCES += completionsettingspage.cpp \
    cppclassesfilter.cpp \
@@ -44,7 +46,9 @@ SOURCES += completionsettingspage.cpp \
    cppfindreferences.cpp \
    cppcodeformatter.cpp \
    symbolsfindfilter.cpp \
-    uicodecompletionsupport.cpp
+    uicodecompletionsupport.cpp \
+    insertionpointlocator.cpp \
+    cpprefactoringchanges.cpp

 FORMS += completionsettingspage.ui \
    cppfilesettingspage.ui