lp://staging/~zeller-benjamin/qtcreator-plugin-ubuntu/bughunt-201506

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp://staging/qtcreator-plugin-ubuntu at revision 404

Zoltan Balogh: Approve on 2015-06-16

PS Jenkins bot: Approve (continuous-integration) on 2015-06-15

Diff: 887 lines (+241/-239)

23 files modified

share/qtcreator/templates/wizards/ubuntu/backend-app-cmake/wizard.xml (+19/-19)
share/qtcreator/templates/wizards/ubuntu/backend-app-qmake/wizard.xml (+30/-30)
share/qtcreator/templates/wizards/ubuntu/goproject/wizard.xml (+1/-1)
share/qtcreator/templates/wizards/ubuntu/html5-simple/wizard.xml (+1/-1)
share/qtcreator/templates/wizards/ubuntu/qtquick-app-qmake/wizard.xml (+31/-31)
share/qtcreator/templates/wizards/ubuntu/scope/wizard.xml (+1/-1)
share/qtcreator/templates/wizards/ubuntu/simple-app-qmake/wizard.xml (+31/-31)
share/qtcreator/templates/wizards/ubuntu/simple-app-qmlproject/wizard.xml (+32/-32)
share/qtcreator/templates/wizards/ubuntu/simple-i18n-cmake/wizard.xml (+30/-30)
share/qtcreator/templates/wizards/ubuntu/webapp/wizard.xml (+1/-1)
src/ubuntu/ubuntu.pro (+1/-1)
src/ubuntu/ubuntuclickdialog.cpp (+2/-2)
src/ubuntu/ubuntuclickdialog.h (+1/-1)
src/ubuntu/ubuntuclickmanifest.cpp (+31/-38)
src/ubuntu/ubuntuclickmanifest.h (+5/-8)
src/ubuntu/ubuntucreatenewchrootdialog.cpp (+8/-4)
src/ubuntu/ubuntucreatenewchrootdialog.h (+2/-2)
src/ubuntu/ubuntukitmanager.cpp (+1/-1)
src/ubuntu/ubuntupackagingmodel.cpp (+0/-1)
src/ubuntu/ubuntuplugin.cpp (+10/-0)
src/ubuntu/ubuntusettingsclickwidget.cpp (+1/-2)
src/ubuntu/wizards/ubuntufirstrunwizard.cpp (+1/-1)
tests/manifest/manifest.pro (+1/-1)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #1340061: Some dialogs have unreadable (too small) text	Medium	Fix Released
Bug #1461014: Match application name to click package name	Undecided	Fix Released
Bug #1461019: Default in project creation dialog should be a qmake project	Medium	Fix Released
Bug #1461026: Kits creation for a project should match targeted framework	High	Fix Released

Link a bug report

Related blueprints

400. By Benjamin Zeller on 2015-06-17

Fix Bug lp:1340061 "Some dialogs have unreadable (too small) text

399. By Benjamin Zeller on 2015-06-17

Merge trunk

398. By Benjamin Zeller on 2015-06-10

-Fix Bug lp:1461019 "Default in project creation dialog should be a
qmake project "

397. By Benjamin Zeller on 2015-06-10

Fix Bug lp:1461014 "Match application name to click package name"

396. By Benjamin Zeller on 2015-06-10

Fix Bug lp:1461026 "Kits creation for a project should match targeted
framework"

395. By Benjamin Zeller on 2015-06-09

Remove QtScript dependency from the manifest.json parser

394. By CI Train Bot Account on 2015-05-21

Releasing 3.1.1+15.10.20150521-0ubuntu1

393. By Marcus Tomlinson on 2015-05-21

Refactored the scope templates to be more simplistic and comprehensible:
* Reduced directory structure to as few folders as possible
* Renamed scope ini file to <scope-name>.ini
* Added a <scope-name>-settings.ini
* Cleaned out unnecessary complexities from source and CMake files
* More descriptive comments and variable names
* Updated tests to use python3-scope-harness
* Removed cmake/ modules folder (SDK now includes cmake-extras)
* Allow scope template to build with gcc > 4.9
* Added "Keywords" key to scope ini
Approved by: Benjamin Zeller, PS Jenkins bot

392. By Zoltan Balogh on 2015-05-15

Add cmake-extras

391. By Zoltan Balogh on 2015-05-14

add python3-scope-harness to dependencies