lp:~zeller-benjamin/qtcreator-plugin-cmake/qt53migrate

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:qtcreator-plugin-cmake at revision 39

PS Jenkins bot: Needs Fixing (continuous-integration) on 2014-06-16

Zoltan Balogh: Pending requested 2014-06-16

Diff: 1059 lines (+159/-184)

35 files modified

debian/changelog (+6/-0)
debian/control (+7/-7)
share/qtcreator/templates/wizards/plaincapp/cmake/wizard.xml (+1/-1)
share/qtcreator/templates/wizards/plaincppapp/cmake/wizard.xml (+1/-1)
src/cmakeprojectmanager/argumentslineedit.cpp (+2/-2)
src/cmakeprojectmanager/argumentslineedit.h (+2/-2)
src/cmakeprojectmanager/cmakeappwizard.cpp (+0/-5)
src/cmakeprojectmanager/cmakeappwizard.h (+0/-1)
src/cmakeprojectmanager/cmakebuildconfiguration.cpp (+1/-1)
src/cmakeprojectmanager/cmakebuildconfiguration.h (+1/-3)
src/cmakeprojectmanager/cmakeeditor.cpp (+21/-22)
src/cmakeprojectmanager/cmakeeditor.h (+6/-13)
src/cmakeprojectmanager/cmakeeditorfactory.cpp (+3/-4)
src/cmakeprojectmanager/cmakeeditorfactory.h (+1/-4)
src/cmakeprojectmanager/cmakekitinformation.cpp (+1/-1)
src/cmakeprojectmanager/cmakelocatorfilter.cpp (+4/-4)
src/cmakeprojectmanager/cmakelocatorfilter.h (+4/-4)
src/cmakeprojectmanager/cmakeopenprojectwizard.cpp (+10/-6)
src/cmakeprojectmanager/cmakeopenprojectwizard.h (+3/-5)
src/cmakeprojectmanager/cmakeproject.cpp (+32/-46)
src/cmakeprojectmanager/cmakeproject.h (+0/-1)
src/cmakeprojectmanager/cmakeprojectmanager.h (+5/-6)
src/cmakeprojectmanager/cmakeprojectmanager.qbs (+4/-3)
src/cmakeprojectmanager/cmakeprojectmanager_dependencies.pri (+4/-1)
src/cmakeprojectmanager/cmakeprojectnodes.cpp (+3/-3)
src/cmakeprojectmanager/cmakeprojectnodes.h (+2/-2)
src/cmakeprojectmanager/cmakeprojectplugin.cpp (+3/-1)
src/cmakeprojectmanager/cmakerunconfiguration.cpp (+2/-11)
src/cmakeprojectmanager/cmakerunconfiguration.h (+0/-3)
src/cmakeprojectmanager/cmakesettingspage.cpp (+17/-13)
src/cmakeprojectmanager/cmakesettingspage.h (+3/-1)
src/cmakeprojectmanager/cmaketool.cpp (+2/-0)
src/cmakeprojectmanager/cmaketoolmanager.cpp (+1/-1)
src/cmakeprojectmanager/generatorinfo.cpp (+6/-3)
src/cmakeprojectmanager/makestep.h (+1/-3)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

41. By Benjamin Zeller on 2014-06-16

Packaging fixes

40. By Benjamin Zeller on 2014-06-16

Update versions

39. By Benjamin Zeller on 2014-06-03

merge upstream changes for migration to QtC 3.1.1

38. By PS Jenkins bot on 2014-05-02

Releasing 3.0.1+14.10.20140502.6-0ubuntu1

37. By Benjamin Zeller on 2014-05-02

Fix a case where QtC would delete the project directory when switching the cmake generator

36. By PS Jenkins bot on 2014-04-15

Releasing 3.0.1+14.04.20140415-0ubuntu1

35. By Benjamin Zeller on 2014-04-15

Some minor changes

34. By PS Jenkins bot on 2014-04-10

Releasing 3.0.1+14.04.20140410.1-0ubuntu1

33. By Benjamin Zeller on 2014-04-10

Adding new dependency to the qtcreator-plugin-remotelinux package Fixes: 1302619, 1302620

32. By PS Jenkins bot on 2014-03-24

Releasing 3.0.1+14.04.20140324.1-0ubuntu1