Cherry-picking upstream version 0.9.0+20151025.
set new minimal versions for liblxqt and libqtxdg
This commit is contained in:
parent
dfae352f6a
commit
fe0fb5c386
5
AUTHORS
5
AUTHORS
@ -5,7 +5,6 @@ Upstream Authors:
|
|||||||
Copyright:
|
Copyright:
|
||||||
Copyright (c) 2013-2014 LXQt team
|
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.
|
The full text of the licenses can be found in the 'COPYING' file.
|
||||||
|
src/qiconloader_p.h is under LGPL-2.1 or 3 with Digia Qt LGPL Exception version 1.1
|
||||||
Based on source code from the Qt 4.8 Project by Digia Plc
|
|
||||||
|
25
Digia-Qt-LGPL-Exception-version-1.1
Normal file
25
Digia-Qt-LGPL-Exception-version-1.1
Normal 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
8
debian/changelog
vendored
@ -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
|
* add upstream signing key and use it in watch file
|
||||||
* Cleaned up debian/.gitignore
|
* Cleaned up debian/.gitignore
|
||||||
* Switched to experimental because of LXQt namespace change
|
* 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
|
lxqt-qtplugin (0.9.0+20150819-1) unstable; urgency=medium
|
||||||
|
|
||||||
|
4
debian/control
vendored
4
debian/control
vendored
@ -9,9 +9,9 @@ Build-Depends: debhelper (>= 9),
|
|||||||
cmake (>= 3.0.2),
|
cmake (>= 3.0.2),
|
||||||
libdbusmenu-qt5-dev,
|
libdbusmenu-qt5-dev,
|
||||||
libkf5windowsystem-dev,
|
libkf5windowsystem-dev,
|
||||||
liblxqt0-dev (>= 0.9.0+20150911),
|
liblxqt0-dev (>= 0.9.0+20151026),
|
||||||
libqt5x11extras5-dev,
|
libqt5x11extras5-dev,
|
||||||
libqt5xdg-dev,
|
libqt5xdg-dev (>= 1.3.0),
|
||||||
libx11-dev,
|
libx11-dev,
|
||||||
pkg-config,
|
pkg-config,
|
||||||
qtbase5-private-dev,
|
qtbase5-private-dev,
|
||||||
|
@ -291,13 +291,10 @@ QVariant LXQtPlatformTheme::themeHint(ThemeHint hint) const {
|
|||||||
break;
|
break;
|
||||||
case ContextMenuOnMouseRelease:
|
case ContextMenuOnMouseRelease:
|
||||||
break;
|
break;
|
||||||
#if QT_VERSION >= QT_VERSION_CHECK(5, 3, 0)
|
|
||||||
// this was introduced in Qt 5.3.
|
|
||||||
case MousePressAndHoldInterval:
|
case MousePressAndHoldInterval:
|
||||||
break;
|
break;
|
||||||
case MouseDoubleClickDistance:
|
case MouseDoubleClickDistance:
|
||||||
break;
|
break;
|
||||||
#endif
|
|
||||||
default:
|
default:
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user