diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2014-10-29 22:55:53 -0700 |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@intel.com> | 2014-11-01 21:52:07 +0100 |
| commit | d14e2b48205157b6776b82af18adfb2dd0050286 (patch) | |
| tree | feb4bcc36bf6976bc1b94dc24ce780c9e57d962c | |
| parent | d3442f4095b58ecd43cea2fa56f5bdd45385a1d8 (diff) | |
| download | qttools-d14e2b48205157b6776b82af18adfb2dd0050286.tar.gz | |
Q_ASSERT now always expands the argument
We need isDescendant to be defined.
Change-Id: I014c0501d11613c252c3bf2297442e2693708b5e
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
| -rw-r--r-- | src/designer/src/components/formeditor/formwindow.cpp | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/designer/src/components/formeditor/formwindow.cpp b/src/designer/src/components/formeditor/formwindow.cpp index 197349716..a0dffd9ab 100644 --- a/src/designer/src/components/formeditor/formwindow.cpp +++ b/src/designer/src/components/formeditor/formwindow.cpp @@ -1255,7 +1255,6 @@ QWidget *FormWindow::createWidget(DomUI *ui, const QRect &rc, QWidget *target) return widget; } -#if !defined(QT_NO_DEBUG) || defined(QT_FORCE_ASSERTS) static bool isDescendant(const QWidget *parent, const QWidget *child) { for (; child != 0; child = child->parentWidget()) { @@ -1264,7 +1263,6 @@ static bool isDescendant(const QWidget *parent, const QWidget *child) } return false; } -#endif void FormWindow::resizeWidget(QWidget *widget, const QRect &geometry) { |