feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
Files
f1cec4629e3a4d020b5372172d7adbdad6345898
qt-creator/src/plugins/coreplugin
History
Oswald Buddenhagen f1cec4629e Merge remote-tracking branch 'origin/2.6' 
Conflicts:
	src/libs/utils/tooltip/tips.cpp
	src/plugins/coreplugin/versiondialog.cpp
	src/plugins/projectexplorer/kitinformationconfigwidget.cpp
	src/plugins/qnx/blackberryapplicationrunner.cpp
	src/plugins/qnx/blackberrydeployconfiguration.cpp
	src/plugins/qnx/blackberrydeployconfiguration.h
	src/plugins/qt4projectmanager/qmakekitconfigwidget.cpp

Change-Id: I7886ec971942d9e0a9da237dcf4ceb1687abd71b
2013-01-29 15:52:36 +01:00
..
actionmanager
ActionManager: Require a valid context for shortcuts
2013-01-28 17:48:44 +01:00
dialogs
Core: simplify ILocator interface
2013-01-18 15:51:13 +01:00
editormanager
Use Id::fromString instead of the constructor.
2013-01-17 11:26:49 +01:00
images
Adapt qbs project files to new installation approach.
2013-01-24 13:02:32 +01:00
progressmanager
Remove braces for single lines of conditions
2013-01-08 10:48:18 +01:00
scriptmanager
Merge remote-tracking branch 'origin/2.6'
2012-10-05 21:20:50 +02:00
basefilewizard.cpp
Add whitespace after control keywords
2012-11-28 20:20:46 +01:00
basefilewizard.h
Adjust license headers
2012-10-05 17:12:56 +02:00
core_global.h
Adjust license headers
2012-10-05 17:12:56 +02:00
Core.pluginspec.in
Adjust license headers
2012-10-05 17:12:56 +02:00
core.qrc
Fix installation of desktop icons.
2012-10-08 16:18:35 +02:00
coreconstants.h
Add configuration option for default build directory
2012-11-21 13:25:56 +01:00
coreplugin_dependencies.pri
Fix compilation and rpath with the ssh class move.
2011-02-17 16:52:06 +01:00
coreplugin.cpp
Merge remote-tracking branch 'origin/2.6'
2013-01-29 15:52:36 +01:00
coreplugin.h
Adjust license headers
2012-10-05 17:12:56 +02:00
coreplugin.pri
Merge app_version.h and ide_version.h
2011-08-31 13:48:00 +02:00
coreplugin.pro
Generalize QT_NO_CAST_FROM_ASCII
2013-01-16 01:14:08 +01:00
coreplugin.qbs
Generalize QT_NO_CAST_FROM_ASCII
2013-01-16 01:14:08 +01:00
designmode.cpp
Add whitespace after control keywords
2012-11-28 20:20:46 +01:00
designmode.h
Adjust license headers
2012-10-05 17:12:56 +02:00
documentmanager.cpp
Core: Use the new Id methods in a few places
2013-01-17 10:57:22 +01:00
documentmanager.h
Add configuration option for default build directory
2012-11-21 13:25:56 +01:00
editmode.cpp
Adjust license headers
2012-10-05 17:12:56 +02:00
editmode.h
Adjust license headers
2012-10-05 17:12:56 +02:00
editortoolbar.cpp
Remove braces for single lines of conditions
2013-01-08 10:48:18 +01:00
editortoolbar.h
Adjust license headers
2012-10-05 17:12:56 +02:00
externaltool.cpp
Use Id::fromString instead of the constructor.
2013-01-17 11:26:49 +01:00
externaltool.h
Adjust license headers
2012-10-05 17:12:56 +02:00
externaltoolmanager.h
Adjust license headers
2012-10-05 17:12:56 +02:00
fancyactionbar.cpp
MiniTargetSelector: If the project's displayname is non unique show path
2013-01-11 15:06:10 +01:00
fancyactionbar.h
Adjust license headers
2012-10-05 17:12:56 +02:00
fancyactionbar.qrc
Improved some icons and removed unused or redundant ones
2010-04-09 17:43:22 +02:00
fancytabwidget.cpp
FancyTabWidget: use QStyleFactory to create windows style
2012-11-28 10:47:07 +01:00
fancytabwidget.h
Adjust license headers
2012-10-05 17:12:56 +02:00
featureprovider.cpp
Adjust license headers
2012-10-05 17:12:56 +02:00
featureprovider.h
Features: Use Core::Id as base
2013-01-15 17:59:53 +01:00
fileiconprovider.cpp
Remove braces for single lines of conditions
2013-01-08 10:48:18 +01:00
fileiconprovider.h
Adjust license headers
2012-10-05 17:12:56 +02:00
fileutils.cpp
Fix compilation on Mac.
2013-01-04 11:09:28 +01:00
fileutils.h
Adjust license headers
2012-10-05 17:12:56 +02:00
findplaceholder.cpp
Adjust license headers
2012-10-05 17:12:56 +02:00
findplaceholder.h
Adjust license headers
2012-10-05 17:12:56 +02:00
generalsettings.cpp
Use Core::Id for IOptionsPage::m_id
2013-01-17 11:43:04 +01:00
generalsettings.h
InfoBar: Enable resetting globally suppressed warnings
2013-01-11 13:54:46 +01:00
generalsettings.ui
InfoBar: Enable resetting globally suppressed warnings
2013-01-11 13:54:46 +01:00
generatedfile.cpp
Adjust license headers
2012-10-05 17:12:56 +02:00
generatedfile.h
Adjust license headers
2012-10-05 17:12:56 +02:00
helpmanager.cpp
Qt5: QUrl doesn't accept paths without leading slash anymore
2012-10-26 14:54:17 +02:00
helpmanager.h
Adjust license headers
2012-10-05 17:12:56 +02:00
icontext.cpp
Core: Use the new Id methods in a few places
2013-01-17 10:57:22 +01:00
icontext.h
Core: Use the new Id methods in a few places
2013-01-17 10:57:22 +01:00
icore.cpp
Core: remove some unused context handling functions
2013-01-12 02:30:54 +01:00
icore.h
Core: remove some unused context handling functions
2013-01-12 02:30:54 +01:00
icorelistener.h
Adjust license headers
2012-10-05 17:12:56 +02:00
id.cpp
Core::Id: Do not warn when reading invalid ids from settings
2013-01-28 13:08:19 +01:00
id.h
Core: simplify ILocator interface
2013-01-18 15:51:13 +01:00
idocument.cpp
InfoBar: Use Core::Id
2012-11-09 15:34:50 +01:00
idocument.h
Adjust license headers
2012-10-05 17:12:56 +02:00
idocumentfactory.h
Adjust license headers
2012-10-05 17:12:56 +02:00
ifilewizardextension.h
Adjust license headers
2012-10-05 17:12:56 +02:00
imode.cpp
Adjust license headers
2012-10-05 17:12:56 +02:00
imode.h
Adjust license headers
2012-10-05 17:12:56 +02:00
inavigationwidgetfactory.cpp
Adjust license headers
2012-10-05 17:12:56 +02:00
inavigationwidgetfactory.h
Merge remote-tracking branch 'origin/2.6'
2012-10-05 21:20:50 +02:00
infobar.cpp
InfoBar: Suppress warning on close
2013-01-24 11:32:50 +01:00
infobar.h
InfoBar: Enable resetting globally suppressed warnings
2013-01-11 13:54:46 +01:00
ioutputpane.h
Adjust license headers
2012-10-05 17:12:56 +02:00
iversioncontrol.cpp
ProjectExplorer: Show VCS topic in tree
2012-11-16 14:11:08 +01:00
iversioncontrol.h
ProjectExplorer: Show VCS topic in tree
2012-11-16 14:11:08 +01:00
macfullscreen.h
Adjust license headers
2012-10-05 17:12:56 +02:00
macfullscreen.mm
Mac: Don't link to 10.7+ api even when compiling there.
2012-10-19 16:33:41 +02:00
mainwindow.cpp
Core: Use Id in Context instead of plain int.
2013-01-12 02:33:31 +01:00
mainwindow.h
Core: remove some unused context handling functions
2013-01-12 02:30:54 +01:00
manhattanstyle.cpp
Remove braces for single lines of conditions
2013-01-08 10:48:18 +01:00
manhattanstyle.h
Adjust license headers
2012-10-05 17:12:56 +02:00
messagemanager.cpp
Adjust license headers
2012-10-05 17:12:56 +02:00
messagemanager.h
Adjust license headers
2012-10-05 17:12:56 +02:00
messageoutputwindow.cpp
Adjust license headers
2012-10-05 17:12:56 +02:00
messageoutputwindow.h
Adjust license headers
2012-10-05 17:12:56 +02:00
mimedatabase.cpp
Remove braces for single lines of conditions
2013-01-08 10:48:18 +01:00
mimedatabase.h
Adjust license headers
2012-10-05 17:12:56 +02:00
mimetypemagicdialog.cpp
Adjust license headers
2012-10-05 17:12:56 +02:00
mimetypemagicdialog.h
Adjust license headers
2012-10-05 17:12:56 +02:00
mimetypemagicdialog.ui
UI files: Do not polute the global Ui namespace
2011-11-24 10:49:41 +01:00
mimetypesettings.cpp
Use Core::Id for IOptionsPage::m_id
2013-01-17 11:43:04 +01:00
mimetypesettings.h
Adjust license headers
2012-10-05 17:12:56 +02:00
mimetypesettingspage.ui
UI files: Do not polute the global Ui namespace
2011-11-24 10:49:41 +01:00
minisplitter.cpp
Adjust license headers
2012-10-05 17:12:56 +02:00
minisplitter.h
Adjust license headers
2012-10-05 17:12:56 +02:00
modemanager.cpp
Core: Use the new Id methods in a few places
2013-01-17 10:57:22 +01:00
modemanager.h
Adjust license headers
2012-10-05 17:12:56 +02:00
navigationsubwidget.cpp
Use Id::fromString instead of the constructor.
2013-01-17 11:26:49 +01:00
navigationsubwidget.h
Adjust license headers
2012-10-05 17:12:56 +02:00
navigationwidget.cpp
Use Id::fromString instead of the constructor.
2013-01-17 11:26:49 +01:00
navigationwidget.h
Adjust license headers
2012-10-05 17:12:56 +02:00
outputpane.cpp
Add whitespace after control keywords
2012-11-28 20:20:46 +01:00
outputpane.h
Adjust license headers
2012-10-05 17:12:56 +02:00
outputpanemanager.cpp
Use Id::fromString instead of the constructor.
2013-01-17 11:26:49 +01:00
outputpanemanager.h
Adjust license headers
2012-10-05 17:12:56 +02:00
outputwindow.cpp
Remove braces for single lines of conditions
2013-01-08 10:48:18 +01:00
outputwindow.h
Adjust license headers
2012-10-05 17:12:56 +02:00
plugindialog.cpp
Adjust license headers
2012-10-05 17:12:56 +02:00
plugindialog.h
Adjust license headers
2012-10-05 17:12:56 +02:00
removefiledialog.cpp
Adjust license headers
2012-10-05 17:12:56 +02:00
removefiledialog.h
Adjust license headers
2012-10-05 17:12:56 +02:00
removefiledialog.ui
Added VCS integration to ResourceEditor.
2012-07-19 22:26:47 +02:00
rightpane.cpp
Remove braces for single lines of conditions
2013-01-08 10:48:18 +01:00
rightpane.h
Adjust license headers
2012-10-05 17:12:56 +02:00
settingsdatabase.cpp
Remove braces for single lines of conditions
2013-01-08 10:48:18 +01:00
settingsdatabase.h
Adjust license headers
2012-10-05 17:12:56 +02:00
sidebar.cpp
Add whitespace after control keywords
2012-11-28 20:20:46 +01:00
sidebar.h
Adjust license headers
2012-10-05 17:12:56 +02:00
sidebarwidget.cpp
Add whitespace after control keywords
2012-11-28 20:20:46 +01:00
sidebarwidget.h
Adjust license headers
2012-10-05 17:12:56 +02:00
statusbarmanager.cpp
Adjust license headers
2012-10-05 17:12:56 +02:00
statusbarmanager.h
Adjust license headers
2012-10-05 17:12:56 +02:00
statusbarwidget.cpp
Adjust license headers
2012-10-05 17:12:56 +02:00
statusbarwidget.h
Adjust license headers
2012-10-05 17:12:56 +02:00
styleanimator.cpp
Remove braces for single lines of conditions
2013-01-08 10:48:18 +01:00
styleanimator.h
Adjust license headers
2012-10-05 17:12:56 +02:00
tabpositionindicator.cpp
Adjust license headers
2012-10-05 17:12:56 +02:00
tabpositionindicator.h
Adjust license headers
2012-10-05 17:12:56 +02:00
textdocument.cpp
Adjust license headers
2012-10-05 17:12:56 +02:00
textdocument.h
Editor: Disable adding UTF-8 BOM for qmake project files
2013-01-24 15:44:05 +01:00
toolsettings.cpp
Use Core::Id for IOptionsPage::m_id
2013-01-17 11:43:04 +01:00
toolsettings.h
Adjust license headers
2012-10-05 17:12:56 +02:00
variablechooser.cpp
Close variable chooser when pressing escape.
2013-01-22 17:48:19 +01:00
variablechooser.h
Close variable chooser when pressing escape.
2013-01-22 17:48:19 +01:00
variablechooser.ui
UI files: Do not polute the global Ui namespace
2011-11-24 10:49:41 +01:00
variablemanager.cpp
Remove braces for single lines of conditions
2013-01-08 10:48:18 +01:00
variablemanager.h
VariableManager: Remove unused function
2012-12-28 16:13:00 +01:00
vcsmanager.cpp
Remove braces for single lines of conditions
2013-01-08 10:48:18 +01:00
vcsmanager.h
Adjust license headers
2012-10-05 17:12:56 +02:00
versiondialog.cpp
Merge remote-tracking branch 'origin/2.6'
2013-01-29 15:52:36 +01:00
versiondialog.h
Adjust license headers
2012-10-05 17:12:56 +02:00