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

Merge remote-tracking branch 'origin/3.0'

Browse Source 
Conflicts:
	share/qtcreator/debugger/gdbbridge.py

Change-Id: I32d8158c475f927b50ef06fde9ab8189ebdbcbbc
This commit is contained in:
Eike Ziller
2013-11-15 10:26:57 +01:00
parent b9a85f5a08 0904f6e836
commit 4538ccb46c
326 changed files with 6324 additions and 4987 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/qmakeprojectmanager/qmakenodes.cpp
View File

@@ -1245,6 +1245,7 @@ QStringList QmakePriFileNode::varNames(ProjectExplorer::FileType type)
case ProjectExplorer::HeaderType:
vars << QLatin1String("HEADERS");
vars << QLatin1String("OBJECTIVE_HEADERS");
vars << QLatin1String("PRECOMPILED_HEADER");
break;
case ProjectExplorer::SourceType:
vars << QLatin1String("SOURCES");
@@ -1318,6 +1319,7 @@ QStringList QmakePriFileNode::varNamesForRemoving()
QStringList vars;
vars << QLatin1String("HEADERS");
vars << QLatin1String("OBJECTIVE_HEADERS");
vars << QLatin1String("PRECOMPILED_HEADER");
vars << QLatin1String("SOURCES");
vars << QLatin1String("OBJECTIVE_SOURCES");
vars << QLatin1String("RESOURCES");