4 files changed, 61 insertions, 0 deletions
diff --git a/tests/libsample/size.h b/tests/libsample/size.h
index 6154245f7..3915bf502 100644
--- a/tests/libsample/size.h
+++ b/tests/libsample/size.h
@@ -182,5 +182,17 @@ inline const Size operator/(const Size& s, double div)
     return Size(s.m_width / div, s.m_height / div);
 }
 
+typedef double real;
+class LIBSAMPLE_API SizeF
+{
+public:
+    SizeF(real width, real height) : m_width(width), m_height(height) {}
+    real width() { return m_width; }
+    real height() { return m_height; }
+private:
+    real m_width;
+    real m_height;
+};
+
 #endif // SIZE_H
 
diff --git a/tests/samplebinding/CMakeLists.txt b/tests/samplebinding/CMakeLists.txt
index 072e36c34..23a3c456c 100644
--- a/tests/samplebinding/CMakeLists.txt
+++ b/tests/samplebinding/CMakeLists.txt
@@ -83,6 +83,7 @@ ${CMAKE_CURRENT_BINARY_DIR}/sample/samplenamespace_someclass_wrapper.cpp
 ${CMAKE_CURRENT_BINARY_DIR}/sample/samplenamespace_derivedfromnamespace_wrapper.cpp
 ${CMAKE_CURRENT_BINARY_DIR}/sample/simplefile_wrapper.cpp
 ${CMAKE_CURRENT_BINARY_DIR}/sample/size_wrapper.cpp
+${CMAKE_CURRENT_BINARY_DIR}/sample/sizef_wrapper.cpp
 ${CMAKE_CURRENT_BINARY_DIR}/sample/sonofmderived1_wrapper.cpp
 ${CMAKE_CURRENT_BINARY_DIR}/sample/str_wrapper.cpp
 ${CMAKE_CURRENT_BINARY_DIR}/sample/strlist_wrapper.cpp
diff --git a/tests/samplebinding/numericaltypedef_test.py b/tests/samplebinding/numericaltypedef_test.py
new file mode 100644
index 000000000..094b4f9fc
--- /dev/null
+++ b/tests/samplebinding/numericaltypedef_test.py
@@ -0,0 +1,46 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+#
+# This file is part of the Shiboken Python Bindings Generator project.
+#
+# Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+#
+# Contact: PySide team <contact@pyside.org>
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public License
+# version 2.1 as published by the Free Software Foundation. Please
+# review the following information to ensure the GNU Lesser General
+# Public License version 2.1 requirements will be met:
+# http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+# #
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+# 02110-1301 USA
+
+import unittest
+
+from sample import SizeF
+
+class NumericalTypedefTest(unittest.TestCase):
+
+    def testNumericalTypedefExact(self):
+        width, height = (1.1, 2.2)
+        size = SizeF(width, height)
+        self.assertEqual(size.width(), width)
+        self.assertEqual(size.height(), height)
+
+    def testNumericalTypedefConvertible(self):
+        width, height = (1, 2)
+        size = SizeF(width, height)
+        self.assertEqual(size.width(), float(width))
+        self.assertEqual(size.height(), float(height))
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/tests/samplebinding/typesystem_sample.xml b/tests/samplebinding/typesystem_sample.xml
index 728e9d77b..b02283395 100644
--- a/tests/samplebinding/typesystem_sample.xml
+++ b/tests/samplebinding/typesystem_sample.xml
@@ -5,6 +5,7 @@
 
     <primitive-type name="bool"/>
     <primitive-type name="double"/>
+    <primitive-type name="real"/>
     <primitive-type name="int"/>
     <primitive-type name="short"/>
     <primitive-type name="unsigned int" />
@@ -1246,6 +1247,7 @@
             </inject-code>
         </add-function>
     </value-type>
+    <value-type name="SizeF"/>
     <value-type name="MapUser"/>
     <value-type name="PairUser"/>
     <value-type name="ListUser">