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

Merge remote-tracking branch 'origin/2.7'

Browse Source 
Conflicts:
	src/plugins/qnx/blackberrydeployconfiguration.cpp

Change-Id: I16d1c7717f4bc25ba7e8dbdd5be6580fafe3f33d
This commit is contained in:
Oswald Buddenhagen
2013-02-28 12:02:40 +01:00
parent e84647aef4 fac11973af
commit 6bbdeec812
346 changed files with 24024 additions and 9162 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/plugins/qt4projectmanager/qt4nodes.cpp
View File

@@ -287,9 +287,9 @@ struct InternalNode
QMap<QString, InternalNode *> subnodes;
QStringList files;
ProjectExplorer::FileType type;
int priority;
QString displayName;
QString typeName;
int priority;
QString fullPath;
QIcon icon;
@@ -305,7 +305,7 @@ struct InternalNode
qDeleteAll(subnodes);
}
// Creates a tree structure from a list of absolute file paths.
// Creates: a tree structure from a list of absolute file paths.
// Empty directories are compressed into a single entry with a longer path.
// * project
// * /absolute/path
@@ -1437,9 +1437,9 @@ Qt4ProFileNode::Qt4ProFileNode(Qt4Project *project,
const QString &filePath,
QObject *parent)
: Qt4PriFileNode(project, this, filePath),
m_projectType(InvalidProject),
m_validParse(false),
m_parseInProgress(true),
m_projectType(InvalidProject),
m_readerExact(0),
m_readerCumulative(0)
{
@@ -1943,6 +1943,7 @@ void Qt4ProFileNode::applyEvaluate(EvalResult evalResult, bool async)
= m_readerExact->values(QLatin1String("TARGET_VERSION_EXT"));
newVarValues[StaticLibExtensionVar] = m_readerExact->values(QLatin1String("QMAKE_EXTENSION_STATICLIB"));
newVarValues[ShLibExtensionVar] = m_readerExact->values(QLatin1String("QMAKE_EXTENSION_SHLIB"));
newVarValues[AndroidArchVar] = m_readerExact->values(QLatin1String("ANDROID_TARGET_ARCH"));
m_isDeployable = false;
if (m_projectType == ApplicationTemplate) {