Lubuntu/lxqt-qtplugin-packaging
10
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Cherry-picking upstream version 0.9.0+20151025.

Browse Source 
set new minimal versions for liblxqt and libqtxdg
This commit is contained in:
Alf Gaida 2015-10-31 01:20:56 +01:00
parent dfae352f6a
commit fe0fb5c386
6 changed files with 37 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
AUTHORS
View File

@ -5,7 +5,6 @@ Upstream Authors:
Copyright:
Copyright (c) 2013-2014 LXQt team
License: GPL-2 and LGPL-2.1+
License: LGPL-2.1+
The full text of the licenses can be found in the 'COPYING' file.
Based on source code from the Qt 4.8 Project by Digia Plc
src/qiconloader_p.h is under LGPL-2.1 or 3 with Digia Qt LGPL Exception version 1.1

2
COPYING
View File

@ -3,7 +3,7 @@
Version 2.1, February 1999
Copyright (C) 1991, 1999 Free Software Foundation, Inc.
51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
Everyone is permitted to copy and distribute verbatim copies
of this license document, but changing it is not allowed.

25
Digia-Qt-LGPL-Exception-version-1.1 Normal file
View File

@ -0,0 +1,25 @@
Digia Qt LGPL Exception version 1.1
===================================
As an additional permission to the GNU Lesser General Public License version
2.1, the object code form of a "work that uses the Library" may incorporate
material from a header file that is part of the Library. You may distribute
such object code under terms of your choice, provided that:
(i) the header files of the Library have not been modified; and
(ii) the incorporated material is limited to numerical parameters, data
structure layouts, accessors, macros, inline functions and
templates; and
(iii) you comply with the terms of Section 6 of the GNU Lesser General
Public License version 2.1.
Moreover, you may apply this exception to a modified version of the Library,
provided that such modification does not involve copying material from the
Library into the modified Library's header files unless such material is
limited to (i) numerical parameters; (ii) data structure layouts;
(iii) accessors; and (iv) small macros, templates and inline functions of
five lines or less in length.
Furthermore, you are not required to apply this additional permission to a
modified version of the Library.

8
debian/changelog vendored
View File

@ -1,12 +1,12 @@
lxqt-qtplugin (0.9.0+20150924-1) experimental; urgency=medium
lxqt-qtplugin (0.9.0+20151025-1) experimental; urgency=medium
* Cherry-picked upstream version 0.9.0+20150924.
* Cherry-picked upstream version 0.9.0+20151025.
* add upstream signing key and use it in watch file
* Cleaned up debian/.gitignore
* Switched to experimental because of LXQt namespace change
* Added minimum version for liblxqt0-dev (>= 0.9.0+20150911)
* Added minimum version for liblxqt and libqtxdg
-- Alf Gaida <agaida@siduction.org> Fri, 25 Sep 2015 19:35:21 +0200
-- Alf Gaida <agaida@siduction.org> Sat, 31 Oct 2015 01:20:25 +0100
lxqt-qtplugin (0.9.0+20150819-1) unstable; urgency=medium

4
debian/control vendored
View File

@ -9,9 +9,9 @@ Build-Depends: debhelper (>= 9),
cmake (>= 3.0.2),
libdbusmenu-qt5-dev,
libkf5windowsystem-dev,
liblxqt0-dev (>= 0.9.0+20150911),
liblxqt0-dev (>= 0.9.0+20151026),
libqt5x11extras5-dev,
libqt5xdg-dev,
libqt5xdg-dev (>= 1.3.0),
libx11-dev,
pkg-config,
qtbase5-private-dev,

9
src/lxqtplatformtheme.cpp
View File

@ -214,10 +214,10 @@ const QPalette *LXQtPlatformTheme::palette(Palette type) const {
}
const QFont *LXQtPlatformTheme::font(Font type) const {
// qDebug() << "font()" << type << SystemFont;
// qDebug() << "font()" << type << SystemFont;
if(type == SystemFont && !fontStr_.isEmpty()) {
// NOTE: for some reason, this is not called by Qt when program startup.
// So we do QApplication::setFont() manually.
// NOTE: for some reason, this is not called by Qt when program startup.
// So we do QApplication::setFont() manually.
return &font_;
}
else if(type == FixedFont && !fixedFontStr_.isEmpty()) {
@ -291,13 +291,10 @@ QVariant LXQtPlatformTheme::themeHint(ThemeHint hint) const {
break;
case ContextMenuOnMouseRelease:
break;
#if QT_VERSION >= QT_VERSION_CHECK(5, 3, 0)
// this was introduced in Qt 5.3.
case MousePressAndHoldInterval:
break;
case MouseDoubleClickDistance:
break;
#endif
default:
break;
}