Merge lp://qastaging/~bzoltan/ubuntu-qtcreator-plugins/saving_security_policy_groups into lp://qastaging/ubuntu-qtcreator-plugins
Proposed by
Zoltan Balogh
| Status: | Needs review |
|---|---|
| Proposed branch: | lp://qastaging/~bzoltan/ubuntu-qtcreator-plugins/saving_security_policy_groups |
| Merge into: | lp://qastaging/ubuntu-qtcreator-plugins |
| Diff against target: |
18130 lines (+16775/-0) 251 files modified
.bzr-builddeb/default.conf (+3/-0) LICENSE.LGPL (+504/-0) debian/changelog (+131/-0) debian/compat (+1/-0) debian/control (+96/-0) debian/copyright (+50/-0) debian/qtcreator-plugin-ubuntu-common.install (+10/-0) debian/qtcreator-plugin-ubuntu-cordova-common.install (+1/-0) debian/qtcreator-plugin-ubuntu-cordova.install (+3/-0) debian/qtcreator-plugin-ubuntu.install (+4/-0) debian/rules (+29/-0) debian/ubuntusdk.desktop (+11/-0) qtcreator-plugin-ubuntu.pro (+2/-0) share/qtcreator/templates/wizards/ubuntu/backend/displayName.pro (+8/-0) share/qtcreator/templates/wizards/ubuntu/backend/modules/displayName/backend.cpp (+17/-0) share/qtcreator/templates/wizards/ubuntu/backend/modules/displayName/backend.h (+38/-0) share/qtcreator/templates/wizards/ubuntu/backend/modules/displayName/displayName.pro (+34/-0) share/qtcreator/templates/wizards/ubuntu/backend/modules/displayName/mytype.cpp (+12/-0) share/qtcreator/templates/wizards/ubuntu/backend/modules/displayName/mytype.h (+25/-0) share/qtcreator/templates/wizards/ubuntu/backend/modules/displayName/qmldir (+2/-0) share/qtcreator/templates/wizards/ubuntu/backend/tests/unit/tst_mytype.qml (+49/-0) share/qtcreator/templates/wizards/ubuntu/backendplustabs/app/Makefile (+21/-0) share/qtcreator/templates/wizards/ubuntu/backendplustabs/app/components/HelloComponent.qml (+14/-0) share/qtcreator/templates/wizards/ubuntu/backendplustabs/app/displayName.desktop (+8/-0) share/qtcreator/templates/wizards/ubuntu/backendplustabs/app/displayName.qml (+38/-0) share/qtcreator/templates/wizards/ubuntu/backendplustabs/app/tests/autopilot/displayName/__init__.py (+132/-0) share/qtcreator/templates/wizards/ubuntu/backendplustabs/app/tests/autopilot/displayName/main/__init__.py (+1/-0) share/qtcreator/templates/wizards/ubuntu/backendplustabs/app/tests/autopilot/displayName/main/test_main.py (+23/-0) share/qtcreator/templates/wizards/ubuntu/backendplustabs/app/tests/autopilot/run (+11/-0) share/qtcreator/templates/wizards/ubuntu/backendplustabs/app/tests/unit/tst_hellocomponent.qml (+49/-0) share/qtcreator/templates/wizards/ubuntu/backendplustabs/app/ui/HelloTab.qml (+39/-0) share/qtcreator/templates/wizards/ubuntu/backendplustabs/app/ui/WorldTab.qml (+35/-0) share/qtcreator/templates/wizards/ubuntu/backendplustabs/app/ui/WorldTabTools.qml (+13/-0) share/qtcreator/templates/wizards/ubuntu/backendplustabs/backend/backend.pro (+10/-0) share/qtcreator/templates/wizards/ubuntu/backendplustabs/backend/modules/displayName/backend.cpp (+17/-0) share/qtcreator/templates/wizards/ubuntu/backendplustabs/backend/modules/displayName/backend.h (+38/-0) share/qtcreator/templates/wizards/ubuntu/backendplustabs/backend/modules/displayName/displayName.pro (+34/-0) share/qtcreator/templates/wizards/ubuntu/backendplustabs/backend/modules/displayName/mytype.cpp (+12/-0) share/qtcreator/templates/wizards/ubuntu/backendplustabs/backend/modules/displayName/mytype.h (+25/-0) share/qtcreator/templates/wizards/ubuntu/backendplustabs/backend/modules/displayName/qmldir (+2/-0) share/qtcreator/templates/wizards/ubuntu/backendplustabs/backend/tests/unit/tst_mytype.qml (+49/-0) share/qtcreator/templates/wizards/ubuntu/backendplustabs/displayName.pro (+11/-0) share/qtcreator/templates/wizards/ubuntu/cordovaubuntu/app.js (+27/-0) share/qtcreator/templates/wizards/ubuntu/cordovaubuntu/css/index.css (+57/-0) share/qtcreator/templates/wizards/ubuntu/cordovaubuntu/displayName.desktop (+8/-0) share/qtcreator/templates/wizards/ubuntu/cordovaubuntu/index.html (+90/-0) share/qtcreator/templates/wizards/ubuntu/cordovaubuntu/plugins.xml (+43/-0) share/qtcreator/templates/wizards/ubuntu/html5/displayName.desktop (+8/-0) share/qtcreator/templates/wizards/ubuntu/html5/html/app.js (+22/-0) share/qtcreator/templates/wizards/ubuntu/html5/html/index.html (+75/-0) share/qtcreator/templates/wizards/ubuntu/html5/main.qml (+35/-0) share/qtcreator/templates/wizards/ubuntu/projectypes.json (+217/-0) share/qtcreator/templates/wizards/ubuntu/scope/config.h (+9/-0) share/qtcreator/templates/wizards/ubuntu/scope/data/displayName_lower.scope (+18/-0) share/qtcreator/templates/wizards/ubuntu/scope/data/unity-scope-displayName_lower.service.in (+3/-0) share/qtcreator/templates/wizards/ubuntu/scope/displayName-parser.c (+87/-0) share/qtcreator/templates/wizards/ubuntu/scope/displayName-parser.h (+21/-0) share/qtcreator/templates/wizards/ubuntu/scope/displayName.c (+203/-0) share/qtcreator/templates/wizards/ubuntu/scope/displayName.pro (+73/-0) share/qtcreator/templates/wizards/ubuntu/simple/Makefile (+21/-0) share/qtcreator/templates/wizards/ubuntu/simple/components/HelloComponent.qml (+14/-0) share/qtcreator/templates/wizards/ubuntu/simple/displayName.desktop (+8/-0) share/qtcreator/templates/wizards/ubuntu/simple/main.qml (+54/-0) share/qtcreator/templates/wizards/ubuntu/simple/tests/autopilot/displayName/__init__.py (+131/-0) share/qtcreator/templates/wizards/ubuntu/simple/tests/autopilot/displayName/main/__init__.py (+1/-0) share/qtcreator/templates/wizards/ubuntu/simple/tests/autopilot/displayName/main/test_main.py (+38/-0) share/qtcreator/templates/wizards/ubuntu/simple/tests/autopilot/run (+11/-0) share/qtcreator/templates/wizards/ubuntu/simple/tests/unit/tst_hellocomponent.qml (+49/-0) share/qtcreator/templates/wizards/ubuntu/tabs/Makefile (+21/-0) share/qtcreator/templates/wizards/ubuntu/tabs/components/HelloComponent.qml (+14/-0) share/qtcreator/templates/wizards/ubuntu/tabs/displayName.desktop (+8/-0) share/qtcreator/templates/wizards/ubuntu/tabs/main.qml (+38/-0) share/qtcreator/templates/wizards/ubuntu/tabs/tests/autopilot/displayName/__init__.py (+131/-0) share/qtcreator/templates/wizards/ubuntu/tabs/tests/autopilot/displayName/main/__init__.py (+1/-0) share/qtcreator/templates/wizards/ubuntu/tabs/tests/autopilot/displayName/main/test_main.py (+23/-0) share/qtcreator/templates/wizards/ubuntu/tabs/tests/autopilot/run (+11/-0) share/qtcreator/templates/wizards/ubuntu/tabs/tests/unit/tst_hellocomponent.qml (+49/-0) share/qtcreator/templates/wizards/ubuntu/tabs/ui/HelloTab.qml (+30/-0) share/qtcreator/templates/wizards/ubuntu/tabs/ui/WorldTab.qml (+35/-0) share/qtcreator/templates/wizards/ubuntu/tabs/ui/WorldTabTools.qml (+13/-0) share/qtcreator/templates/wizards/ubuntu/webapp/app.desktop (+8/-0) share/qtcreator/templates/wizards/ubuntu/webapp/app.json (+7/-0) share/qtcreator/ubuntu/menu.json (+438/-0) share/qtcreator/ubuntu/scripts/device_developertools_has (+30/-0) share/qtcreator/ubuntu/scripts/device_developertools_install (+25/-0) share/qtcreator/ubuntu/scripts/device_developertools_packages (+1/-0) share/qtcreator/ubuntu/scripts/device_developertools_remove (+23/-0) share/qtcreator/ubuntu/scripts/device_flashdaily (+39/-0) share/qtcreator/ubuntu/scripts/device_flashdaily_bootstrap (+39/-0) share/qtcreator/ubuntu/scripts/device_hasnetwork (+20/-0) share/qtcreator/ubuntu/scripts/device_network_clone (+23/-0) share/qtcreator/ubuntu/scripts/device_portforward (+33/-0) share/qtcreator/ubuntu/scripts/device_reboot (+20/-0) share/qtcreator/ubuntu/scripts/device_reboot2bootloader (+21/-0) share/qtcreator/ubuntu/scripts/device_reboot2recovery (+20/-0) share/qtcreator/ubuntu/scripts/device_rootshell (+20/-0) share/qtcreator/ubuntu/scripts/device_search (+24/-0) share/qtcreator/ubuntu/scripts/device_service_ssh_start (+20/-0) share/qtcreator/ubuntu/scripts/device_set_persist-sys-usb-config (+20/-0) share/qtcreator/ubuntu/scripts/device_shutdown (+20/-0) share/qtcreator/ubuntu/scripts/device_time_clone (+29/-0) share/qtcreator/ubuntu/scripts/device_version (+21/-0) share/qtcreator/ubuntu/scripts/device_writableimage_has (+22/-0) share/qtcreator/ubuntu/scripts/device_writableimage_set (+23/-0) share/qtcreator/ubuntu/scripts/device_writableimage_unset (+23/-0) share/qtcreator/ubuntu/scripts/functions.inc (+145/-0) share/qtcreator/ubuntu/scripts/i18n_update_template (+42/-0) share/qtcreator/ubuntu/scripts/manifest_description (+5/-0) share/qtcreator/ubuntu/scripts/openssh_connect (+26/-0) share/qtcreator/ubuntu/scripts/openssh_install (+23/-0) share/qtcreator/ubuntu/scripts/openssh_publickey (+66/-0) share/qtcreator/ubuntu/scripts/openssh_remove (+22/-0) share/qtcreator/ubuntu/scripts/openssh_version (+25/-0) share/qtcreator/ubuntu/scripts/qtc_bzr_info (+19/-0) share/qtcreator/ubuntu/scripts/qtc_device_buildanddeploypackage (+47/-0) share/qtcreator/ubuntu/scripts/qtc_device_buildpackage (+115/-0) share/qtcreator/ubuntu/scripts/qtc_device_close_all_apps (+48/-0) share/qtcreator/ubuntu/scripts/qtc_device_deploy_package (+68/-0) share/qtcreator/ubuntu/scripts/qtc_device_restart_appslense (+22/-0) share/qtcreator/ubuntu/scripts/qtc_device_run_app (+90/-0) share/qtcreator/ubuntu/scripts/qtc_launch_gallery (+24/-0) share/qtcreator/ubuntu/scripts/qtc_project_click_create (+133/-0) share/qtcreator/ubuntu/scripts/qtc_project_click_createanddeploy (+93/-0) share/qtcreator/ubuntu/scripts/qtc_project_create_package (+51/-0) share/qtcreator/ubuntu/scripts/qtc_project_debuild (+20/-0) share/qtcreator/ubuntu/scripts/qtc_project_detect_qmldeps (+34/-0) share/qtcreator/ubuntu/scripts/qtc_project_make (+20/-0) share/qtcreator/ubuntu/scripts/qtc_project_packaging (+118/-0) share/qtcreator/ubuntu/scripts/qtc_read_bazaar_settings (+39/-0) share/qtcreator/ubuntu/welcome/Link.qml (+84/-0) share/qtcreator/ubuntu/welcome/NewsBox.qml (+79/-0) share/qtcreator/ubuntu/welcome/welcome.qml (+221/-0) share/qtcreator/ubuntu/welcome/welcome.qmlproject (+20/-0) src/cordovaubuntuprojectmanager/CordovaUbuntuProject.mimetypes.xml (+9/-0) src/cordovaubuntuprojectmanager/CordovaUbuntuProjectManager.pluginspec.in (+10/-0) src/cordovaubuntuprojectmanager/common.h (+55/-0) src/cordovaubuntuprojectmanager/constants.h (+32/-0) src/cordovaubuntuprojectmanager/cordovaubuntuproject.qrc (+5/-0) src/cordovaubuntuprojectmanager/cordovaubuntuprojectmanager.pro (+29/-0) src/cordovaubuntuprojectmanager/cordovaubuntuprojectmanager_dependencies.pri (+7/-0) src/cordovaubuntuprojectmanager/cproject.cpp (+85/-0) src/cordovaubuntuprojectmanager/cproject.h (+62/-0) src/cordovaubuntuprojectmanager/cprojectfile.cpp (+80/-0) src/cordovaubuntuprojectmanager/cprojectfile.h (+54/-0) src/cordovaubuntuprojectmanager/cprojectmanager.h (+74/-0) src/cordovaubuntuprojectmanager/cprojectnode.cpp (+175/-0) src/cordovaubuntuprojectmanager/cprojectnode.h (+73/-0) src/cordovaubuntuprojectmanager/crunconfiguration.cpp (+86/-0) src/cordovaubuntuprojectmanager/crunconfiguration.h (+72/-0) src/cordovaubuntuprojectmanager/cruncontrol.cpp (+126/-0) src/cordovaubuntuprojectmanager/cruncontrol.h (+63/-0) src/cordovaubuntuprojectmanager/global.h (+30/-0) src/cordovaubuntuprojectmanager/plugin.cpp (+126/-0) src/cordovaubuntuprojectmanager/plugin.h (+56/-0) src/plugin.pri (+15/-0) src/ubuntu/Ubuntu.pluginspec.in (+12/-0) src/ubuntu/UbuntuProject.mimetypes.xml (+9/-0) src/ubuntu/manifest.json.template (+14/-0) src/ubuntu/manifestlib.js (+79/-0) src/ubuntu/myapp.json.template (+6/-0) src/ubuntu/resources.qrc (+18/-0) src/ubuntu/ubuntu.pri (+2/-0) src/ubuntu/ubuntu.pro (+117/-0) src/ubuntu/ubuntu_dependencies.pri (+8/-0) src/ubuntu/ubuntu_global.h (+32/-0) src/ubuntu/ubuntuapimode.cpp (+39/-0) src/ubuntu/ubuntuapimode.h (+41/-0) src/ubuntu/ubuntubzr.cpp (+48/-0) src/ubuntu/ubuntubzr.h (+57/-0) src/ubuntu/ubuntuclickmanifest.cpp (+241/-0) src/ubuntu/ubuntuclickmanifest.h (+109/-0) src/ubuntu/ubuntuconstants.h (+354/-0) src/ubuntu/ubuntucoreappsmode.cpp (+32/-0) src/ubuntu/ubuntucoreappsmode.h (+40/-0) src/ubuntu/ubuntudevicemode.cpp (+70/-0) src/ubuntu/ubuntudevicemode.h (+49/-0) src/ubuntu/ubuntudevicenotifier.cpp (+107/-0) src/ubuntu/ubuntudevicenotifier.h (+55/-0) src/ubuntu/ubuntudeviceswidget.cpp (+483/-0) src/ubuntu/ubuntudeviceswidget.h (+105/-0) src/ubuntu/ubuntudeviceswidget.ui (+946/-0) src/ubuntu/ubuntufeatureprovider.cpp (+36/-0) src/ubuntu/ubuntufeatureprovider.h (+42/-0) src/ubuntu/ubuntuircmode.cpp (+32/-0) src/ubuntu/ubuntuircmode.h (+40/-0) src/ubuntu/ubuntumenu.cpp (+445/-0) src/ubuntu/ubuntumenu.h (+77/-0) src/ubuntu/ubuntupackagingmode.cpp (+140/-0) src/ubuntu/ubuntupackagingmode.h (+55/-0) src/ubuntu/ubuntupackagingwidget.cpp (+326/-0) src/ubuntu/ubuntupackagingwidget.h (+67/-0) src/ubuntu/ubuntupackagingwidget.ui (+498/-0) src/ubuntu/ubuntupastebinmode.cpp (+14/-0) src/ubuntu/ubuntupastebinmode.h (+39/-0) src/ubuntu/ubuntuplugin.cpp (+142/-0) src/ubuntu/ubuntuplugin.h (+78/-0) src/ubuntu/ubuntupolicygroupinfo.cpp (+60/-0) src/ubuntu/ubuntupolicygroupinfo.h (+57/-0) src/ubuntu/ubuntupolicygroupmodel.cpp (+63/-0) src/ubuntu/ubuntupolicygroupmodel.h (+58/-0) src/ubuntu/ubuntuprocess.cpp (+171/-0) src/ubuntu/ubuntuprocess.h (+82/-0) src/ubuntu/ubuntuproject.cpp (+88/-0) src/ubuntu/ubuntuproject.h (+88/-0) src/ubuntu/ubuntuprojectapp.cpp (+347/-0) src/ubuntu/ubuntuprojectapp.h (+70/-0) src/ubuntu/ubuntuprojectapplicationwizard.cpp (+131/-0) src/ubuntu/ubuntuprojectapplicationwizard.h (+74/-0) src/ubuntu/ubuntuprojectfile.cpp (+76/-0) src/ubuntu/ubuntuprojectfile.h (+72/-0) src/ubuntu/ubuntuprojectmanager.cpp (+66/-0) src/ubuntu/ubuntuprojectmanager.h (+75/-0) src/ubuntu/ubuntuprojectnode.cpp (+172/-0) src/ubuntu/ubuntuprojectnode.h (+103/-0) src/ubuntu/ubunturunconfiguration.cpp (+27/-0) src/ubuntu/ubunturunconfiguration.h (+74/-0) src/ubuntu/ubunturunconfigurationfactory.cpp (+83/-0) src/ubuntu/ubunturunconfigurationfactory.h (+77/-0) src/ubuntu/ubunturuncontrol.cpp (+91/-0) src/ubuntu/ubunturuncontrol.h (+88/-0) src/ubuntu/ubunturuncontrolfactory.cpp (+52/-0) src/ubuntu/ubunturuncontrolfactory.h (+66/-0) src/ubuntu/ubuntusecuritypolicypickerdialog.cpp (+88/-0) src/ubuntu/ubuntusecuritypolicypickerdialog.h (+56/-0) src/ubuntu/ubuntusecuritypolicypickerdialog.ui (+200/-0) src/ubuntu/ubuntusettingsclickpage.cpp (+50/-0) src/ubuntu/ubuntusettingsclickpage.h (+48/-0) src/ubuntu/ubuntusettingsclickwidget.cpp (+57/-0) src/ubuntu/ubuntusettingsclickwidget.h (+47/-0) src/ubuntu/ubuntusettingsclickwidget.ui (+69/-0) src/ubuntu/ubuntusettingsdeviceconnectivitypage.cpp (+49/-0) src/ubuntu/ubuntusettingsdeviceconnectivitypage.h (+46/-0) src/ubuntu/ubuntusettingsdeviceconnectivitywidget.cpp (+91/-0) src/ubuntu/ubuntusettingsdeviceconnectivitywidget.h (+49/-0) src/ubuntu/ubuntusettingsdeviceconnectivitywidget.ui (+149/-0) src/ubuntu/ubuntusettingspage.cpp (+51/-0) src/ubuntu/ubuntusettingspage.h (+47/-0) src/ubuntu/ubuntusettingswidget.cpp (+56/-0) src/ubuntu/ubuntusettingswidget.h (+44/-0) src/ubuntu/ubuntusettingswidget.ui (+90/-0) src/ubuntu/ubuntushared.h (+40/-0) src/ubuntu/ubuntuversion.cpp (+66/-0) src/ubuntu/ubuntuversion.h (+54/-0) src/ubuntu/ubuntuversionmanager.cpp (+58/-0) src/ubuntu/ubuntuversionmanager.h (+55/-0) src/ubuntu/ubuntuwebmode.cpp (+85/-0) src/ubuntu/ubuntuwebmode.h (+54/-0) src/ubuntu/ubuntuwelcomemode.cpp (+133/-0) src/ubuntu/ubuntuwelcomemode.h (+55/-0) src/ubuntu/ubuntuwikimode.cpp (+32/-0) src/ubuntu/ubuntuwikimode.h (+40/-0) |
| To merge this branch: | bzr merge lp://qastaging/~bzoltan/ubuntu-qtcreator-plugins/saving_security_policy_groups |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Zsombor Egri | Pending | ||
|
Review via email:
|
|||
Commit message
Fixing bug #1252965
Description of the change
The saving of the security policy groups were broken.
The list of the policy groups in the "Simple" tab was saved, but after that quickly overwriten with the content of the AppArmor tab. The problem was that the content of the AppArmor was not updated from the list before saving.
Single line fix
To post a comment you must log in.
Unmerged revisions
- 55. By Zoltan Balogh
-
Fixing #1252965: Security policy groups are not saved
- 54. By Chris Wayne
-
Add in webapp template.
Approved by Zoltan Balogh, PS Jenkins bot.
- 53. By Timo Jyrinki
-
Bump also runtime QtC dependency to 2.8.x.
Approved by PS Jenkins bot, Timo Jyrinki, Zoltan Balogh.
- 52. By Martin Albisetti
-
Add architecture:all to the default manifest template.
Approved by PS Jenkins bot, Zoltan Balogh.
- 51. By Alexandre Abreu
-
Fix ubuntu platform default on cordova; Fix running cordova apps on touch. Fixes: https:/
/bugs.launchpad .net/bugs/ 1198097. Approved by Zoltan Balogh, PS Jenkins bot.
- 50. By Michael Zanetti
-
make it work on Mir too, no need to hardcode the qpa platform. Fixes: https:/
/bugs.launchpad .net/bugs/ 1238031. Approved by Christian Dywan, PS Jenkins bot.
- 49. By Kyle Nitzsche
-
Convert default SDK cordova app to use Ubuntu HTML5 per LP: #1234822.
Approved by Alexandre Abreu, PS Jenkins bot.
- 48. By Zoltan Balogh
-
Saving the AppArmor manifest file when Click package is created (LP: #1233683). Fixes: https:/
/bugs.launchpad .net/bugs/ 1233683. Approved by Zsombor Egri, PS Jenkins bot.
- 47. By Juhapekka Piiroinen
-
created click pkg for cordova desktop has qmlscene exec (LP: #1232213)
do not execute i18n stuff on all project files (LP: #1176433)
Internationalization workflow improvements (LP: #1177449)
[i18n] The .pot file generator should provide relative paths (LP: #1180325)
Split out reserved security policies from regular ones (LP: #1227814). Fixes: https://bugs.launchpad .net/bugs/ 1176433, https:/ /bugs.launchpad .net/bugs/ 1177449, https:/ /bugs.launchpad .net/bugs/ 1180325, https:/ /bugs.launchpad .net/bugs/ 1227814, https:/ /bugs.launchpad .net/bugs/ 1232213. Approved by Zoltan Balogh, PS Jenkins bot.
- 46. By Juhapekka Piiroinen
-
Can't run html5 apps on device from SDK (LP: 1232061). Fixes: https:/
/bugs.launchpad .net/bugs/ 1232061. Approved by PS Jenkins bot.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
