diff options
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | plugins/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | tests/QtUiTools/bug_392.py | 11 | ||||
| -rw-r--r-- | tests/QtUiTools/customwidget.ui | 51 |
4 files changed, 3 insertions, 63 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 71aee4f1c..4ad006e25 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -183,7 +183,7 @@ set(GENERATOR_EXTRA_FLAGS --generatorSet=shiboken --enable-parent-ctor-heuristic enable_testing() add_subdirectory(libpyside) -if(QT_QTDESIGNER_FOUND) +if(QT_QTUITOOLS_FOUND) add_subdirectory(plugins) endif() # project directories diff --git a/plugins/CMakeLists.txt b/plugins/CMakeLists.txt index 792d05541..e7a8fd134 100644 --- a/plugins/CMakeLists.txt +++ b/plugins/CMakeLists.txt @@ -19,7 +19,7 @@ add_library(uiplugin STATIC ${ui_plugin_src} ${MOC_FILES}) add_definitions(-fPIC) add_definitions(-DQT_STATICPLUGIN) target_link_libraries(uiplugin - ${QT_QTDESIGNER_LIBRARY} + ${QT_QTUITOOLS_LIBRARY} ${SHIBOKEN_LIBRARY} ${PYTHON_LIBRARY}) if (CMAKE_BUILD_TYPE STREQUAL "Debug") diff --git a/tests/QtUiTools/bug_392.py b/tests/QtUiTools/bug_392.py index 9cc8b210b..69817ff9f 100644 --- a/tests/QtUiTools/bug_392.py +++ b/tests/QtUiTools/bug_392.py @@ -2,7 +2,7 @@ import unittest import os from helper import UsesQApplication -from PySide import QtGui, QtDeclarative +from PySide import QtGui from PySide.QtUiTools import QUiLoader class MyWidget(QtGui.QComboBox): @@ -21,15 +21,6 @@ class BugTest(UsesQApplication): result = loader.load(filePath, w) self.assert_(isinstance(result.statusbar.actionFoo, QtGui.QAction)) - def testCustomWidgets(self): - w = QtGui.QWidget() - loader = QUiLoader() - - filePath = os.path.join(os.path.dirname(__file__), 'customwidget.ui') - result = loader.load(filePath, w) - self.assert_(isinstance(result.declarativeView, QtDeclarative.QDeclarativeView)) - self.assert_(isinstance(result.worldTimeClock, QtGui.QWidget)) - def testPythonCustomWidgets(self): w = QtGui.QWidget() loader = QUiLoader() diff --git a/tests/QtUiTools/customwidget.ui b/tests/QtUiTools/customwidget.ui deleted file mode 100644 index 181ee6072..000000000 --- a/tests/QtUiTools/customwidget.ui +++ /dev/null @@ -1,51 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<ui version="4.0"> - <class>qwidget</class> - <widget class="QWidget" name="qwidget"> - <property name="geometry"> - <rect> - <x>0</x> - <y>0</y> - <width>303</width> - <height>350</height> - </rect> - </property> - <property name="windowTitle"> - <string/> - </property> - <widget class="QDeclarativeView" name="declarativeView"> - <property name="geometry"> - <rect> - <x>0</x> - <y>150</y> - <width>300</width> - <height>200</height> - </rect> - </property> - </widget> - <widget class="WorldTimeClock" name="worldTimeClock"> - <property name="geometry"> - <rect> - <x>190</x> - <y>20</y> - <width>100</width> - <height>100</height> - </rect> - </property> - </widget> - </widget> - <customwidgets> - <customwidget> - <class>QDeclarativeView</class> - <extends>QGraphicsView</extends> - <header>QtDeclarative/QDeclarativeView</header> - </customwidget> - <customwidget> - <class>WorldTimeClock</class> - <extends>QWidget</extends> - <header>worldtimeclock.h</header> - </customwidget> -</customwidgets> - <resources/> - <connections/> -</ui> |