src/plugins/qmlprojectmanager · a92e38f47f7c54a0844e98e47d3a0f830b1c4c93 · Marco Bubke / flatpak-qt-creator

Merge remote-tracking branch 'origin/2.4'

Eike Ziller authored 13 years ago

Conflicts:
	qtcreator.pri
	share/qtcreator/templates/qtquickapp/main.cpp
	src/plugins/analyzerbase/analyzermanager.cpp
	src/plugins/qmlprofiler/qmlprofilertool.cpp

Change-Id: I3be78f22e7301d61a9c7fc142cbc34a3cebc2cf4

fbd47e25

History

fbd47e25 13 years ago

History

Name	Last commit	Last update
..
fileformat
images
QmlProject.mimetypes.xml
QmlProjectManager.pluginspec.in
qmlproject.cpp
qmlproject.h
qmlproject.qrc
qmlprojectapplicationwizard.cpp
qmlprojectapplicationwizard.h
qmlprojectconstants.h
qmlprojectfile.cpp
qmlprojectfile.h
qmlprojectmanager.cpp
qmlprojectmanager.h
qmlprojectmanager.pri
qmlprojectmanager.pro
qmlprojectmanager_dependencies.pri
qmlprojectmanager_global.h
qmlprojectmanagerconstants.h
qmlprojectnodes.cpp
qmlprojectnodes.h
qmlprojectplugin.cpp
qmlprojectplugin.h
qmlprojectrunconfiguration.cpp
qmlprojectrunconfiguration.h
qmlprojectrunconfigurationfactory.cpp
qmlprojectrunconfigurationfactory.h
qmlprojectrunconfigurationwidget.cpp
qmlprojectrunconfigurationwidget.h
qmlprojectruncontrol.cpp
qmlprojectruncontrol.h
qmlprojecttarget.cpp
qmlprojecttarget.h