lp://staging/~bzoltan/ubuntu-ui-toolkit/restructure_i18n

Branch merges

Propose for merging

No branches dependent on this one.

On hold for merging into lp://staging/ubuntu-ui-toolkit/staging

ubuntu-sdk-build-bot: Needs Fixing (continuous-integration) on 2016-09-22

Ubuntu SDK team: Pending requested 2016-09-22

Diff: 1154 lines (+1114/-2)

4 files modified

src/UbuntuToolkit/UbuntuToolkit.pro (+19/-2)
src/UbuntuToolkit/i18n-android.cpp (+365/-0)
src/UbuntuToolkit/i18n-macx.cpp (+365/-0)
src/UbuntuToolkit/i18n-windows.cpp (+365/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

2122. By Zoltan Balogh on 2016-09-22

Missed backslash

2121. By Zoltan Balogh on 2016-09-22

Restructure i18n API implementation for non Ubuntu platforms

2120. By Loïc Molinari on 2016-09-20

Moved common C++ configs to ubuntu_common.prf.

The common config file doesn't add -Werror directly to QMAKE_CXXFLAGS anymore, it sets the warnings_are_errors variable so that it is correctly handled by different compilers (not just GCC). That allows to remove the -Werror=deprecated-declarations flag since warnings_are_errors defines it for us.

Removed the DEFINES += QT_USE_QSTRINGBUILDER lines since it's already handled by qt_module.prf.

Set the -Wsuggest-override warning to QMAKE_CXXFLAGS_WARN_ON instead of QMAKE_CXXFLAGS directly.

Approved by ubuntu-sdk-build-bot, Zsombor Egri.

2119. By Loïc Molinari on 2016-09-20

Cleaned up qmake Ubuntu packaging variables.

The qtbase packaging for Ubuntu exports the CFLAGS, CXXFLAGS and LFLAGS variables in the environment before running configure so that the qtbase shared libraries can be compiled with the required distribution defined compiler flags. That is fine (though I guess that could be handled better at the qtbase packaging level with maybe a dedicated prf) but it results in qt_build_config.prf defining the QMAKE_CFLAGS, QMAKE_CXXFLAGS and QMAKE_LFLAGS variables with these distribution specific flags. Since we load this prf, these variables end up being defined when building the toolkit for development purpose. This is problematic because -O2 and -g are always defined (whatever the debug or release config chosen by the developer), also these are GCC specific flags which makes our build break with other compilers. This is also ugly because preprocessor defines are directly set in the QMAKE_C*FLAGS. In order to workaround these issues, we unset these variables and set the different flags apart from -g and -O2 in the right qmake variables. This allows to keep compiling with the Debian flags but in a more flexible way. For the Debian packaging, we keep the former behaviour by simply passing the debian_build config.

Approved by ubuntu-sdk-build-bot, Benjamin Zeller, Zsombor Egri.

2118. By Cris Dywan on 2016-09-20

__styleInstance may be null, when doesn't handle that. Fixes: https://bugs.launchpad.net/bugs/1586013.

Approved by ubuntu-sdk-build-bot, Zsombor Egri.

2117. By Loïc Molinari on 2016-09-20

Made use of dedicated QT_BUILD_*_LIB define for our libs.

Creating a dedicated preprocessor define for each lib is not necessary as it's already handled by the Qt qt_build_config feature.

Approved by ubuntu-sdk-build-bot, Zsombor Egri.

2116. By Cris Dywan on 2016-09-20

Use QStringLiteral with QString.replace

. Fixes: https://bugs.launchpad.net/bugs/1625507.

Approved by ubuntu-sdk-build-bot, Zsombor Egri.

2115. By Cris Dywan on 2016-09-20

Use displayText to determine if the clear button should show. Fixes: https://bugs.launchpad.net/bugs/1461571.

Approved by ubuntu-sdk-build-bot, Zsombor Egri.

2114. By Andrea Bernabei on 2016-09-20

Qt5.6: Fix expandablescolumn.11 and expandables.11 unit tests

We were previously misusing mapToItem/mapFromItem by not passing x/y parameters and relying on the code in qquickitem.cpp to initialize them to 0.

Qt5.6 fixes QTBUG-41686 and requires x/y to be explicitly passed. Fixes: https://bugs.launchpad.net/bugs/1610230.

Approved by ubuntu-sdk-build-bot, Zsombor Egri.

2113. By Cris Dywan on 2016-09-20

&& escapes an ampersand used in a mnemonic label. Fixes: https://bugs.launchpad.net/bugs/1587580.

Approved by ubuntu-sdk-build-bot, Zsombor Egri.