aboutsummaryrefslogtreecommitdiffstats
path: root/tests/QtGui
diff options
context:
space:
mode:
authorHugo Parente Lima <hugo.pl@gmail.com>2011-08-31 15:24:40 -0300
committerHugo Parente Lima <hugo.pl@gmail.com>2012-03-08 16:54:49 -0300
commit08d202e824ffc6221bd426084ac169324808e9da (patch)
tree3a6f97d933d260f5f1bab19b621a5dde7aaf3996 /tests/QtGui
parent700a4cf95ca3723062dc6affc89a2bd6a5b66dee (diff)
Fix bug 966 - "QX11Info.display() missing"
Diffstat (limited to 'tests/QtGui')
-rw-r--r--tests/QtGui/CMakeLists.txt2
-rw-r--r--tests/QtGui/x11_symbols_test.py17
2 files changed, 13 insertions, 6 deletions
diff --git a/tests/QtGui/CMakeLists.txt b/tests/QtGui/CMakeLists.txt
index d4ea1902f..75f576f33 100644
--- a/tests/QtGui/CMakeLists.txt
+++ b/tests/QtGui/CMakeLists.txt
@@ -160,6 +160,6 @@ PYSIDE_TEST(virtual_pure_override_test.py)
PYSIDE_TEST(wrong_return_test.py)
-if(X11)
+if(Q_WS_X11)
PYSIDE_TEST(x11_symbols_test.py)
endif()
diff --git a/tests/QtGui/x11_symbols_test.py b/tests/QtGui/x11_symbols_test.py
index 29cce150e..6a38eed59 100644
--- a/tests/QtGui/x11_symbols_test.py
+++ b/tests/QtGui/x11_symbols_test.py
@@ -3,15 +3,22 @@
import unittest
-from PySide.QtGui import QPixmap
+from PySide.QtGui import *
class X11Test(unittest.TestCase):
def test(self):
- self.assert_('handle' in dir(QPixmap))
- self.assert_('x11Info' in dir(QPixmap))
- self.assert_('x11PictureHandle' in dir(QPixmap))
- self.assert_('x11SetDefaultScreen' in dir(QPixmap))
+ qpixmapFuncs = dir(QPixmap)
+ self.assert_('handle' in qpixmapFuncs)
+ self.assert_('x11Info' in qpixmapFuncs)
+ self.assert_('x11PictureHandle' in qpixmapFuncs)
+ self.assert_('x11SetDefaultScreen' in qpixmapFuncs)
+
+ def testX11Functions(self):
+ qx11infoFuncs = dir(QX11Info)
+ self.assert_('display' in qx11infoFuncs)
+ self.assert_('appVisual' in qx11infoFuncs)
+ self.assert_('visual' in qx11infoFuncs)
if __name__ == '__main__':
unittest.main()