Merge lp://qastaging/~zeller-benjamin/qtcreator-plugin-cmake/qt53migrate into lp://qastaging/qtcreator-plugin-cmake
Proposed by
Benjamin Zeller
| Status: | Merged |
|---|---|
| Merged at revision: | 39 |
| Proposed branch: | lp://qastaging/~zeller-benjamin/qtcreator-plugin-cmake/qt53migrate |
| Merge into: | lp://qastaging/qtcreator-plugin-cmake |
| Diff against target: |
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) |
| To merge this branch: | bzr merge lp://qastaging/~zeller-benjamin/qtcreator-plugin-cmake/qt53migrate |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| PS Jenkins bot | continuous-integration | Needs Fixing | |
| Zoltan Balogh | Pending | ||
|
Review via email:
|
|||
Commit message
Migrating to Qt5.3 and QtC 3.1
Description of the change
Migrating to Qt5.3 and QtC 3.1
To post a comment you must log in.
Revision history for this message
| PS Jenkins bot (ps-jenkins) wrote | # |
review:
Needs Fixing
(continuous-integration)
Revision history for this message
| PS Jenkins bot (ps-jenkins) wrote | # |
review:
Needs Fixing
(continuous-integration)
Revision history for this message
| PS Jenkins bot (ps-jenkins) wrote | # |
review:
Needs Fixing
(continuous-integration)
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
FAILED: Continuous integration, rev:39
http://
Executed test runs:
FAILURE: http://
FAILURE: http://
Click here to trigger a rebuild:
http://