2 files changed, 18 insertions, 5 deletions
diff --git a/sources/pyside2/tests/QtCore/qsettings_test.py b/sources/pyside2/tests/QtCore/qsettings_test.py
index 982ddc38d..639f6d276 100644
--- a/sources/pyside2/tests/QtCore/qsettings_test.py
+++ b/sources/pyside2/tests/QtCore/qsettings_test.py
@@ -75,10 +75,7 @@ class TestQSettings(unittest.TestCase):
 
         # Handling zero value
         r = settings.value('zero_value')
-        if py3k.IS_PY3K:
-            self.assertEqual(type(r), int)
-        else:
-            self.assertEqual(type(r), long)
+        self.assertEqual(type(r), int)
 
         r = settings.value('zero_value', type=int)
         self.assertEqual(type(r), int)
diff --git a/sources/pyside2/tests/pysidetest/delegatecreateseditor_test.py b/sources/pyside2/tests/pysidetest/delegatecreateseditor_test.py
index 1378ca8ad..111d4ebbf 100644
--- a/sources/pyside2/tests/pysidetest/delegatecreateseditor_test.py
+++ b/sources/pyside2/tests/pysidetest/delegatecreateseditor_test.py
@@ -39,7 +39,10 @@ init_test_paths(True)
 from helper.usesqapplication import UsesQApplication
 from testbinding import TestView
 from PySide2.QtCore import Qt
-from PySide2.QtWidgets import QAbstractItemDelegate, QComboBox
+from PySide2.QtGui import QStandardItem, QStandardItemModel
+from PySide2.QtWidgets import (QAbstractItemDelegate, QComboBox,
+                               QSpinBox, QStyledItemDelegate,
+                               QStyleOptionViewItem, QWidget)
 
 id_text = 'This is me'
 
@@ -83,6 +86,19 @@ class EditorCreatedByDelegateTest(UsesQApplication):
         self.assertEqual(editor.itemData(0, Qt.DisplayRole), id_text)
         editor.metaObject()
 
+    def testIntDelegate(self):
+        """PYSIDE-1250: When creating a QVariant, use int instead of long long
+           for anything that fits into a int. Verify by checking that a spin
+           box is created as item view editor for int."""
+        item = QStandardItem()
+        item.setData(123123, Qt.EditRole)  # <-- QVariant conversion here
+        model = QStandardItemModel()
+        model.appendRow(item)
+        style_option = QStyleOptionViewItem()
+        delegate = QStyledItemDelegate()
+        editor = delegate.createEditor(None, style_option, model.index(0, 0))
+        self.assertEqual(type(editor), QSpinBox)
+
 
 if __name__ == '__main__':
     unittest.main()