Oswald Buddenhagen 6896546ba5 Merge remote-tracking branch 'origin/2.8' ...

Conflicts:
	src/plugins/cpptools/cppmodelmanager.cpp

Change-Id: I0e69dfad951eb81d8008f5ca05e8fb6999ae2c8a

2013-07-25 13:18:31 +02:00

..

filesselectionwizardpage.cpp

Added new filter into "Import Existing Project" and "Edit Files"

2013-04-19 20:41:05 +02:00

filesselectionwizardpage.h

fix build with namespaced Qt

2013-04-23 11:32:26 +02:00

genericbuildconfiguration.cpp

Merge remote-tracking branch 'origin/2.6'

2013-01-31 16:25:33 +01:00

genericbuildconfiguration.h

Merge remote-tracking branch 'origin/2.6'

2013-01-31 16:25:33 +01:00

genericmakestep.cpp

AbstractProcessStep: Do not run a qprocess in a thread

2013-02-12 18:31:28 +01:00

genericmakestep.h

Merge remote-tracking branch 'origin/2.6'

2013-01-31 16:25:33 +01:00

genericmakestep.ui

UI files: Do not polute the global Ui namespace

2011-11-24 10:49:41 +01:00

genericproject.cpp

Merge remote-tracking branch 'origin/2.8'

2013-07-25 13:18:31 +02:00

genericproject.h

Make IDocument::fileName a member with setter.

2013-07-09 10:21:58 +02:00

genericproject.qrc

Streamline mimetypes.xml files

2013-06-07 16:23:19 +02:00

genericprojectconstants.h

Remove Nokia leftovers

2013-05-24 12:29:23 +02:00

genericprojectfileseditor.cpp

Fix indentation

2013-05-06 08:38:50 +02:00

genericprojectfileseditor.h

Move IEditor::isTemporary to IDocument

2013-07-12 16:43:54 +02:00

genericprojectmanager_dependencies.pri

Fix dependency information according to output of dependency checker

2013-05-22 16:41:39 +02:00

genericprojectmanager.cpp

Projects: Improve opening of projects

2013-05-27 13:16:50 +02:00

genericprojectmanager.h

Incremented year in copyright info

2013-01-29 16:27:03 +01:00

GenericProjectManager.mimetypes.xml

Streamline mimetypes.xml files

2013-06-07 16:23:19 +02:00

GenericProjectManager.pluginspec.in

Add QTCREATOR_COMPAT_VERSION

2013-07-09 15:14:10 +02:00

genericprojectmanager.pro

Streamline mimetypes.xml files

2013-06-07 16:23:19 +02:00

genericprojectmanager.qbs

Streamline mimetypes.xml files

2013-06-07 16:23:19 +02:00

genericprojectnodes.cpp

Rename IDocument::fileName --> filePath

2013-07-09 13:51:42 +02:00

genericprojectnodes.h

Project: Simplfy file adding/removing interface

2013-07-08 17:05:04 +02:00

genericprojectplugin.cpp

Rename IDocument::fileName --> filePath

2013-07-09 13:51:42 +02:00

genericprojectplugin.h

Incremented year in copyright info

2013-01-29 16:27:03 +01:00

genericprojectwizard.cpp

Mime: Use string comparisons instead of regexps for simple globbing

2013-04-17 17:13:35 +02:00

genericprojectwizard.h

Incremented year in copyright info

2013-01-29 16:27:03 +01:00

pkgconfigtool.cpp

Fix coding style for else statements

2013-07-17 11:11:25 +02:00

pkgconfigtool.h

Incremented year in copyright info

2013-01-29 16:27:03 +01:00

selectablefilesmodel.cpp

Added new filter into "Import Existing Project" and "Edit Files"

2013-04-19 20:41:05 +02:00

selectablefilesmodel.h

fix build with namespaced Qt

2013-04-23 11:32:26 +02:00