Merge branch 'master' of git@scm.dev.nokia.troll.no:creator/mainline
No related branches found
No related tags found
Showing
- doc/qtcreator.qdoc 15 additions, 17 deletionsdoc/qtcreator.qdoc
- src/plugins/cmakeprojectmanager/cmakeproject.cpp 6 additions, 5 deletionssrc/plugins/cmakeprojectmanager/cmakeproject.cpp
- src/plugins/coreplugin/coreimpl.cpp 1 addition, 0 deletionssrc/plugins/coreplugin/coreimpl.cpp
- src/plugins/projectexplorer/projectexplorer.cpp 19 additions, 2 deletionssrc/plugins/projectexplorer/projectexplorer.cpp
- src/plugins/projectexplorer/projectexplorer.h 3 additions, 0 deletionssrc/plugins/projectexplorer/projectexplorer.h
- src/plugins/projectexplorer/projectexplorerconstants.h 1 addition, 0 deletionssrc/plugins/projectexplorer/projectexplorerconstants.h
- src/plugins/qt4projectmanager/gdbmacrosbuildstep.cpp 90 additions, 57 deletionssrc/plugins/qt4projectmanager/gdbmacrosbuildstep.cpp
- src/plugins/qt4projectmanager/qt4buildconfigwidget.cpp 13 additions, 1 deletionsrc/plugins/qt4projectmanager/qt4buildconfigwidget.cpp
- src/plugins/qt4projectmanager/qt4buildconfigwidget.h 1 addition, 0 deletionssrc/plugins/qt4projectmanager/qt4buildconfigwidget.h
- src/plugins/qt4projectmanager/qt4buildconfigwidget.ui 7 additions, 0 deletionssrc/plugins/qt4projectmanager/qt4buildconfigwidget.ui
- src/plugins/qt4projectmanager/qt4project.cpp 9 additions, 1 deletionsrc/plugins/qt4projectmanager/qt4project.cpp
Loading
Please register or sign in to comment