From d14e2b48205157b6776b82af18adfb2dd0050286 Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Wed, 29 Oct 2014 22:55:53 -0700 Subject: [PATCH] Q_ASSERT now always expands the argument We need isDescendant to be defined. Change-Id: I014c0501d11613c252c3bf2297442e2693708b5e Reviewed-by: Friedemann Kleint --- src/designer/src/components/formeditor/formwindow.cpp | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/designer/src/components/formeditor/formwindow.cpp b/src/designer/src/components/formeditor/formwindow.cpp index 1973497..a0dffd9 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) { -- 2.7.4