Cherry-picking upstream version 0.10.0.

Fix debian/docs
Set new minimum version for liblxqt
ubuntu/bionic
Alf Gaida 9 years ago
parent fe0fb5c386
commit 070f4b46c2

2
.gitignore vendored

@ -0,0 +1,2 @@
build
*.kdev4

@ -1,9 +1,8 @@
GNU LESSER GENERAL PUBLIC LICENSE
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 Street, 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.
@ -23,8 +22,7 @@ specially designated software packages--typically libraries--of the
Free Software Foundation and other authors who decide to use it. You
can use it too, but we suggest you first think carefully about whether
this license or the ordinary General Public License is the better
strategy to use in any particular case, based on the explanations
below.
strategy to use in any particular case, based on the explanations below.
When we speak of free software, we are referring to freedom of use,
not price. Our General Public Licenses are designed to make sure that
@ -89,9 +87,9 @@ libraries. However, the Lesser license provides advantages in certain
special circumstances.
For example, on rare occasions, there may be a special need to
encourage the widest possible use of a certain library, so that it
becomes a de-facto standard. To achieve this, non-free programs must
be allowed to use the library. A more frequent case is that a free
encourage the widest possible use of a certain library, so that it becomes
a de-facto standard. To achieve this, non-free programs must be
allowed to use the library. A more frequent case is that a free
library does the same job as widely used non-free libraries. In this
case, there is little to gain by limiting the free library to free
software only, so we use the Lesser General Public License.
@ -138,8 +136,8 @@ included without limitation in the term "modification".)
"Source code" for a work means the preferred form of the work for
making modifications to it. For a library, complete source code means
all the source code for all modules it contains, plus any associated
interface definition files, plus the scripts used to control
compilation and installation of the library.
interface definition files, plus the scripts used to control compilation
and installation of the library.
Activities other than copying, distribution and modification are not
covered by this License; they are outside its scope. The act of
@ -305,10 +303,10 @@ of these things:
the user installs one, as long as the modified version is
interface-compatible with the version that the work was made with.
c) Accompany the work with a written offer, valid for at least
three years, to give the same user the materials specified in
Subsection 6a, above, for a charge no more than the cost of
performing this distribution.
c) Accompany the work with a written offer, valid for at
least three years, to give the same user the materials
specified in Subsection 6a, above, for a charge no more
than the cost of performing this distribution.
d) If distribution of the work is made by offering access to copy
from a designated place, offer equivalent access to copy the above
@ -386,10 +384,9 @@ all those who receive copies directly or indirectly through you, then
the only way you could satisfy both it and this License would be to
refrain entirely from distribution of the Library.
If any portion of this section is held invalid or unenforceable under
any particular circumstance, the balance of the section is intended to
apply, and the section as a whole is intended to apply in other
circumstances.
If any portion of this section is held invalid or unenforceable under any
particular circumstance, the balance of the section is intended to apply,
and the section as a whole is intended to apply in other circumstances.
It is not the purpose of this section to induce you to infringe any
patents or other property right claims or to contest validity of any
@ -407,11 +404,11 @@ be a consequence of the rest of this License.
12. If the distribution and/or use of the Library is restricted in
certain countries either by patents or by copyrighted interfaces, the
original copyright holder who places the Library under this License
may add an explicit geographical distribution limitation excluding those
countries, so that distribution is permitted only in or among
countries not thus excluded. In such case, this License incorporates
the limitation as if written in the body of this License.
original copyright holder who places the Library under this License may add
an explicit geographical distribution limitation excluding those countries,
so that distribution is permitted only in or among countries not thus
excluded. In such case, this License incorporates the limitation as if
written in the body of this License.
13. The Free Software Foundation may publish revised and/or new
versions of the Lesser General Public License from time to time.

@ -1,4 +1,6 @@
libqtlxqt - LXQt system integration plugin for Qt.
# libqtlxqt
LXQt system integration plugin for Qt.
With this plugin, all Qt-based programs can adopt settings of
LXQt, such as the icon theme.

8
debian/changelog vendored

@ -1,3 +1,11 @@
lxqt-qtplugin (0.10.0-1) experimental; urgency=medium
* Cherry-picking upstream version 0.10.0.
* Fixed debian/docs
* Set new minimum version for liblxqt
-- Alf Gaida <agaida@siduction.org> Wed, 04 Nov 2015 17:48:56 +0100
lxqt-qtplugin (0.9.0+20151025-1) experimental; urgency=medium
* Cherry-picked upstream version 0.9.0+20151025.

2
debian/control vendored

@ -9,7 +9,7 @@ Build-Depends: debhelper (>= 9),
cmake (>= 3.0.2),
libdbusmenu-qt5-dev,
libkf5windowsystem-dev,
liblxqt0-dev (>= 0.9.0+20151026),
liblxqt0-dev (>= 0.10.0),
libqt5x11extras5-dev,
libqt5xdg-dev (>= 1.3.0),
libx11-dev,

2
debian/docs vendored

@ -1,2 +1,2 @@
AUTHORS
README
README.md

@ -49,7 +49,6 @@
LXQtPlatformTheme::LXQtPlatformTheme():
settingsWatcher_(NULL)
{
// qDebug() << "LXQT Platform Theme loaded";
// When the plugin is loaded, it seems that the app is not yet running and
// QThread environment is not completely set up. So creating filesystem watcher
// does not work since it uses QSocketNotifier internally which can only be
@ -106,14 +105,12 @@ void LXQtPlatformTheme::loadSettings() {
if(!fontStr_.isEmpty()) {
if(font_.fromString(fontStr_))
QApplication::setFont(font_); // it seems that we need to do this manually.
// qDebug() << "font: " << font_.toString();
}
// FixedFont
fixedFontStr_ = settings.value(QLatin1String("fixedFont")).toString();
if(!fixedFontStr_.isEmpty()) {
fixedFont_.fromString(fixedFontStr_);
// qDebug() << "fixedFont: " << fixedFont_.toString();
}
// mouse
@ -214,7 +211,6 @@ const QPalette *LXQtPlatformTheme::palette(Palette type) const {
}
const QFont *LXQtPlatformTheme::font(Font type) const {
// 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.
@ -227,7 +223,6 @@ const QFont *LXQtPlatformTheme::font(Font type) const {
}
QVariant LXQtPlatformTheme::themeHint(ThemeHint hint) const {
// qDebug() << "themeHint" << hint;
switch (hint) {
case CursorFlashTime:
return cursorFlashTime_;
@ -258,14 +253,12 @@ QVariant LXQtPlatformTheme::themeHint(ThemeHint hint) const {
case ItemViewActivateItemOnSingleClick:
return QVariant(singleClickActivate_);
case SystemIconThemeName:
// qDebug() << "iconTheme" << iconTheme_;
return iconTheme_;
case SystemIconFallbackThemeName:
return "hicolor";
case IconThemeSearchPaths:
return xdgIconThemePaths();
case StyleNames:
// qDebug() << "StyleNames";
return QStringList() << style_;
case WindowAutoPlacement:
break;

Loading…
Cancel
Save