Eike Ziller c3119d1aa7 Merge remote-tracking branch 'origin/3.0' ...

Conflicts:
	qtcreator.pri
	src/plugins/qnx/qnxutils.cpp

Change-Id: I019ad21fb4c128eb736c8ab2d09310757e3be037

2013-10-24 08:56:29 +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

BuildConfigurationFactory: Introduce priorities

2013-10-01 15:50:30 +02:00

genericbuildconfiguration.h

BuildConfigurationFactory: Introduce priorities

2013-10-01 15:50:30 +02:00

genericmakestep.cpp

Fix slashes of displayed make commands.

2013-09-09 14:49:39 +02: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/3.0'

2013-10-24 08:56:29 +02:00

genericproject.h

Merge remote-tracking branch 'origin/3.0'

2013-10-24 08:56:29 +02:00

genericproject.qrc

Streamline mimetypes.xml files

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

genericprojectconstants.h

GenericProjectManager: Add *.autosave to the default ignored files

2013-08-19 13:09:16 +02:00

genericprojectfileseditor.cpp

Apply static pattern to TextEditorSetting

2013-09-20 10:28:22 +02:00

genericprojectfileseditor.h

EditorFactory: Replace some virtual functions with data members

2013-08-02 10:21:15 +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

qbs project files: Make use of new qbsSearchPaths property.

2013-10-09 18:08:56 +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

Apply 'static' pattern to MimeDatabase

2013-09-03 11:41:45 +02:00

genericprojectplugin.h

Incremented year in copyright info

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

genericprojectwizard.cpp

Generic Project: Use relative paths for importing

2013-10-23 12:17:06 +02:00

genericprojectwizard.h

Cleanup IWizard interface and users

2013-09-24 09:57:32 +02: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

Core: Clean up FileIconProvider interface

2013-09-13 14:06:16 +02:00

selectablefilesmodel.h

fix build with namespaced Qt

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