feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
Files
23ec56516e02796fe22c5c84d59a309d90234908
qt-creator/src/plugins/qmakeprojectmanager
History
Eike Ziller 23ec56516e Merge remote-tracking branch 'origin/3.4' 
Conflicts:
	src/plugins/coreplugin/coreplugin.cpp

Change-Id: I9aa6c61412e2ef4a91efe028296bcc2d075856d7
2015-03-11 10:35:49 +01:00
..
customwidgetwizard
Merge commit '3c85058694ee2e41658d17f524fb48f0b187d2fe'
2015-02-12 17:29:21 +01:00
images
Implement theming for QtCreator
2014-10-15 17:21:10 +02:00
wizards
Keeping entered values in C++ Library Wizard
2015-03-02 08:38:01 +00:00
addlibrarywizard.cpp
Remove PathChooser subclasses that are no longer needed.
2015-03-03 11:08:03 +00:00
addlibrarywizard.h
Remove PathChooser subclasses that are no longer needed.
2015-03-03 11:08:03 +00:00
applicationlauncher.h
Update License
2015-01-16 12:37:56 +01:00
desktopqmakerunconfiguration.cpp
ProjectExplorer: Use FileName for Node::path
2015-02-13 13:14:03 +00:00
desktopqmakerunconfiguration.h
ProjectExplorer: Use FileName for Node::path
2015-02-13 13:14:03 +00:00
externaleditors.cpp
ProjectExplorer: Use FileName for Node::path
2015-02-13 13:14:03 +00:00
externaleditors.h
Update License
2015-01-16 12:37:56 +01:00
findqmakeprofiles.cpp
Merge commit '3c85058694ee2e41658d17f524fb48f0b187d2fe'
2015-02-12 17:29:21 +01:00
findqmakeprofiles.h
Update License
2015-01-16 12:37:56 +01:00
librarydetailscontroller.cpp
Use completeBaseName for operations on paths.
2015-02-25 11:19:53 +00:00
librarydetailscontroller.h
Update License
2015-01-16 12:37:56 +01:00
librarydetailswidget.ui
Remove PathChooser subclasses that are no longer needed.
2015-03-03 11:08:03 +00:00
makestep.cpp
ProjectExplorer: Use FileName for Node::path
2015-02-13 13:14:03 +00:00
makestep.h
Update License
2015-01-16 12:37:56 +01:00
makestep.ui
Rename plugins/qt4projectmanager to qmakeprojectmanager
2013-10-29 17:57:06 +01:00
profilecompletionassist.cpp
Clean exported headers of the TextEditor plugin.
2015-02-26 13:15:29 +00:00
profilecompletionassist.h
Update License
2015-01-16 12:37:56 +01:00
profileeditor.cpp
Clean exported headers of the TextEditor plugin.
2015-02-26 13:15:29 +00:00
profileeditor.h
Update License
2015-01-16 12:37:56 +01:00
profilehighlighter.cpp
Update License
2015-01-16 12:37:56 +01:00
profilehighlighter.h
Update License
2015-01-16 12:37:56 +01:00
profilehoverhandler.cpp
Update License
2015-01-16 12:37:56 +01:00
profilehoverhandler.h
Update License
2015-01-16 12:37:56 +01:00
qmakebuildconfiguration.cpp
QmakeProjectManager::availableSetups: Don't consider kits without a qt
2015-03-10 13:17:50 +00:00
qmakebuildconfiguration.h
Remove support for !shadowBuild
2015-03-09 10:45:31 +00:00
qmakebuildinfo.h
Remove support for !shadowBuild
2015-03-09 10:45:31 +00:00
qmakekitconfigwidget.cpp
Update License
2015-01-16 12:37:56 +01:00
qmakekitconfigwidget.h
Update License
2015-01-16 12:37:56 +01:00
qmakekitinformation.cpp
Update License
2015-01-16 12:37:56 +01:00
qmakekitinformation.h
Update License
2015-01-16 12:37:56 +01:00
qmakenodes.cpp
ProjectExplorer: Use FileName in NodesVisitor
2015-03-02 11:43:14 +00:00
qmakenodes.h
QmakeProjectManager: Remove unnecessary imports into namespace
2015-02-17 14:02:56 +00:00
qmakeparser.cpp
Update License
2015-01-16 12:37:56 +01:00
qmakeparser.h
Update License
2015-01-16 12:37:56 +01:00
qmakeproject.cpp
C++: Use correct features for document parsing
2015-02-20 12:54:49 +00:00
qmakeproject.h
ProjectExplorer: Use FileName for Node::path
2015-02-13 13:14:03 +00:00
qmakeprojectconfigwidget.cpp
Remove support for !shadowBuild
2015-03-09 10:45:31 +00:00
qmakeprojectconfigwidget.h
Update License
2015-01-16 12:37:56 +01:00
qmakeprojectconfigwidget.ui
Centralize error/warning/info icons
2014-06-17 22:45:09 +02:00
qmakeprojectimporter.cpp
QmakeProjectManager: Fix typo in method name
2015-02-24 13:39:26 +00:00
qmakeprojectimporter.h
Update License
2015-01-16 12:37:56 +01:00
qmakeprojectmanager_dependencies.pri
Remove aggregation dependency from project files
2015-03-09 14:25:34 +00:00
qmakeprojectmanager_global.h
Update License
2015-01-16 12:37:56 +01:00
qmakeprojectmanager.cpp
Clean exported headers of the TextEditor plugin.
2015-02-26 13:15:29 +00:00
qmakeprojectmanager.h
ProjectExplorer: Use FileName for Node::path
2015-02-13 13:14:03 +00:00
QmakeProjectManager.json.in
Update License
2015-01-16 12:37:56 +01:00
QmakeProjectManager.mimetypes.xml
QMake: Open .qmake.cache .stash and .conf in pro file editor
2014-07-09 13:34:28 +02:00
qmakeprojectmanager.pro
JsonWizard: Replace EmptyProjectWizard with a JsonWizard
2014-11-03 09:44:24 +01:00
qmakeprojectmanager.qbs
Remove aggregation dependency from project files
2015-03-09 14:25:34 +00:00
qmakeprojectmanager.qrc
Implement theming for QtCreator
2014-10-15 17:21:10 +02:00
qmakeprojectmanagerconstants.h
Update License
2015-01-16 12:37:56 +01:00
qmakeprojectmanagerplugin.cpp
QmakeProjectManager: Rework run qmake action
2015-03-09 10:45:10 +00:00
qmakeprojectmanagerplugin.h
QmakeProjectManager: Rework run qmake action
2015-03-09 10:45:10 +00:00
qmakerunconfigurationfactory.cpp
Update License
2015-01-16 12:37:56 +01:00
qmakerunconfigurationfactory.h
Update License
2015-01-16 12:37:56 +01:00
qmakestep.cpp
Remove support for !shadowBuild
2015-03-09 10:45:31 +00:00
qmakestep.h
Remove support for !shadowBuild
2015-03-09 10:45:31 +00:00
qmakestep.ui
Qmake: Add an option to put debug info into separate files
2015-02-27 15:28:15 +00:00
qtmodulesinfo.cpp
Update License
2015-01-16 12:37:56 +01:00
qtmodulesinfo.h
Update License
2015-01-16 12:37:56 +01:00