x2go-dev

x2go-dev@lists.x2go.org

5400 discussions

Start a nNew thread

[PATCH] Fix 051_nxcomp_macos105-fdisset.full+lite.patch.
by Mihai Moldovan 01 Mar '12

01 Mar '12

Patch attached.

3 2

Building problems with x2goserver
by Oliver Burger 01 Mar '12

01 Mar '12

Trying to build x2goserver-3.1.0.0 I get -----> snip <----- install -d -m 755 /mnt/data/mageia-build/packages/cauldron/x2goserver/BUILDROOT/x2goserver-3.1.0.0-1.mga2.x86_64/usr/share/x2go install -d -m 755 /mnt/data/mageia-build/packages/cauldron/x2goserver/BUILDROOT/x2goserver-3.1.0.0-1.mga2.x86_64/usr/share/x2go/x2gofeature.d install -m 755 share/x2gofeature.d/*.features /mnt/data/mageia-build/packages/cauldron/x2goserver/BUILDROOT/x2goserver-3.1.0.0-1.mga2.x86_64/usr/share/x2go/x2gofeature.d/ install: cannot stat `share/x2gofeature.d/*.features': No such file or directory make[1]: *** [install_scripts] Error 1 make[1]: Leaving directory `/mnt/data/mageia-build/packages/cauldron/x2goserver/BUILD/x2goserver/x2goserver-fmbindings' make: *** [install] Error 2 -----> snip <----- This happens with the release tar ball as well as with a git clone. There just is no "share" directory in there. Oliver

4 7

[PATCH] Fix compilation of nxcomp on Mac OS X 10.5.
by Mihai Moldovan 01 Mar '12

01 Mar '12

The Mac OS X 10.5 SDK requires the second argument of FD_ISSET to be writeable, although it does only access the data. Given that we have a const pointer for a const struct, copy and pass that. Note that this is merely a workaround for OS X 10.5, as 10.6 and later define the second argument of FD_ISSET as const struct const *foo, too. It it safe, as data is accessed read-only by FD_ISSET, even on 10.5. Signed-off-by: Mihai Moldovan <ionic(a)ionic.de> --- nxcomp/Agent.h | 28 ++++++++++++++++++++-------- 1 files changed, 20 insertions(+), 8 deletions(-) diff --git a/nxcomp/Agent.h b/nxcomp/Agent.h index fac5acd..ded344d 100644 --- a/nxcomp/Agent.h +++ b/nxcomp/Agent.h @@ -149,30 +149,38 @@ class Agent int remoteCanRead(const fd_set * const readSet) { + // OS X 10.5 requires the second argument to be non-const, so copy readSet. + // It's safe though, as FD_ISSET does not operate on it. + fd_set readWorkSet = *readSet; + #if defined(TEST) || defined(INFO) *logofs << "Agent: remoteCanRead() is " << - (FD_ISSET(remoteFd_, readSet) && transport_ -> dequeuable() != 0) - << " with FD_ISSET() " << (int) FD_ISSET(remoteFd_, readSet) + (FD_ISSET(remoteFd_, &readWorkSet) && transport_ -> dequeuable() != 0) + << " with FD_ISSET() " << (int) FD_ISSET(remoteFd_, &readWorkSet) << " and dequeuable " << transport_ -> dequeuable() << ".\n" << logofs_flush; #endif - return (FD_ISSET(remoteFd_, readSet) && + return (FD_ISSET(remoteFd_, &readWorkSet) && transport_ -> dequeuable() != 0); } int remoteCanWrite(const fd_set * const writeSet) { + // OS X 10.5 requires the second argument to be non-const, so copy writeSet. + // It's safe though, as FD_ISSET does not operate on it. + fd_set writeWorkSet = *writeSet; + #if defined(TEST) || defined(INFO) *logofs << "Agent: remoteCanWrite() is " << - (FD_ISSET(remoteFd_, writeSet) && transport_ -> + (FD_ISSET(remoteFd_, &writeWorkSet) && transport_ -> queuable() != 0 && canRead_ == 1) << " with FD_ISSET() " - << (int) FD_ISSET(remoteFd_, writeSet) << " queueable " + << (int) FD_ISSET(remoteFd_, &writeWorkSet) << " queueable " << transport_ -> queuable() << " channel can read " << canRead_ << ".\n" << logofs_flush; #endif - return (FD_ISSET(remoteFd_, writeSet) && + return (FD_ISSET(remoteFd_, &writeWorkSet) && transport_ -> queuable() != 0 && canRead_ == 1); } @@ -203,13 +211,17 @@ class Agent int proxyCanRead(const fd_set * const readSet) { + // OS X 10.5 requires the second argument to be non-const, so copy readSet. + // It's safe though, as FD_ISSET does not operate on it. + fd_set readWorkSet = *readSet; + #if defined(TEST) || defined(INFO) *logofs << "Agent: proxyCanRead() is " - << ((int) FD_ISSET(proxy -> getFd(), readSet) + << ((int) FD_ISSET(proxy -> getFd(), &readWorkSet) << ".\n" << logofs_flush; #endif - return (FD_ISSET(proxy -> getFd(), readSet)); + return (FD_ISSET(proxy -> getFd(), &readWorkSet)); } int enqueueData(const char *data, const int size) const -- 1.7.9

3 5

Building problems with x2goserver
by Oliver Burger 29 Feb '12

29 Feb '12

1 0

[PATCHv2] Switch to DISPLAY env. var. and UNIX socket connection on OS, X.
by Mihai Moldovan 29 Feb '12

29 Feb '12

Detect the current X11 socket by examining the DISPLAY environment variable, which is set to some UNIX socket path by launchd on each user login. Do a connection test via this UNIX socket. Let nxproxy use the X server via the provided UNIX socket, instead of connecting via TCP. This allows users to shutdown network connections for X11, which is a potential security risk. Even more so, if connection authentication is turned off, which is required for "strange" setups via ssh tunnels, it opens up your machine to any other computer it is reachable by with no authentication. Signed-off-by: Mihai Moldovan <ionic(a)ionic.de> --- onmainwindow.cpp | 36 +++++++++--------- onmainwindow_part2.cpp | 9 +++- onmainwindow_part3.cpp | 100 ++++++++++++++++-------------------------------- onmainwindow_privat.h | 6 +- 4 files changed, 61 insertions(+), 90 deletions(-) diff --git a/onmainwindow.cpp b/onmainwindow.cpp index 344c993..6118f1f 100644 --- a/onmainwindow.cpp +++ b/onmainwindow.cpp @@ -1,22 +1,22 @@ /*************************************************************************** -* Copyright (C) 2005-2012 by Oleksandr Shneyder * -* oleksandr.shneyder(a)obviously-nice.de * -* * -* This program is free software; you can redistribute it and/or modify * -* it under the terms of the GNU General Public License as published by F* -* the Free Software Foundation; either version 2 of the License, or * -* (at your option) any later version. * -* * -* This program is distributed in the hope that it will be useful, * -* but WITHOUT ANY WARRANTY; without even the implied warranty of * -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * -* GNU General Public License for more details. * -* * -* You should have received a copy of the GNU General Public License * -* along with this program; if not, write to the * -* Free Software Foundation, Inc., * -* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * -***************************************************************************/ + * Copyright (C) 2005-2012 by Oleksandr Shneyder * + * oleksandr.shneyder(a)obviously-nice.de * + * * + * This program is free software; you can redistribute it and/or modify * + * it under the terms of the GNU General Public License as published by * + * the Free Software Foundation; either version 2 of the License, or * + * (at your option) any later version. * + * * + * This program is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * + * GNU General Public License for more details. * + * * + * You should have received a copy of the GNU General Public License * + * along with this program; if not, write to the * + * Free Software Foundation, Inc., * + * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * + ***************************************************************************/ #include "onmainwindow_privat.h" diff --git a/onmainwindow_part2.cpp b/onmainwindow_part2.cpp index f43c179..e8df279 100644 --- a/onmainwindow_part2.cpp +++ b/onmainwindow_part2.cpp @@ -1900,12 +1900,17 @@ void ONMainWindow::slotTunnelOk() env << "NX_CLIENT="+QCoreApplication::applicationFilePath (); #if defined ( Q_OS_WIN ) || defined ( Q_OS_DARWIN ) + // On Mac OS X, we want to make sure that DISPLAY is set to a proper value, + // but at the same time don't want to set the value ourselves but keep + // the provided one. QString disp=getXDisplay(); if ( disp==QString::null ) { //slotProxyerror ( QProcess::FailedToStart ); return; } +#endif // Q_OS_WIN || Q_OS_DARWIN +#if defined ( Q_OS_WIN ) if ( dispInd==-1 ) { env <<"DISPLAY=localhost:"+disp; @@ -1917,8 +1922,8 @@ void ONMainWindow::slotTunnelOk() /* x2goDebug<<"existing env DISPLAY("<<dispInd<< ") DISPLAY=localhost:"+disp<<endl;*/ } -#endif -#ifdef Q_OS_DARWIN +#endif // Q_OS_WIN +#if defined ( Q_OS_DARWIN ) //setting /usr/X11/bin to find xauth env.insert ( 0, diff --git a/onmainwindow_part3.cpp b/onmainwindow_part3.cpp index fb6a3ba..7eb14f3 100644 --- a/onmainwindow_part3.cpp +++ b/onmainwindow_part3.cpp @@ -1,22 +1,22 @@ /*************************************************************************** -* Copyright (C) 2005-2012 by Oleksandr Shneyder * -* oleksandr.shneyder(a)obviously-nice.de * -* * -* This program is free software; you can redistribute it and/or modify * -* it under the terms of the GNU General Public License as published by F* -* the Free Software Foundation; either version 2 of the License, or * -* (at your option) any later version. * -* * -* This program is distributed in the hope that it will be useful, * -* but WITHOUT ANY WARRANTY; without even the implied warranty of * -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * -* GNU General Public License for more details. * -* * -* You should have received a copy of the GNU General Public License * -* along with this program; if not, write to the * -* Free Software Foundation, Inc., * -* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * -***************************************************************************/ + * Copyright (C) 2005-2012 by Oleksandr Shneyder * + * oleksandr.shneyder(a)obviously-nice.de * + * * + * This program is free software; you can redistribute it and/or modify * + * it under the terms of the GNU General Public License as published by * + * the Free Software Foundation; either version 2 of the License, or * + * (at your option) any later version. * + * * + * This program is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * + * GNU General Public License for more details. * + * * + * You should have received a copy of the GNU General Public License * + * along with this program; if not, write to the * + * Free Software Foundation, Inc., * + * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * + ***************************************************************************/ #include "onmainwindow_privat.h" @@ -2054,63 +2054,29 @@ bool ONMainWindow::checkAgentProcess() #if defined ( Q_OS_DARWIN ) QString ONMainWindow::getXDisplay() { - QTcpSocket tcpSocket ( this ); - uint dispNumber=0; - QString xname,xdir,xopt; - dispNumber=0; - xdir=ConfigDialog::getXDarwinDirectory(); - xname=xdir+"/Contents/MacOS/X11"; - xopt=" -rootless :0"; + QLocalSocket unixSocket (this); + QString xsocket (getenv ("DISPLAY")); - //for newer versions of XQuartz start startx instead of X11.app - xname="/usr/X11/bin/startx"; - xopt=""; - tcpSocket.connectToHost ( "127.0.0.1",6000+dispNumber ); - - if ( tcpSocket.waitForConnected ( 3000 ) ) - { - tcpSocket.close(); - return QString::number ( dispNumber ); - } - if ( xname==QString::null ) + // OS X starts the X11 server automatically, as soon as the launchd UNIX socket + // is accessed. + // On user login, the DISPLAY environment variable is set to this said existing + // socket. + // By now, we should have a socket. Test, if connecting works. + if ((!xsocket.isEmpty ())) { - QMessageBox::critical ( - this,tr ( "Can't connect to X-Server" ), - tr ( - "Can't connect to X-Server\nPlease check your settings" - ) ); - slotConfig(); - return QString::null; - } - QProcess* pr=new QProcess ( this ); - pr->setWorkingDirectory ( xdir ); - pr->start ( xname+" "+xopt,QIODevice::NotOpen ); - if ( pr->waitForStarted ( 3000 ) ) - { -#ifdef Q_OS_DARWIN - //FIXME: the call of unistd.h sleep() do not work on all - // Mac OS X systems - system ( "sleep 3" ); -#endif + unixSocket.connectToServer (xsocket); - tcpSocket.connectToHost ( "127.0.0.1",6000+dispNumber ); - if ( tcpSocket.waitForConnected ( 1000 ) ) + if (unixSocket.waitForConnected (10000)) { - tcpSocket.close(); - return QString::number ( dispNumber ); + unixSocket.disconnectFromServer (); + return (xsocket); } - QMessageBox::critical ( - this,tr ( "Can't connect to X-Server" ), - tr ( - "Can't connect to X-Server\nPlease check your settings" - ) ); - slotConfig(); - return QString::null; } + // And if not, error out. QMessageBox::critical ( - this,QString::null, + this,tr ( "Can't connect to X server\nPlease check your settings" ), tr ( - "Can't start X Server\nPlease check your settings" ) ); + "Can't start X server\nPlease check your settings" ) ); slotConfig(); return QString::null; } diff --git a/onmainwindow_privat.h b/onmainwindow_privat.h index 9e4375a..aa049f7 100644 --- a/onmainwindow_privat.h +++ b/onmainwindow_privat.h @@ -1,6 +1,6 @@ /*************************************************************************** - * Copyright (C) 2005-2012 by Oleksandr Shneyder * - * oleksandr.shneyder(a)obviously-nice.de * + * Copyright (C) 2005-2012 by Oleksandr Shneyder * + * oleksandr.shneyder(a)obviously-nice.de * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * @@ -66,7 +66,7 @@ #include <QFileDialog> #include <QHttp> #include <QUrl> -#include <QTcpSocket> +#include <QLocalSocket> #include <QPlastiqueStyle> #include "sshprocess.h" #include "imgframe.h" -- 1.7.9

