4 files changed, 75 insertions, 10 deletions
diff --git a/PySide/QtCore/typesystem_core.xml b/PySide/QtCore/typesystem_core.xml
index 76bcaeb7b..e416e575a 100644
--- a/PySide/QtCore/typesystem_core.xml
+++ b/PySide/QtCore/typesystem_core.xml
@@ -2895,20 +2895,30 @@
     </inject-code>
   </add-function>
 
-  <add-function signature="QT_TR_NOOP(const char*)" return-type="PyString*">
-    <inject-code class="target" position="beginning">(void)%1;%PYARG_0 = %PYARG_1;</inject-code>
+  <add-function signature="QT_TR_NOOP(PyObject)" return-type="PyObject*">
+    <inject-code class="target" position="beginning">
+      <insert-template name="return_argument"><replace from="#" to="1" /></insert-template>
+    </inject-code>
   </add-function>
-  <add-function signature="QT_TR_NOOP_UTF8(const char*)" return-type="PyString*">
-    <inject-code class="target" position="beginning">(void)%1;%PYARG_0 = %PYARG_1;</inject-code>
+  <add-function signature="QT_TR_NOOP_UTF8(PyObject)" return-type="PyObject*">
+    <inject-code class="target" position="beginning">
+      <insert-template name="return_argument"><replace from="#" to="1" /></insert-template>
+    </inject-code>
   </add-function>
-  <add-function signature="QT_TRANSLATE_NOOP(const char*, const char*)" return-type="PyString*">
-    <inject-code class="target" position="beginning">(void)%1;(void)%2;%PYARG_0 = %PYARG_2;</inject-code>
+  <add-function signature="QT_TRANSLATE_NOOP(PyObject, PyObject)" return-type="PyObject*">
+    <inject-code class="target" position="beginning">
+      <insert-template name="return_argument"><replace from="#" to="2" /></insert-template>
+    </inject-code>
   </add-function>
-  <add-function signature="QT_TRANSLATE_NOOP3(const char*, const char*, const char*)" return-type="PyString*">
-    <inject-code class="target" position="beginning">(void)%1;(void)%2;(void)%3;%PYARG_0 = %PYARG_2;</inject-code>
+  <add-function signature="QT_TRANSLATE_NOOP3(PyObject, PyObject, PyObject)" return-type="PyObject*">
+    <inject-code class="target" position="beginning">
+      <insert-template name="return_argument"><replace from="#" to="2" /></insert-template>
+    </inject-code>
   </add-function>
-  <add-function signature="QT_TRANSLATE_NOOP_UTF8(const char*)" return-type="PyString*">
-    <inject-code class="target" position="beginning">(void)%1;%PYARG_0 = %PYARG_1;</inject-code>
+  <add-function signature="QT_TRANSLATE_NOOP_UTF8(PyObject)" return-type="PyObject*">
+    <inject-code class="target" position="beginning">
+      <insert-template name="return_argument"><replace from="#" to="1" /></insert-template>
+    </inject-code>
   </add-function>
 
   <inject-code class="native" position="beginning">
diff --git a/PySide/typesystem_templates.xml b/PySide/typesystem_templates.xml
index 9d39bb481..4604fda95 100644
--- a/PySide/typesystem_templates.xml
+++ b/PySide/typesystem_templates.xml
@@ -238,5 +238,11 @@
         return %CONVERTTOPYTHON[%TRANSPOSED_TYPE](%CPPSELF.transposed());
     </template>
 
+    <!-- Replace '#' for the argument number you want. -->
+    <template name="return_argument">
+        Py_INCREF(%PYARG_#);
+        %PYARG_0 = %PYARG_#;
+    </template>
+
 </typesystem>
 
diff --git a/tests/QtCore/CMakeLists.txt b/tests/QtCore/CMakeLists.txt
index b5bffe77e..8ec3cdd66 100644
--- a/tests/QtCore/CMakeLists.txt
+++ b/tests/QtCore/CMakeLists.txt
@@ -71,6 +71,7 @@ PYSIDE_TEST(setprop_on_ctor_test.py)
 PYSIDE_TEST(static_method_test.py)
 PYSIDE_TEST(static_protected_methods_test.py)
 PYSIDE_TEST(thread_signals_test.py)
+PYSIDE_TEST(tr_noop_test.py)
 PYSIDE_TEST(translation_test.py)
 PYSIDE_TEST(unaryoperator_test.py)
 PYSIDE_TEST(unicode_test.py)
diff --git a/tests/QtCore/tr_noop_test.py b/tests/QtCore/tr_noop_test.py
new file mode 100644
index 000000000..92029e008
--- /dev/null
+++ b/tests/QtCore/tr_noop_test.py
@@ -0,0 +1,48 @@
+import unittest
+
+import sys
+from PySide.QtCore import QT_TR_NOOP, QT_TR_NOOP_UTF8
+from PySide.QtCore import QT_TRANSLATE_NOOP, QT_TRANSLATE_NOOP3, QT_TRANSLATE_NOOP_UTF8
+
+class QtTrNoopTest(unittest.TestCase):
+
+    def setUp(self):
+        self.txt = 'Cthulhu fhtag!'
+
+    def tearDown(self):
+        del self.txt
+
+    def testQtTrNoop(self):
+        refcnt = sys.getrefcount(self.txt)
+        result = QT_TR_NOOP(self.txt)
+        self.assertEqual(result, self.txt)
+        self.assertEqual(sys.getrefcount(result), refcnt + 1)
+
+    def testQtTrNoopUtf8(self):
+        refcnt = sys.getrefcount(self.txt)
+        result = QT_TR_NOOP_UTF8(self.txt)
+        self.assertEqual(result, self.txt)
+        self.assertEqual(sys.getrefcount(result), refcnt + 1)
+
+    def testQtTranslateNoop(self):
+        refcnt = sys.getrefcount(self.txt)
+        result = QT_TRANSLATE_NOOP(None, self.txt)
+        self.assertEqual(result, self.txt)
+        self.assertEqual(sys.getrefcount(result), refcnt + 1)
+
+    def testQtTranslateNoopUtf8(self):
+        refcnt = sys.getrefcount(self.txt)
+        result = QT_TRANSLATE_NOOP_UTF8(self.txt)
+        self.assertEqual(result, self.txt)
+        self.assertEqual(sys.getrefcount(result), refcnt + 1)
+
+    def testQtTranslateNoop3(self):
+        refcnt = sys.getrefcount(self.txt)
+        result = QT_TRANSLATE_NOOP3(None, self.txt, None)
+        self.assertEqual(result, self.txt)
+        self.assertEqual(sys.getrefcount(result), refcnt + 1)
+
+
+if __name__ == '__main__':
+    unittest.main()
+