summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOlivier Goffart <ogoffart@woboq.com>2012-05-11 10:34:03 +0200
committerQt by Nokia <qt-info@nokia.com>2012-05-11 11:48:41 +0200
commita5b01032b63a5f02bbecfe0a94e0c50a4521b21a (patch)
tree5e5411239d5427c119f865c12a76a540df9d4160
parentadfa9ccb102131de9739d5d79f320f07cea196ab (diff)
downloadqttools-a5b01032b63a5f02bbecfe0a94e0c50a4521b21a.tar.gz
Fix warning with GCC
warning: converting ‘false’ to pointer type ‘QWidget*’ Change-Id: I4cd605e1639f0f59033fbd7152ec645ce1252f38 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
-rw-r--r--src/designer/src/lib/shared/previewmanager.cpp2
-rw-r--r--src/designer/src/lib/uilib/abstractformbuilder.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/designer/src/lib/shared/previewmanager.cpp b/src/designer/src/lib/shared/previewmanager.cpp
index c46ac0303..36e39b2e2 100644
--- a/src/designer/src/lib/shared/previewmanager.cpp
+++ b/src/designer/src/lib/shared/previewmanager.cpp
@@ -811,7 +811,7 @@ QWidget *PreviewManager::raise(const QDesignerFormWindowInterface *fw, const Pre
{
typedef PreviewManagerPrivate::PreviewDataList PreviewDataList;
if (d->m_previews.empty())
- return false;
+ return 0;
// find matching window
const PreviewDataList::const_iterator cend = d->m_previews.constEnd();
diff --git a/src/designer/src/lib/uilib/abstractformbuilder.cpp b/src/designer/src/lib/uilib/abstractformbuilder.cpp
index e406b276f..c09107527 100644
--- a/src/designer/src/lib/uilib/abstractformbuilder.cpp
+++ b/src/designer/src/lib/uilib/abstractformbuilder.cpp
@@ -222,7 +222,7 @@ QWidget *QAbstractFormBuilder::load(QIODevice *dev, QWidget *parentWidget)
d->m_errorString.clear();
if (!readUiAttributes(reader, d->m_language, &d->m_errorString)) {
uiLibWarning(d->m_errorString);
- return false;
+ return 0;
}
DomUI ui;
ui.read(reader);