feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
Files
c20f40e12e0b6c5c85d0edfa349ab25b5472f06c
qt-creator/src/plugins/qmlprojectmanager
History
Oswald Buddenhagen 868428cc63 Merge remote-tracking branch 'origin/3.1' 
Conflicts:
	qbs/imports/QtcTool.qbs
	src/plugins/git/giteditor.cpp
	src/plugins/qmldesigner/qmldesignerplugin.cpp

Change-Id: Icafd32f713effb1479480a0d1f61a01e429fbec0
2014-03-18 14:46:29 +01:00
..
fileformat
Clean up single namespace forward-declarations
2014-02-12 09:30:37 +01:00
images
Remove the icon size hack for QML_WIZARD_ICON
2010-07-09 20:02:34 +02:00
qmlapp.cpp
Merge remote-tracking branch 'origin/3.0'
2014-01-08 11:01:06 +01:00
qmlapp.h
Merge remote-tracking branch 'origin/3.0'
2014-01-08 11:01:06 +01:00
qmlapplicationwizard.cpp
Incremented year in copyright info
2014-01-08 08:29:47 +01:00
qmlapplicationwizard.h
IWizard and derived classes: Code cleanups
2014-02-13 16:21:29 +01:00
qmlapplicationwizardpages.cpp
Incremented year in copyright info
2014-01-08 08:29:47 +01:00
qmlapplicationwizardpages.h
Incremented year in copyright info
2014-01-08 08:29:47 +01:00
qmlproject.cpp
qml: moving most of ModelManager logic to ModelManageInterface
2014-02-19 21:18:58 +01:00
qmlproject.h
Merge remote-tracking branch 'origin/3.0'
2014-01-08 11:01:06 +01:00
qmlproject.qrc
Streamline mimetypes.xml files
2013-06-07 16:23:19 +02:00
qmlprojectconstants.h
Incremented year in copyright info
2014-01-08 08:29:47 +01:00
qmlprojectenvironmentaspect.cpp
Incremented year in copyright info
2014-01-08 08:29:47 +01:00
qmlprojectenvironmentaspect.h
Incremented year in copyright info
2014-01-08 08:29:47 +01:00
qmlprojectfile.cpp
Editors: Move id() from editor to document.
2014-03-05 16:27:52 +01:00
qmlprojectfile.h
Incremented year in copyright info
2014-01-08 08:29:47 +01:00
qmlprojectmanager_dependencies.pri
Qbs/qmake: Fix dependencies of plugins
2014-02-11 13:23:26 +01:00
qmlprojectmanager_global.h
Incremented year in copyright info
2014-01-08 08:29:47 +01:00
qmlprojectmanager.cpp
Incremented year in copyright info
2014-01-08 08:29:47 +01:00
qmlprojectmanager.h
Incremented year in copyright info
2014-01-08 08:29:47 +01:00
QmlProjectManager.mimetypes.xml
Streamline mimetypes.xml files
2013-06-07 16:23:19 +02:00
QmlProjectManager.pluginspec.in
Incremented year in copyright info
2014-01-08 08:29:47 +01:00
qmlprojectmanager.pro
Merge multi Qt Quick UI wizards into one
2013-11-06 10:23:49 +01:00
qmlprojectmanager.qbs
use new base import style in qbs files
2014-03-11 14:20:22 +01:00
qmlprojectmanagerconstants.h
Incremented year in copyright info
2014-01-08 08:29:47 +01:00
qmlprojectnodes.cpp
ProjectTree: Change hasBuildTargets to FolderNode::showInSimpleTree
2014-03-18 14:23:11 +01:00
qmlprojectnodes.h
ProjectTree: Change hasBuildTargets to FolderNode::showInSimpleTree
2014-03-18 14:23:11 +01:00
qmlprojectplugin.cpp
Incremented year in copyright info
2014-01-08 08:29:47 +01:00
qmlprojectplugin.h
Incremented year in copyright info
2014-01-08 08:29:47 +01:00
qmlprojectrunconfiguration.cpp
Utils: Compile winutils on all platform
2014-02-20 11:10:30 +01:00
qmlprojectrunconfiguration.h
Clean up single namespace forward-declarations
2014-02-12 09:30:37 +01:00
qmlprojectrunconfigurationfactory.cpp
Incremented year in copyright info
2014-01-08 08:29:47 +01:00
qmlprojectrunconfigurationfactory.h
Incremented year in copyright info
2014-01-08 08:29:47 +01:00
qmlprojectrunconfigurationwidget.cpp
QmlProjectRunConfiguraiton: Simplify code
2014-01-16 14:13:50 +01:00
qmlprojectrunconfigurationwidget.h
QmlProjectRunConfiguraiton: Simplify code
2014-01-16 14:13:50 +01:00