Merge lp://qastaging/~loic.molinari/ubuntu-ui-toolkit/uitk-ascii-cast-warnings-fix into lp://qastaging/ubuntu-ui-toolkit/staging
Status: | Merged |
---|---|
Approved by: | Zsombor Egri |
Approved revision: | 2104 |
Merged at revision: | 2112 |
Proposed branch: | lp://qastaging/~loic.molinari/ubuntu-ui-toolkit/uitk-ascii-cast-warnings-fix |
Merge into: | lp://qastaging/ubuntu-ui-toolkit/staging |
Prerequisite: | lp://qastaging/~loic.molinari/ubuntu-ui-toolkit/uitk-ubuntu-qt-module-projects-clean-up |
Diff against target: |
1907 lines (+352/-292) 48 files modified
src/UbuntuMetrics/applicationmonitor.cpp (+1/-1) src/UbuntuMetrics/logger.cpp (+2/-2) src/UbuntuToolkit/UbuntuToolkit.pro (+0/-3) src/UbuntuToolkit/adapters/actionsproxy_p.cpp (+1/-1) src/UbuntuToolkit/adapters/alarmsadapter_organizer.cpp (+42/-38) src/UbuntuToolkit/adapters/dbuspropertywatcher_p.cpp (+15/-12) src/UbuntuToolkit/i18n.cpp (+56/-37) src/UbuntuToolkit/livetimer_p.cpp (+8/-8) src/UbuntuToolkit/privates/appheaderbase.cpp (+1/-1) src/UbuntuToolkit/privates/listitemdragarea.cpp (+1/-1) src/UbuntuToolkit/privates/listitemdraghandler.cpp (+1/-1) src/UbuntuToolkit/privates/splitviewhandler.cpp (+2/-2) src/UbuntuToolkit/qquickmimedata.cpp (+5/-2) src/UbuntuToolkit/quickutils.cpp (+7/-7) src/UbuntuToolkit/sortfiltermodel.cpp (+3/-2) src/UbuntuToolkit/statesaverbackend_p.cpp (+9/-7) src/UbuntuToolkit/timeutils_p.h (+2/-2) src/UbuntuToolkit/ubuntutoolkitmodule.cpp (+46/-36) src/UbuntuToolkit/ucaction.cpp (+3/-3) src/UbuntuToolkit/ucactionitem.cpp (+2/-1) src/UbuntuToolkit/ucargument.cpp (+1/-1) src/UbuntuToolkit/ucarguments.cpp (+10/-9) src/UbuntuToolkit/ucbottomedge.cpp (+4/-4) src/UbuntuToolkit/ucbottomedgehint.cpp (+4/-4) src/UbuntuToolkit/ucbottomedgeregion.cpp (+1/-1) src/UbuntuToolkit/ucdefaulttheme.cpp (+13/-14) src/UbuntuToolkit/ucdeprecatedtheme.cpp (+5/-4) src/UbuntuToolkit/uchaptics.cpp (+2/-1) src/UbuntuToolkit/ucheader.cpp (+1/-1) src/UbuntuToolkit/uclabel.cpp (+7/-5) src/UbuntuToolkit/uclistitem.cpp (+4/-4) src/UbuntuToolkit/uclistitemstyle.cpp (+4/-3) src/UbuntuToolkit/ucmainviewbase.cpp (+1/-1) src/UbuntuToolkit/ucmousefilters.cpp (+2/-2) src/UbuntuToolkit/ucpagetreenode.cpp (+12/-12) src/UbuntuToolkit/ucqquickimageextension.cpp (+12/-10) src/UbuntuToolkit/ucscalingimageprovider.cpp (+2/-2) src/UbuntuToolkit/ucserviceproperties.cpp (+4/-4) src/UbuntuToolkit/ucstatesaver.cpp (+1/-1) src/UbuntuToolkit/ucstyleditembase.cpp (+3/-3) src/UbuntuToolkit/ucstylehints.cpp (+5/-4) src/UbuntuToolkit/uctheme.cpp (+22/-19) src/UbuntuToolkit/ucthemingextension.cpp (+3/-2) src/UbuntuToolkit/ucubuntushape.cpp (+4/-3) src/UbuntuToolkit/ucubuntushape_p.h (+6/-4) src/UbuntuToolkit/ucunits.cpp (+3/-3) src/UbuntuToolkit/ucurihandler.cpp (+1/-1) src/UbuntuToolkit/unitythemeiconprovider.cpp (+8/-3) |
To merge this branch: | bzr merge lp://qastaging/~loic.molinari/ubuntu-ui-toolkit/uitk-ascii-cast-warnings-fix |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
ubuntu-sdk-build-bot | continuous-integration | Approve | |
Zsombor Egri | Approve | ||
Review via email:
|
Commit message
Optimised QString code gen for ASCII strings known at compile-time.
That allows the compiler to optimise our code better by putting all these QStrings known at compile time in the .rodata section of the binary as well as preventing a bunch of useless processing on them. That also allows us to remove "DEFINES -= QT_ASCII_
Description of the change
Optimised QString code gen for ASCII strings known at compile-time.
That allows the compiler to optimise our code better by putting all these QStrings known at compile time in the .rodata section of the binary as well as preventing a bunch of useless processing on them. That also allows us to remove "DEFINES -= QT_ASCII_
PASSED: Continuous integration, rev:2103 /jenkins. ubuntu. com/ubuntu- sdk/job/ ubuntu- ui-toolkit- ci-amd64- devel/1171/ /jenkins. ubuntu. com/ubuntu- sdk/job/ generic- update- mp/6227/ console
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild: /jenkins. ubuntu. com/ubuntu- sdk/job/ ubuntu- ui-toolkit- ci-amd64- devel/1171/ rebuild
https:/