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

3
src/plugins/qmlprojectmanager/fileformat/qmlprojectfileformat.cpp
View File

@@ -88,9 +88,8 @@ QmlProjectItem *QmlProjectFileFormat::parseProjectFile(const QString &fileName,
if (importPathsProperty.isValid())
projectItem->setImportPaths(importPathsProperty.toStringList());
if (debug) {
if (debug)
qDebug() << "importPath:" << importPathsProperty << "mainFile:" << mainFileProperty;
}
foreach (const QmlJS::SimpleReaderNode::Ptr &childNode, rootNode->children()) {
if (childNode->name() == QLatin1String("QmlFiles")) {

7
src/plugins/qmlprojectmanager/qmlapp.cpp
View File

@@ -418,13 +418,12 @@ Core::GeneratedFiles QmlApp::generateFiles(QString *errorMessage)
if (!canAddTemplate)
return Core::GeneratedFiles();
if (templateFile.fileName() == QLatin1String("main.pro")) {
if (templateFile.fileName() == QLatin1String("main.pro"))
files.last().setAttributes(Core::GeneratedFile::OpenProjectAttribute);
} else if (templateFile.fileName() == QLatin1String("main.qmlproject")) {
else if (templateFile.fileName() == QLatin1String("main.qmlproject"))
files.last().setAttributes(Core::GeneratedFile::OpenProjectAttribute);
} else if (templateFile.fileName() == m_templateInfo.openFile) {
else if (templateFile.fileName() == m_templateInfo.openFile)
files.last().setAttributes(Core::GeneratedFile::OpenEditorAttribute);
}
}
}

5
src/plugins/qmlprojectmanager/qmlproject.cpp
View File

@@ -391,11 +391,10 @@ bool QmlProject::fromMap(const QVariantMap &map)
if (!kits.isEmpty()) {
Kit *kit = 0;
if (kits.contains(KitManager::defaultKit())) {
if (kits.contains(KitManager::defaultKit()))
kit = KitManager::defaultKit();
} else {
else
kit = kits.first();
}
addTarget(createTarget(kit));
}
}