[X2Go-Commits] [x2goclient] 21/87: x2goclient.pro: improve consistency: replace tabs with spaces, put quotes around messages, remove or add whitespace where applicable.
git-admin at x2go.org
git-admin at x2go.org
Wed Mar 4 22:14:26 CET 2015
This is an automated email from the git hooks/post-receive script.
x2go pushed a commit to branch feature/cleanup
in repository x2goclient.
commit 7b5d8a945361ba2ed7d440a647e871ec6dc577f6
Author: Mihai Moldovan <ionic at ionic.de>
Date: Fri Feb 13 22:39:29 2015 +0100
x2goclient.pro: improve consistency: replace tabs with spaces, put quotes around messages, remove or add whitespace where applicable.
---
debian/changelog | 2 ++
x2goclient.pro | 84 +++++++++++++++++++++++++++---------------------------
2 files changed, 44 insertions(+), 42 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 02a42a1..c0d7cfd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -140,6 +140,8 @@ x2goclient (4.0.3.2-0x2go1) unstable; urgency=medium
- Reformat README.OpenSSL-Exception.
- Grammar fix in README.i18n.
- Update .gitignore with more temporary files.
+ - Make x2goclient.pro consistent: replace tabs with spaces, put quotes
+ around messages, remove or add whitespace where applicable.
-- X2Go Release Manager <git-admin at x2go.org> Thu, 19 Feb 2015 12:49:22 +0100
diff --git a/x2goclient.pro b/x2goclient.pro
index 447096c..f30b1a5 100644
--- a/x2goclient.pro
+++ b/x2goclient.pro
@@ -122,14 +122,14 @@ LIBS += -lssh
win32:LIBS += -lAdvAPI32 -lshell32 -lUser32
plugin {
- TARGET = x2goplugin
+ TARGET = x2goplugin
}
else {
- RC_FILE = src/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 = src/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")
}
!isEmpty(TRANSLATIONS) {
@@ -148,66 +148,66 @@ else {
QMAKE_EXTRA_COMPILERS += TSQM
PRE_TARGETDEPS += compiler_TSQM_make_all
}
-else:message(No translation files in project)
+else:message("No translation files in project")
TEMPLATE = app
DEPENDPATH += .
INCLUDEPATH += .
RESOURCES += src/res/resources.rcc
-exists( txt/git-info ) {
- message( "Configuring with --git-info" )
- RESOURCES += src/res/git.rcc
+exists(txt/git-info) {
+ message("Configuring with --git-info")
+ RESOURCES += src/res/git.rcc
}
-exists( txt/changelog ) {
- message( "Configuring with --changelog" )
- RESOURCES += src/res/changelog.rcc
+exists(txt/changelog) {
+ message("Configuring with --changelog")
+ RESOURCES += src/res/changelog.rcc
}
linux-g++ {
- message(building $$TARGET with ldap and cups)
- LIBS += -lldap -lcups -lX11 -lXpm
- DEFINES += __linux__
+ message("building $$TARGET with ldap and cups")
+ LIBS += -lldap -lcups -lX11 -lXpm
+ DEFINES += __linux__
}
linux-g++-64 {
- message(building $$TARGET with ldap and cups)
- LIBS += -lldap -lcups -lX11 -lXpm
- DEFINES += __linux__
+ message("building $$TARGET with ldap and cups")
+ LIBS += -lldap -lcups -lX11 -lXpm
+ DEFINES += __linux__
}
x2go_linux_static {
- message (linking all libs statically)
- DEFINES += __linux__
- LIBS -= -lssh
- LIBS += -lssh_static -lssl -lXpm
- QMAKE_LFLAGS = -Bstatic $$QMAKE_LFLAGS
+ message("linking all libs statically")
+ DEFINES += __linux__
+ LIBS -= -lssh
+ LIBS += -lssh_static -lssl -lXpm
+ QMAKE_LFLAGS = -Bstatic $$QMAKE_LFLAGS
}
macx {
- message(building $$TARGET with ldap and cups)
- LIBS += -framework LDAP -lcups -lcrypto -lssl -lz
+ message("building $$TARGET with ldap and cups")
+ LIBS += -framework LDAP -lcups -lcrypto -lssl -lz
}
win32-* {
- message(building $$TARGET for windows without ldap and cups)
- LIBS += -lwinspool -lws2_32
- CONFIG += static release
+ message("building $$TARGET for windows without ldap and cups")
+ LIBS += -lwinspool -lws2_32
+ CONFIG += static release
}
QT += svg network
ICON = icons/x2go-mac.icns
QMAKE_INFO_PLIST = Info.plist
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
+ 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 /srv/git/code.x2go.org/x2goclient.git//../..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git
More information about the x2go-commits
mailing list