This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository x2goclient.

commit 294ac0b92f639b49983ef2e4610b2aada4e54333
Author: Mihai Moldovan <io...@ionic.de>
Date:   Wed Mar 14 00:58:03 2018 +0100

    x2goclient.pro: remove plugin references.
---
 debian/changelog |  1 +
 x2goclient.pro   | 30 ++++--------------------------
 2 files changed, 5 insertions(+), 26 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 2e0f54c..bb2dd99 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -30,6 +30,7 @@ x2goclient (4.1.2.0-0x2go1) UNRELEASED; urgency=medium
       LXQt. Fixes: #1263.
     - src/sshmasterconnection.cpp: stop libssh/OpenSSL from querying for a
       passphrase if started with a controlling terminal.
+    - x2goclient.pro: remove plugin references.
 
  -- X2Go Release Manager <git-ad...@x2go.org>  Thu, 15 Feb 2018 22:01:32 +0100
 
diff --git a/x2goclient.pro b/x2goclient.pro
index 71935e2..f628fa3 100644
--- a/x2goclient.pro
+++ b/x2goclient.pro
@@ -135,16 +135,10 @@ SOURCES += src/sharewidget.cpp \
 LIBS += -lssh -lssh_threads
 win32:LIBS += -lAdvAPI32 -lshell32 -lUser32
 
-plugin {
-  TARGET = x2goplugin
-}
-else {
-  RC_FILE = res/x2goclient.rc
-  SOURCES += src/x2goclient.cpp
-  TARGET = x2goclient
-  DEFINES += CFGCLIENT
-  message("if you want to build x2goplugin you should export 
X2GO_CLIENT_TARGET=plugin")
-}
+RC_FILE = res/x2goclient.rc
+SOURCES += src/x2goclient.cpp
+TARGET = x2goclient
+DEFINES += CFGCLIENT
 
 !isEmpty(TRANSLATIONS) {
   isEmpty(QMAKE_LRELEASE) {
@@ -250,19 +244,3 @@ greaterThan(QT_MAJOR_VERSION, 4): QT += x11extras
 
 QMAKE_CXXFLAGS_DEBUG -= -g
 QMAKE_CXXFLAGS_DEBUG += -O2 -g3 -ggdb3 -gdwarf-4
-
-plugin {
-  DEFINES += CFGPLUGIN
-  linux-g++ {
-    include(x2gobrowserplugin-2.4_1/src/qtbrowserplugin.pri)
-  }
-  linux-g++-64 {
-    include(x2gobrowserplugin-2.4_1/src/qtbrowserplugin.pri)
-  }
-  win32-* {
-    DEFINES += QT_NODLL
-    CONFIG += qaxserver
-    include(x2gobrowserplugin-2.4_1/src/qtbrowserplugin.pri)
-  }
-  RC_FILE = x2gobrowserplugin-2.4_1/src/res/x2goplugin.rc
-}

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on 
/srv/git/code.x2go.org/x2goclient.git
_______________________________________________
x2go-commits mailing list
x2go-commits@lists.x2go.org
https://lists.x2go.org/listinfo/x2go-commits

Reply via email to