summaryrefslogtreecommitdiffstats
path: root/tools/designer
diff options
context:
space:
mode:
Diffstat (limited to 'tools/designer')
-rw-r--r--tools/designer/src/components/widgetbox/widgetboxtreewidget.cpp3
-rw-r--r--tools/designer/src/plugins/phononwidgets/videoplayertaskmenu.h3
2 files changed, 5 insertions, 1 deletions
diff --git a/tools/designer/src/components/widgetbox/widgetboxtreewidget.cpp b/tools/designer/src/components/widgetbox/widgetboxtreewidget.cpp
index 99dfb9c..38e3501 100644
--- a/tools/designer/src/components/widgetbox/widgetboxtreewidget.cpp
+++ b/tools/designer/src/components/widgetbox/widgetboxtreewidget.cpp
@@ -664,6 +664,9 @@ WidgetBoxTreeWidget::CategoryList WidgetBoxTreeWidget::loadCustomCategoryList()
void WidgetBoxTreeWidget::adjustSubListSize(QTreeWidgetItem *cat_item)
{
QTreeWidgetItem *embedItem = cat_item->child(0);
+ if (embedItem == 0)
+ return;
+
WidgetBoxCategoryListView *list_widget = static_cast<WidgetBoxCategoryListView*>(itemWidget(embedItem, 0));
list_widget->setFixedWidth(header()->width());
list_widget->doItemsLayout();
diff --git a/tools/designer/src/plugins/phononwidgets/videoplayertaskmenu.h b/tools/designer/src/plugins/phononwidgets/videoplayertaskmenu.h
index 0887a7c..8c54492 100644
--- a/tools/designer/src/plugins/phononwidgets/videoplayertaskmenu.h
+++ b/tools/designer/src/plugins/phononwidgets/videoplayertaskmenu.h
@@ -47,7 +47,8 @@
#include <QtDesigner/QDesignerTaskMenuExtension>
#include <QtDesigner/private/extensionfactory_p.h>
-#include <phonon>
+#include <Phonon/BackendCapabilities>
+#include <Phonon/VideoPlayer>
QT_BEGIN_NAMESPACE