diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-03-22 10:36:21 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-03-22 10:36:21 (GMT) |
| commit | 99d33dbaade6417ef1697bdfb82fdd1ec8e659c0 (patch) | |
| tree | f131238944a060af418b83596958158e6110a6aa /tools/designer/src/components/taskmenu/tablewidget_taskmenu.cpp | |
| parent | 9e85af3454bd0a2d962523d52e688f9bc7259528 (diff) | |
| parent | af617c319772a34115d0c4d802f25a807cb43065 (diff) | |
| download | Qt-99d33dbaade6417ef1697bdfb82fdd1ec8e659c0.zip Qt-99d33dbaade6417ef1697bdfb82fdd1ec8e659c0.tar.gz Qt-99d33dbaade6417ef1697bdfb82fdd1ec8e659c0.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-tools-staging into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-tools-staging:
Designer: Avoid nested QDialog's in item widget content dialogs.
Diffstat (limited to 'tools/designer/src/components/taskmenu/tablewidget_taskmenu.cpp')
| -rw-r--r-- | tools/designer/src/components/taskmenu/tablewidget_taskmenu.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/designer/src/components/taskmenu/tablewidget_taskmenu.cpp b/tools/designer/src/components/taskmenu/tablewidget_taskmenu.cpp index e3170bd..e98714f 100644 --- a/tools/designer/src/components/taskmenu/tablewidget_taskmenu.cpp +++ b/tools/designer/src/components/taskmenu/tablewidget_taskmenu.cpp @@ -94,7 +94,7 @@ void TableWidgetTaskMenu::editItems() Q_ASSERT(m_tableWidget != 0); - TableWidgetEditor dlg(m_formWindow, m_tableWidget->window()); + TableWidgetEditorDialog dlg(m_formWindow, m_tableWidget->window()); TableWidgetContents oldCont = dlg.fillContentsFromTableWidget(m_tableWidget); if (dlg.exec() == QDialog::Accepted) { TableWidgetContents newCont = dlg.contents(); |