3 5

x2goclient does not build
by Oliver Burger 29 Feb '12

29 Feb '12

Hi there, I'm having problems building the new x2goclient: -----> snip <----- [oli@beteigeuze build (master)]$ qmake ../x2goclient.pro Project MESSAGE: if you want to build x2goplugin you should export X2GO_CLIENT_TARGET=plugin Project MESSAGE: building x2goclient with ldap and cups RCC: Error in '../resources.rcc': Cannot find file 'x2goclient_en.qm' RCC: Error in '../resources.rcc': Cannot find file 'x2goclient_de.qm' RCC: Error in '../resources.rcc': Cannot find file 'x2goclient_fr.qm' RCC: Error in '../resources.rcc': Cannot find file 'x2goclient_nb_no.qm' RCC: Error in '../resources.rcc': Cannot find file 'x2goclient_sv.qm' RCC: Error in '../resources.rcc': Cannot find file 'x2goclient_ru.qm' RCC: Error in '../resources.rcc': Cannot find file 'x2goclient_zh_tw.qm' -----> snip <----- I don't know much about the qt way of internationalisation, but aren't the qm files actually the "compiled" ones and the ts files the sources? Like it is with mo and po files? If yes, why is it searching for qm files? Calling qmake like that is what I'm doing for years now and it worked till 3.99.0.6. I saw in the wiki, that there is now an installation instruction using "make && make install". But I had to patch the Makefile for that. Is there a majority of distros calling the tools lrelease-qt4 and qmake-qt4 or is it just Debian and its sibblings? Oliver

