[SCM] qca-qt5 packaging branch, kubuntu_wily_archive, updated. 172644dc04f9209bd3247329f027acc17b3e6bbb

[Clive Johnston]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-req/qca-qt5.git;a=commitdiff;h=172644d

The following commit has been merged in the kubuntu_wily_archive branch:
commit 172644dc04f9209bd3247329f027acc17b3e6bbb
Author: Clive Johnston <clivejo at aol.com>
Date:   Mon Oct 5 13:25:51 2015 +0100

    Adding patch
    
    * Added a patch to use Q_SLOTS/Q_SIGNALS instead of slots/signals in all
      headers from include dir
      ( use_q_slots-q_signals_instead_of_slots-signals.diff )
    * Added patch into series file
    * Updated changelog
---
 debian/changelog                                   |  5 ++++
 debian/patches/series                              |  2 +-
 ...q_slots-q_signals_instead_of_slots-signals.diff | 31 ++++++++++++++++++++++
 3 files changed, 37 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 8f848fd..ed3ec30 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,14 @@
 qca-qt5 (2.1.0.3-0ubuntu3) UNRELEASED; urgency=medium
 
+  [ José Manuel Santamaría Lema ]
   * Bump build depend on pkg-kde-tools to (>> 0.15.15) so we make sure we are
     building against a pkg-kde-tools which provides the kde frameworks
     module.
 
+  [ Clive Johnston ]
+  * Adding patch to use Q_SLOTS/Q_SIGNALS instead of slots/signals in all 
+    headers from include dir 
+
  -- José Manuel Santamaría Lema <panfaust at gmail.com>  Wed, 11 Feb 2015 17:51:58 +0100
 
 qca-qt5 (2.1.0.3-0ubuntu2) vivid; urgency=medium
diff --git a/debian/patches/series b/debian/patches/series
index 2475dc6..4f7782f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,4 +3,4 @@ pipeunittest_more_wait.diff
 hurd_msync.diff
 kubuntu_ignore_filewatch_test.diff
 kubuntu_mkspecs-dir.diff
-
+use_q_slots-q_signals_instead_of_slots-signals.diff
diff --git a/debian/patches/use_q_slots-q_signals_instead_of_slots-signals.diff b/debian/patches/use_q_slots-q_signals_instead_of_slots-signals.diff
new file mode 100644
index 0000000..0c19724
--- /dev/null
+++ b/debian/patches/use_q_slots-q_signals_instead_of_slots-signals.diff
@@ -0,0 +1,31 @@
+From 66b9754170759d9333d5fc1e348642814d0310dd Mon Sep 17 00:00:00 2001
+From: Jan Grulich <jgrulich at redhat.com>
+Date: Thu, 17 Sep 2015 16:14:24 +0200
+Subject: [PATCH] Use Q_SLOTS/Q_SIGNALS instead of slots/signals in all headers
+ from include dir REVIEW:125289
+
+---
+ include/QtCrypto/qca_safetimer.h | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/include/QtCrypto/qca_safetimer.h b/include/QtCrypto/qca_safetimer.h
+index 68dde5c..2de0d43 100644
+--- a/include/QtCrypto/qca_safetimer.h
++++ b/include/QtCrypto/qca_safetimer.h
+@@ -44,12 +44,12 @@ public:
+ 	void setSingleShot(bool singleShot);
+ 	int timerId() const;
+ 
+-public slots:
++public Q_SLOTS:
+ 	void start(int msec);
+ 	void start();
+ 	void stop();
+ 
+-signals:
++Q_SIGNALS:
+ 	void timeout();
+ 
+ protected:
+-- 
+2.1.4

-- 
qca-qt5 packaging