[X2Go-Commits] [x2goclient] 01/02: {res/, x2goclient.pro}: rename .rcc files to .qrc. Fixes: #1096.

[git-admin at x2go.org]

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

x2go pushed a commit to branch master
in repository x2goclient.

commit 517d90a1db044c80a6ccadd53210668d50ace9d4
Author: Bernard Cafarelli <voyageur at gentoo.org>
Date:   Thu Sep 29 01:30:05 2016 +0200

    {res/,x2goclient.pro}: rename .rcc files to .qrc. Fixes: #1096.
    
    "rcc" is the extension for compiled resource files, whereas "qrc" is the
    mapping file.
    
    Qt5 stumbles upon that - i.e., it doesn't try to compile files with the
    "rcc" extension, while Qt4 did.
---
 debian/changelog                     |    7 +++++++
 res/changelog.rcc                    |    5 -----
 res/{git.rcc => git.qrc}             |    0
 res/{resources.rcc => resources.qrc} |    0
 x2goclient.pro                       |    6 +++---
 5 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index c6140de..24182c4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,13 @@ x2goclient (4.0.5.3-0x2go1) UNRELEASED; urgency=medium
     - src/onmainwindow.cpp: fix error message string in
       printSshDError_noHostPubKey ().
 
+  [ Bernard Cafarelli ]
+  * New upstream version (4.0.5.3):
+    - {res/,x2goclient.pro}: rename .rcc files to .qrc. Fixes: #1096. "rcc" is
+      the extension for compiled resource files, whereas "qrc" is the mapping
+      file. Qt5 stumbles upon that - i.e., it doesn't try to compile files
+      with the "rcc" extension, while Qt4 did.
+
  -- X2Go Release Manager <git-admin at x2go.org>  Mon, 19 Sep 2016 09:07:07 +0200
 
 x2goclient (4.0.5.2-0x2go1) unstable; urgency=medium
diff --git a/res/changelog.rcc b/res/changelog.rcc
deleted file mode 100644
index 44d7faf..0000000
--- a/res/changelog.rcc
+++ /dev/null
@@ -1,5 +0,0 @@
-<RCC>
-   <qresource>
-       <file>txt/changelog</file>
-   </qresource>
-</RCC>
diff --git a/res/git.rcc b/res/git.qrc
similarity index 100%
rename from res/git.rcc
rename to res/git.qrc
diff --git a/res/resources.rcc b/res/resources.qrc
similarity index 100%
rename from res/resources.rcc
rename to res/resources.qrc
diff --git a/x2goclient.pro b/x2goclient.pro
index febffb9..9fbac48 100644
--- a/x2goclient.pro
+++ b/x2goclient.pro
@@ -167,16 +167,16 @@ else:message("No translation files in project")
 TEMPLATE = app
 DEPENDPATH += .
 INCLUDEPATH += src
-RESOURCES += res/resources.rcc
+RESOURCES += res/resources.qrc
 
 exists(res/txt/git-info) {
   message("Configuring with --git-info")
-  RESOURCES += res/git.rcc
+  RESOURCES += res/git.qrc
 }
 
 exists(res/txt/changelog) {
   message("Configuring with --changelog")
-  RESOURCES += res/changelog.rcc
+  RESOURCES += res/changelog.qrc
 }
 
 linux-g++ {

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