feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Merge remote-tracking branch 'origin/2.8'

Browse Source 
Conflicts:
	src/plugins/coreplugin/coreplugin.pro
	src/plugins/coreplugin/coreplugin.qbs
	src/plugins/cppeditor/cppdoxygen_test.cpp
	src/plugins/cppeditor/cppquickfix_test.cpp
	src/plugins/cppeditor/followsymbol_switchmethoddecldef_test.cpp
	src/plugins/cpptools/cppcompletion_test.cpp

Change-Id: I392229af933c1e56b9ea459d4d240a2144b4bfcb
This commit is contained in:
Eike Ziller
2013-10-01 10:04:18 +02:00
parent 1d23165922 d9602ca550
commit a0b2d10822
8 changed files with 117 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/coreplugin/coreplugin.pro
View File

@@ -237,6 +237,8 @@ else:unix {
OTHER_FILES += editormanager/BinFiles.mimetypes.xml
equals(TEST, 1) {
SOURCES += testdatadir.cpp
HEADERS += testdatadir.h
SOURCES += testdatadir.cpp \
plugintestutils.cpp
HEADERS += testdatadir.h \
plugintestutils.h
}