2 2

[RFC] [PATCHv2] Ignore temporary/autogenerated files in the archive.
by Mihai Moldovan 29 Feb '12

29 Feb '12

Signed-off-by: Mihai Moldovan <ionic(a)ionic.de> --- .gitignore | 19 +++++++++++++++++++ 1 files changed, 19 insertions(+), 0 deletions(-) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..366a7d4 --- /dev/null +++ b/.gitignore @@ -0,0 +1,19 @@ +# Typically generated by qmake from x2goclient.pro. +Makefile + +# Temporary object files/static libs. +*.[oa] + +# Generated by qmake. +moc_*.cpp +ui_*.h +qrc_resources.cpp + +# VIM temporary files. +.*.sw* + +# Generated by lrelease. +x2goclient_*.qm + +# Generated by qmake when building on OS X. +x2goclient.app -- 1.7.9

2 3

[RFC] [PATCH] Raise SSH connection timeout to 60 seconds.
by Mihai Moldovan 29 Feb '12

29 Feb '12

The default of 10 seconds is pretty low, especially when using tcp_wrappers with the identd option turned on. Wait for a 60 seconds timeout. Signed-off-by: Mihai Moldovan <ionic(a)ionic.de> --- sshmasterconnection.cpp | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/sshmasterconnection.cpp b/sshmasterconnection.cpp index 2626346..9c6626a 100644 --- a/sshmasterconnection.cpp +++ b/sshmasterconnection.cpp @@ -137,6 +137,7 @@ void SshMasterConnection::run() #endif // int verbosity=SSH_LOG_PROTOCOL; + long timeout = 60; my_ssh_session = ssh_new(); if ( my_ssh_session == NULL ) @@ -153,6 +154,9 @@ void SshMasterConnection::run() ssh_options_set ( my_ssh_session, SSH_OPTIONS_SSH_DIR, (mainWnd->getHomeDirectory()+"/ssh").toAscii()); #endif // ssh_options_set(my_ssh_session, SSH_OPTIONS_LOG_VERBOSITY, &verbosity); + + ssh_options_set(my_ssh_session, SSH_OPTIONS_TIMEOUT, &timeout); + if ( !sshConnect() ) { QString err=ssh_get_error ( my_ssh_session ); -- 1.7.9

