Lubuntu/liblxqt-packaging
10
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Cherry-picking upstream version 0.9.0+20151019.

Browse Source
This commit is contained in:
Alf Gaida 2015-10-23 22:27:27 +02:00
parent 96efd10caf
commit 1352c866c5
4 changed files with 44 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
cmake/modules/LXQtPluginTranslationLoader.cpp.in Normal file
View File

@ -0,0 +1,23 @@
/* This file has been generated by the CMake lxqt_plugin_translation_loader().
* It loads LXQt plugin translations.
*
* Attention: All changes will be overwritten!!!
*/
#include <QCoreApplication>
#include <LXQt/Translator>
/* Dummy helper symbol for referencing.
* In case plugin is linked as static (lib*.a) unreferenced objects are stripped in linking time
* => we need to reference some symbol from this file to be not stripped as a whole.
*/
void * loadPluginTranslation_@catalog_name@_helper = nullptr;
static void loadPluginTranslation()
{
//XXX: we don't use the QStringLiteral here because it causes SEGFAULT in static finalization time
// (the string is stored in static QHash and it's destructor can reference already deleted static QString (generated by QStringLiteral))
LXQt::Translator::translatePlugin("@catalog_name@", "@plugin_type@");
}
Q_COREAPP_STARTUP_FUNCTION(loadPluginTranslation)

12
cmake/modules/LXQtTranslationLoader.cmake
View File

@ -59,3 +59,15 @@ function(lxqt_lib_translation_loader source_files catalog_name)
)
set(${source_files} ${${source_files}} ${CMAKE_CURRENT_BINARY_DIR}/LXQtLibTranslationLoader.cpp PARENT_SCOPE)
endfunction()
# lxqt_plugin_translation_loader(<source_files> <catalog_name>)
# <source_files> The generated .cpp file is added to <source_files>
# <catalog_name> Translations catalog to be loaded
# <plugin_type> Plugin type. Example: lxqt-panel
function(lxqt_plugin_translation_loader source_files catalog_name plugin_type)
configure_file(
${LXQT_CMAKE_MODULES_DIR}/LXQtPluginTranslationLoader.cpp.in
LXQtPluginTranslationLoader.cpp @ONLY
)
set(${source_files} ${${source_files}} ${CMAKE_CURRENT_BINARY_DIR}/LXQtPluginTranslationLoader.cpp PARENT_SCOPE)
endfunction()

6
configdialog/lxqtconfigdialog.cpp
View File

@ -59,6 +59,12 @@ void ConfigDialog::addPage(QWidget* page, const QString& name, const QString& ic
void ConfigDialog::addPage(QWidget* page, const QString& name, const QStringList& iconNames)
{
Q_ASSERT(page);
if (!page)
{
return;
}
/* We set the layout margin to 0. In the default configuration, one page
* only, it aligns buttons with the page. In multi-page it saves a little
* bit of space, without clutter.

6
debian/changelog vendored
View File

@ -1,9 +1,9 @@
liblxqt (0.9.0+20150930-1) experimental; urgency=medium
liblxqt (0.9.0+20151019-1) experimental; urgency=medium
* Cherry-picked upstream-version 0.9.0+20150930.
* Cherry-picked upstream-version 0.9.0+20151019-1.
* Remove --list-missing from rules, it's included in --fail-missing
-- Alf Gaida <agaida@siduction.org> Sat, 03 Oct 2015 10:29:34 +0200
-- Alf Gaida <agaida@siduction.org> Fri, 23 Oct 2015 22:27:13 +0200
liblxqt (0.9.0+20150911-2) experimental; urgency=medium