Merge lp://qastaging/~zsombi/ubuntu-ui-toolkit/osx-port into lp://qastaging/ubuntu-ui-toolkit/staging
Proposed by
Zsombor Egri
| Status: | Work in progress |
|---|---|
| Proposed branch: | lp://qastaging/~zsombi/ubuntu-ui-toolkit/osx-port |
| Merge into: | lp://qastaging/ubuntu-ui-toolkit/staging |
| Diff against target: |
1304 lines (+633/-191) 26 files modified
.qmake.conf (+5/-0) examples/ubuntu-ui-toolkit-gallery/po/po.pro (+17/-16) po/po.pro (+24/-24) src/UbuntuToolkit/UbuntuToolkit.pro (+24/-11) src/UbuntuToolkit/adapters/alarmsadapter_dummy.cpp (+187/-0) src/UbuntuToolkit/adapters/i18n_gettext.cpp (+151/-0) src/UbuntuToolkit/adapters/i18n_tr.cpp (+35/-0) src/UbuntuToolkit/i18n.cpp (+39/-85) src/UbuntuToolkit/i18n_p.h (+3/-12) src/UbuntuToolkit/i18n_p_p.h (+92/-0) src/UbuntuToolkit/mousetouchadaptor_p_p.h (+2/-0) src/UbuntuToolkit/statesaverbackend_p.cpp (+2/-2) src/UbuntuToolkit/ubuntutoolkitmodule.cpp (+1/-1) src/UbuntuToolkit/ucaction.cpp (+3/-3) src/UbuntuToolkit/uclistitem.cpp (+1/-1) src/UbuntuToolkit/ucqquickimageextension.cpp (+8/-8) src/UbuntuToolkit/ucstatesaver.cpp (+4/-4) src/UbuntuToolkit/ucstyleditembase.cpp (+1/-1) src/UbuntuToolkit/ucstylehints.cpp (+1/-1) src/UbuntuToolkit/uctheme.cpp (+3/-3) src/UbuntuToolkit/ucunits.cpp (+5/-5) src/UbuntuToolkit/unixsignalhandler_p.h (+1/-0) tests/unit/alarms/alarms.pro (+3/-1) tests/unit/i18n/LocalizedApp/LocalizedApp.pro (+8/-6) tests/unit/i18n/RelativeTime/RelativeTime.pro (+8/-6) ubuntu-sdk.pro (+5/-1) |
| To merge this branch: | bzr merge lp://qastaging/~zsombi/ubuntu-ui-toolkit/osx-port |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Ubuntu SDK team | Pending | ||
|
Review via email:
|
|||
Commit message
OSX port
Description of the change
UITK ported to OSX
To post a comment you must log in.
Revision history for this message
| Cris Dywan (kalikiana) wrote | # |
Unmerged revisions
- 2135. By Zsombor Egri
-
fix units building
- 2134. By Zsombor Egri
-
styling code fixes
- 2133. By Zsombor Egri
-
fix statesaver main code
- 2132. By Zsombor Egri
-
fix quickimageextension
- 2131. By Zsombor Egri
-
fix listitem build
- 2130. By Zsombor Egri
-
fix action
- 2129. By Zsombor Egri
-
statesaver build fix
- 2128. By Zsombor Egri
-
i18n adaptation
- 2127. By Zsombor Egri
-
staging sync
- 2126. By Zsombor Egri
-
MouseTouchAdaptor made conditional, moved to adaptation
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
Nice. I love what you've done with the adapters and how they're swapped in the linux { } options that'll be easy to extend if needed for other ports.
I'm guessing the QStringLiteral fixes probably have no direct relation to OSX, but I'd personally be happy to leave them here, since they're good to have.
As you haven't flipped the 'Needs Review' I'll just make this a 'Comment only', but looking forward to the end result.