[X2Go-Commits] [x2godesktopsharing] 10/13: resources.qrc: Rename file from resources.rcc.

git-admin at x2go.org git-admin at x2go.org
Mon Nov 12 14:32:34 CET 2018


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

x2go pushed a commit to branch master
in repository x2godesktopsharing.

commit 69304771e80ac96253a7b72a2dd138315e350616
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Sun Nov 11 21:00:36 2018 +0100

    resources.qrc: Rename file from resources.rcc.
---
 debian/changelog               | 1 +
 resources.rcc => resources.qrc | 0
 x2godesktopsharing.pro         | 3 +--
 3 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index e05cef0..57d2aea 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -19,6 +19,7 @@ x2godesktopsharing (3.1.1.5-0x2go1) UNRELEASED; urgency=medium
       act as a default set of settings, but not as a limitation to the user.
     - Make the desktop sharing group configurable system-wide and by the user.
     - man/man8/x2goterminate-desktopsharing.8: Grammar fix.
+    - resources.qrc: Rename file from resources.rcc.
   * debian/*:
     + Convert to DH packaging style. Build against Qt5.
   * debian/control:
diff --git a/resources.rcc b/resources.qrc
similarity index 100%
rename from resources.rcc
rename to resources.qrc
diff --git a/x2godesktopsharing.pro b/x2godesktopsharing.pro
index 2fe08ef..530e3ed 100644
--- a/x2godesktopsharing.pro
+++ b/x2godesktopsharing.pro
@@ -20,7 +20,6 @@ TRANSLATIONS += \
     x2godesktopsharing_sv.ts \
     x2godesktopsharing_tr.ts \
     x2godesktopsharing_zh_tw.ts
-RESOURCES += resources.rcc
 
 !isEmpty(TRANSLATIONS) {
   isEmpty(QMAKE_LRELEASE) {
@@ -51,8 +50,8 @@ HEADERS += sharetray.h \
  accessaction.h \
  messagebox.h
 
+RESOURCES += resources.qrc
 FORMS = dlg.ui
 
 QT += svg network
 DISTFILES += sharetraycpp
-

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2godesktopsharing.git


More information about the x2go-commits mailing list