[X2Go-Commits] [x2goclient] 01/01: x2goclient.pro: while a linux scope seems to work fine with Qt5, Qt4 doesn't recognize that, so add another linux-* catch.
git-admin at x2go.org
git-admin at x2go.org
Thu May 23 07:03:55 CEST 2019
This is an automated email from the git hooks/post-receive script.
x2go pushed a commit to branch master
in repository x2goclient.
commit 0cb65f3fdcbcfdced9bfeb6016066335886d03d5
Author: Mihai Moldovan <ionic at ionic.de>
Date: Thu May 23 07:03:22 2019 +0200
x2goclient.pro: while a linux scope seems to work fine with Qt5, Qt4 doesn't recognize that, so add another linux-* catch.
---
debian/changelog | 2 ++
x2goclient.pro | 2 +-
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/debian/changelog b/debian/changelog
index e377c7d..c981004 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -85,6 +85,8 @@ x2goclient (4.1.2.2-0x2go1) UNRELEASED; urgency=medium
better, since linux-g++ and linux-g++-64 are x86-specific, while there
are way more potentially useful targets like linux-aarch64-gnu-g++,
clang, llvm, icc etc.
+ - x2goclient.pro: while a linux scope seems to work fine with Qt5, Qt4
+ doesn't recognize that, so add another linux-* catch.
* debian/control:
+ Add build-depend on pkg-config.
* x2goclient.spec:
diff --git a/x2goclient.pro b/x2goclient.pro
index a4bba4d..d465236 100644
--- a/x2goclient.pro
+++ b/x2goclient.pro
@@ -215,7 +215,7 @@ exists(res/txt/changelog) {
RESOURCES += res/changelog.qrc
}
-linux {
+linux|linux-* {
message("building $$TARGET via $$QMAKESPEC with ldap and cups")
LIBS += -lldap -lcups -lX11 -lXpm
DEFINES += __linux__
--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goclient.git
More information about the x2go-commits
mailing list