This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch feature/cleanup in repository x2goclient. commit 003ed1fc6d1f18902285d02df0f4227efe84aa02 Author: Mihai Moldovan <ionic@ionic.de> Date: Sat Feb 14 01:38:14 2015 +0100 Move - git.rcc - changelog.rcc - x2goclient.rc - resources.rcc to res/ and update references in: - x2goclient.pro - src/ui/helpdialog.ui --- debian/changelog | 6 ++++++ changelog.rcc => res/changelog.rcc | 0 git.rcc => res/git.rcc | 0 resources.rcc => res/resources.rcc | 0 x2goclient.rc => res/x2goclient.rc | 0 src/ui/helpdialog.ui | 2 +- x2goclient.pro | 8 ++++---- 7 files changed, 11 insertions(+), 5 deletions(-) diff --git a/debian/changelog b/debian/changelog index 7c153fe..0831d73 100644 --- a/debian/changelog +++ b/debian/changelog @@ -160,6 +160,12 @@ x2goclient (4.0.3.2-0x2go1) UNRELEASED; urgency=medium + macbuild.sh + x2goclient.pro + x2goclient.rc + - Move + + git.rcc + + changelog.rcc + + x2goclient.rc + + resources.rcc + to res/ and update references in x2goclient.pro and src/ui/helpdialog.ui. -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Thu, 27 Nov 2014 12:01:43 +0100 diff --git a/changelog.rcc b/res/changelog.rcc similarity index 100% rename from changelog.rcc rename to res/changelog.rcc diff --git a/git.rcc b/res/git.rcc similarity index 100% rename from git.rcc rename to res/git.rcc diff --git a/resources.rcc b/res/resources.rcc similarity index 100% rename from resources.rcc rename to res/resources.rcc diff --git a/x2goclient.rc b/res/x2goclient.rc similarity index 100% rename from x2goclient.rc rename to res/x2goclient.rc diff --git a/src/ui/helpdialog.ui b/src/ui/helpdialog.ui index fae9098..b4321cd 100644 --- a/src/ui/helpdialog.ui +++ b/src/ui/helpdialog.ui @@ -35,7 +35,7 @@ </layout> </widget> <resources> - <include location="resources.rcc"/> + <include location="../../res/resources.rcc"/> </resources> <connections> <connection> diff --git a/x2goclient.pro b/x2goclient.pro index 3579dc3..7cff655 100644 --- a/x2goclient.pro +++ b/x2goclient.pro @@ -125,7 +125,7 @@ plugin { TARGET = x2goplugin } else { - RC_FILE = x2goclient.rc + RC_FILE = 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 += res/resources.rcc exists(txt/git-info) { message("Configuring with --git-info") - RESOURCES += git.rcc + RESOURCES += res/git.rcc } exists(txt/changelog) { message("Configuring with --changelog") - RESOURCES += changelog.rcc + RESOURCES += res/changelog.rcc } linux-g++ { -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git