From 51b7b494213643c9808efecf6a7372d3b63c6f50 Mon Sep 17 00:00:00 2001
From: Stephen Kelly <steveire@gmail.com>
Date: Tue, 10 Jan 2017 08:44:21 +0000
Subject: Bindings: Correctly handle access specifiers within macros

The Q_DECLARE_TR_FUNCTIONS macro contains a `public:` access specifier,
but the sip_generator just pastes the entire macro name.  Adjust the
generator to extract the correct access specifier.
---
 tests/GenerateSipBindings/cpplib.h | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'tests/GenerateSipBindings/cpplib.h')

diff --git a/tests/GenerateSipBindings/cpplib.h b/tests/GenerateSipBindings/cpplib.h
index ba8e9f27..81ad2038 100644
--- a/tests/GenerateSipBindings/cpplib.h
+++ b/tests/GenerateSipBindings/cpplib.h
@@ -5,6 +5,7 @@
 #include <QtCore/QString>
 #include <QtCore/QStringList>
 #include <QtCore/QMap>
+#include <QtCore/QCoreApplication>
 
 #include <functional>
 
@@ -85,12 +86,13 @@ private:
   int* const mNum;
 };
 
-
 class NonCopyableByMacro
 {
 public:
   NonCopyableByMacro();
 
+  Q_DECLARE_TR_FUNCTIONS(NonCopyableByMacro)
+
 private:
   Q_DISABLE_COPY(NonCopyableByMacro)
 };
-- 
cgit v1.2.1