2 1

[PATCH] Prettify x2goclient.pro. Build universal on OS X.
by Mihai Moldovan 29 Feb '12

29 Feb '12

Use the Mac OS X 10.5 SDK instead 10.6 to remain compatible with Leopard. Signed-off-by: Mihai Moldovan <ionic(a)ionic.de> --- x2goclient.pro | 141 ++++++++++++++++++++++++++++--------------------------- 1 files changed, 72 insertions(+), 69 deletions(-) diff --git a/x2goclient.pro b/x2goclient.pro index 5c96688..2bb7cdc 100755 --- a/x2goclient.pro +++ b/x2goclient.pro @@ -33,76 +33,76 @@ HEADERS += configdialog.h \ userbutton.h \ x2goclientconfig.h \ x2gologdebug.h \ - printprocess.h \ - cupsprint.h \ - cupsprintwidget.h \ - cupsprintersettingsdialog.h \ - printwidget.h \ - printercmddialog.h \ - printdialog.h \ - wapi.h \ - sessionwidget.h \ - configwidget.h \ - connectionwidget.h \ - settingswidget.h \ - sharewidget.h \ - clicklineedit.h \ - httpbrokerclient.h \ - ongetpass.h \ - onmainwindow_privat.h \ - x2gosettings.h \ - brokerpassdlg.h \ - contest.h \ - xsettingswidget.h + printprocess.h \ + cupsprint.h \ + cupsprintwidget.h \ + cupsprintersettingsdialog.h \ + printwidget.h \ + printercmddialog.h \ + printdialog.h \ + wapi.h \ + sessionwidget.h \ + configwidget.h \ + connectionwidget.h \ + settingswidget.h \ + sharewidget.h \ + clicklineedit.h \ + httpbrokerclient.h \ + ongetpass.h \ + onmainwindow_privat.h \ + x2gosettings.h \ + brokerpassdlg.h \ + contest.h \ + xsettingswidget.h SOURCES += sharewidget.cpp \ - settingswidget.cpp\ - configwidget.cpp \ - sessionwidget.cpp \ - connectionwidget.cpp \ - configdialog.cpp \ - editconnectiondialog.cpp \ - exportdialog.cpp \ - imgframe.cpp \ - LDAPSession.cpp \ - onmainwindow.cpp \ - onmainwindow_part2.cpp \ - onmainwindow_part3.cpp \ - onmainwindow_part4.cpp \ - sessionbutton.cpp \ - sessionmanagedialog.cpp \ - sshmasterconnection.cpp \ - sshprocess.cpp \ - SVGFrame.cpp \ - userbutton.cpp \ - x2gologdebug.cpp \ - printprocess.cpp \ - cupsprint.cpp \ - cupsprintwidget.cpp \ - cupsprintersettingsdialog.cpp \ - printwidget.cpp \ - printercmddialog.cpp \ - printdialog.cpp \ - wapi.cpp \ - clicklineedit.cpp \ - httpbrokerclient.cpp \ - ongetpass.cpp \ - x2gosettings.cpp \ - brokerpassdlg.cpp \ - contest.cpp \ - xsettingswidget.cpp + settingswidget.cpp\ + configwidget.cpp \ + sessionwidget.cpp \ + connectionwidget.cpp \ + configdialog.cpp \ + editconnectiondialog.cpp \ + exportdialog.cpp \ + imgframe.cpp \ + LDAPSession.cpp \ + onmainwindow.cpp \ + onmainwindow_part2.cpp \ + onmainwindow_part3.cpp \ + onmainwindow_part4.cpp \ + sessionbutton.cpp \ + sessionmanagedialog.cpp \ + sshmasterconnection.cpp \ + sshprocess.cpp \ + SVGFrame.cpp \ + userbutton.cpp \ + x2gologdebug.cpp \ + printprocess.cpp \ + cupsprint.cpp \ + cupsprintwidget.cpp \ + cupsprintersettingsdialog.cpp \ + printwidget.cpp \ + printercmddialog.cpp \ + printdialog.cpp \ + wapi.cpp \ + clicklineedit.cpp \ + httpbrokerclient.cpp \ + ongetpass.cpp \ + x2gosettings.cpp \ + brokerpassdlg.cpp \ + contest.cpp \ + xsettingswidget.cpp LIBS += -lssh plugin { -TARGET = x2goplugin + TARGET = x2goplugin } -else{ -RC_FILE = x2goclient.rc -SOURCES += x2goclient.cpp -TARGET = x2goclient -DEFINES += CFGCLIENT -message(if you want to build x2goplugin you should export X2GO_CLIENT_TARGET=plugin) +else { + RC_FILE = x2goclient.rc + SOURCES += x2goclient.cpp + TARGET = x2goclient + DEFINES += CFGCLIENT + message(if you want to build x2goplugin you should export X2GO_CLIENT_TARGET=plugin) } TEMPLATE = app @@ -127,7 +127,8 @@ x2go_linux_static { macx { message(building $$TARGET with ldap and cups) - LIBS += -lldap -lcups + LIBS += -framework LDAP -lcups -lcrypto -lssl -lz + CONFIG += x86 x86_64 } win32-* { message(building $$TARGET for windows without ldap and cups) @@ -135,13 +136,14 @@ win32-* { CONFIG += static release } QT += svg network -ICON =icons/x2go-mac.icns -QMAKE_MAC_SDK =/Developer/SDKs/MacOSX10.6.sdk +ICON = icons/x2go-mac.icns +QMAKE_MAC_SDK = /Developer/SDKs/MacOSX10.5.sdk +QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.5 -plugin{ +plugin { + DEFINES += CFGPLUGIN -DEFINES += CFGPLUGIN linux-g++ { include(qtbrowserplugin-2.4_1-opensource/src/qtbrowserplugin.pri) } @@ -153,5 +155,6 @@ DEFINES += CFGPLUGIN CONFIG += qaxserver include(qtbrowserplugin-2.4_1-opensource/src/qtbrowserplugin.pri) } -RC_FILE = x2goplugin.rc + + RC_FILE = x2goplugin.rc } -- 1.7.9

2 1

[PATCH] Add translation file processing to x2goclient.pro.
by Mihai Moldovan 29 Feb '12

29 Feb '12

Automatically build the required x2goclient_*.qm files based on the x2goclient_*.ts translation files. Signed-off-by: Mihai Moldovan <ionic(a)ionic.de> --- x2goclient.pro | 18 ++++++++++++++++++ 1 files changed, 18 insertions(+), 0 deletions(-) diff --git a/x2goclient.pro b/x2goclient.pro index 2bb7cdc..1d58d64 100755 --- a/x2goclient.pro +++ b/x2goclient.pro @@ -105,6 +105,24 @@ else { message(if you want to build x2goplugin you should export X2GO_CLIENT_TARGET=plugin) } +!isEmpty(TRANSLATIONS) { + isEmpty(QMAKE_LRELEASE) { + win32:QMAKE_LRELEASE = $$[QT_INSTALL_BINS]\lrelease.exe + else:QMAKE_LRELEASE = $$[QT_INSTALL_BINS]/lrelease + } + + isEmpty(TS_DIR):TS_DIR = . + + TSQM.name = lrelease ${QMAKE_FILE_IN} + TSQM.input = TRANSLATIONS + TSQM.output = $$TS_DIR/${QMAKE_FILE_BASE}.qm + TSQM.commands = $$QMAKE_LRELEASE ${QMAKE_FILE_IN} + TSQM.CONFIG = no_link + QMAKE_EXTRA_COMPILERS += TSQM + PRE_TARGETDEPS += compiler_TSQM_make_all +} +else:message(No translation files in project) + TEMPLATE = app DEPENDPATH += . INCLUDEPATH += . -- 1.7.9

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

x2go-dev