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

Merge remote-tracking branch 'origin/2.6'

Browse Source 
Conflicts:
	src/libs/utils/fileutils.cpp
	src/plugins/remotelinux/deployablefilesperprofile.cpp
	src/plugins/remotelinux/genericdirectuploadservice.cpp
	src/tools/qtcreatorcrashhandler/main.cpp

Change-Id: I830287691e7085fe9c94597e23ec7be64eb8be42
This commit is contained in:
Eike Ziller
2012-10-09 11:50:17 +02:00
parent 8ec446efdc 2b56943a8e
commit d5d1c5e394
76 changed files with 538 additions and 292 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/git/gitorious/gitorious.cpp
View File

@@ -281,7 +281,7 @@ QList<GitoriousRepository> GitoriousProjectReader::readRepositories(QXmlStreamRe
int defaultType = -1;
// The "mainlines"/"clones" elements are not used in the
// Nokia setup, handle them optionally.
// QtProject setup, handle them optionally.
while (!reader.atEnd()) {
reader.readNext();

6
src/plugins/git/gitorious/gitorious.h
View File

@@ -51,9 +51,9 @@ struct GitoriousRepository
enum Type {
MainLineRepository,
CloneRepository,
BaselineRepository, // Nokia extension
SharedRepository, // Nokia extension
PersonalRepository // Nokia extension
BaselineRepository, // QtProject extension
SharedRepository, // QtProject extension
PersonalRepository // QtProject extension
};
GitoriousRepository();