[X2Go-Commits] [x2goclient] 04/04: general: move resource files to src/res/ and reference in x2goclient.pro.

git-admin at x2go.org git-admin at x2go.org
Fri Feb 13 20:57:30 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 34bc8c0b9da3d89a8561f3787b7a3a40bf474dff
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Fri Feb 13 20:57:18 2015 +0100

    general: move resource files to src/res/ and reference in x2goclient.pro.
---
 debian/changelog                       |    1 +
 changelog.rcc => src/res/changelog.rcc |    0
 git.rcc => src/res/git.rcc             |    0
 resources.rcc => src/res/resources.rcc |    0
 x2goclient.rc => src/res/x2goclient.rc |    0
 x2goclient.pro                         |    8 ++++----
 6 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 23d29b9..18ce527 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -98,6 +98,7 @@ x2goclient (4.0.3.2-0x2go1) UNRELEASED; urgency=medium
     - Translate and simplify header in x2goclient.pro.
     - Add x2goclientconfig.pri only containing a comment to override specific
       entries in x2goclient.pro in x2goclientconfig.pri.
+    - Move resource files to src/res/ and reference in x2goclient.pro.
 
  -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Thu, 27 Nov 2014 12:01:43 +0100
 
diff --git a/changelog.rcc b/src/res/changelog.rcc
similarity index 100%
rename from changelog.rcc
rename to src/res/changelog.rcc
diff --git a/git.rcc b/src/res/git.rcc
similarity index 100%
rename from git.rcc
rename to src/res/git.rcc
diff --git a/resources.rcc b/src/res/resources.rcc
similarity index 100%
rename from resources.rcc
rename to src/res/resources.rcc
diff --git a/x2goclient.rc b/src/res/x2goclient.rc
similarity index 100%
rename from x2goclient.rc
rename to src/res/x2goclient.rc
diff --git a/x2goclient.pro b/x2goclient.pro
index b9f565d..dbb934c 100755
--- a/x2goclient.pro
+++ b/x2goclient.pro
@@ -125,7 +125,7 @@ plugin {
 	TARGET = x2goplugin
 }
 else {
-	RC_FILE = x2goclient.rc
+	RC_FILE = src/res/x2goclient.rc
 	SOURCES += src/x2goclient.cpp
 	TARGET = x2goclient
 	DEFINES += CFGCLIENT
@@ -153,16 +153,16 @@ else:message(No translation files in project)
 TEMPLATE = app
 DEPENDPATH += .
 INCLUDEPATH += .
-RESOURCES += resources.rcc
+RESOURCES += src/res/resources.rcc
 
 exists( txt/git-info ) {
 	message( "Configuring with --git-info" )
-	RESOURCES += git.rcc
+	RESOURCES += src/res/git.rcc
 }
 
 exists( txt/changelog ) {
 	message( "Configuring with --changelog" )
-	RESOURCES += changelog.rcc
+	RESOURCES += src/res/changelog.rcc
 }
 
 linux-g++ {

--
Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git


More information about the x2go-commits mailing list