Eike Ziller 054ed354e0 Merge remote-tracking branch 'origin/3.5' ...

Change-Id: I30148c16cbb66ef670caaf1c74dccff47069bf68

2015-09-15 07:41:02 +02:00

..

fileformat

ProjectExplorer: Use FileName for Node::path

2015-02-13 13:14:03 +00:00

images

PNG: Run pngcrush on images with iCCP or sRGB profiles

2015-07-03 09:50:46 +00:00

qmlproject.cpp

QmlProject: Fix restoring/opening of projects

2015-09-09 10:14:54 +00:00

qmlproject.h

Project: Improve fromMap() error reporting interface

2015-07-28 10:34:12 +00:00

qmlproject.qrc

QmlProjectManager: Qt Quick UI templates via json wizard

2015-05-18 13:00:17 +00:00

qmlprojectconstants.h

Update License

2015-01-16 12:37:56 +01:00

qmlprojectenvironmentaspect.cpp

Qt Quick UI: Add "kit environment" as a base environment for run

2015-08-31 11:02:32 +00:00

qmlprojectenvironmentaspect.h

Qt Quick UI: Add "kit environment" as a base environment for run

2015-08-31 11:02:32 +00:00

qmlprojectfile.cpp

Add override to IDocument hierarchy

2015-06-11 09:32:18 +00:00

qmlprojectfile.h

Add override to IDocument hierarchy

2015-06-11 09:32:18 +00:00

qmlprojectmanager_dependencies.pri

qmljs: move defaultProjectInfoForProject to the qmljs library

2014-07-24 16:54:42 +02:00

qmlprojectmanager_global.h

Update License

2015-01-16 12:37:56 +01:00

qmlprojectmanager.cpp

ProjectExplorer: Use FileName for Node::path

2015-02-13 13:14:03 +00:00

qmlprojectmanager.h

Update License

2015-01-16 12:37:56 +01:00

QmlProjectManager.json.in

Re-enable QmlProjectManager by default

2015-07-02 06:46:46 +00:00

QmlProjectManager.mimetypes.xml

Mime types: Fix that some QML files were opened as C++

2015-02-24 09:46:04 +00:00

qmlprojectmanager.pro

QmlProjectManager: Qt Quick UI templates via json wizard

2015-05-18 13:00:17 +00:00

qmlprojectmanager.qbs

QmlProjectManager: Qt Quick UI templates via json wizard

2015-05-18 13:00:17 +00:00

qmlprojectmanagerconstants.h

Update License

2015-01-16 12:37:56 +01:00

qmlprojectnodes.cpp

QmlProject: Fix wrong "." level in project structure

2015-09-10 14:24:26 +00:00

qmlprojectnodes.h

Update License

2015-01-16 12:37:56 +01:00

qmlprojectplugin.cpp

QmlProjectManager: Qt Quick UI templates via json wizard

2015-05-18 13:00:17 +00:00

qmlprojectplugin.h

Update License

2015-01-16 12:37:56 +01:00

qmlprojectrunconfiguration.cpp

QtSupport: Remove SimulatorQt

2015-04-24 13:45:08 +00:00

qmlprojectrunconfiguration.h

Update License

2015-01-16 12:37:56 +01:00

qmlprojectrunconfigurationfactory.cpp

Update License

2015-01-16 12:37:56 +01:00

qmlprojectrunconfigurationfactory.h

Update License

2015-01-16 12:37:56 +01:00

qmlprojectrunconfigurationwidget.cpp

Merge commit '3c85058694ee2e41658d17f524fb48f0b187d2fe'

2015-02-12 17:29:21 +01:00

qmlprojectrunconfigurationwidget.h

Update License

2015-01-16 12:37:56 +01:00