From d4c67f5293c0a6c7d7b586a401e1972b964d0c16 Mon Sep 17 00:00:00 2001
From: Kai Koehne <kai.koehne@nokia.com>
Date: Mon, 24 Aug 2009 11:58:43 +0200
Subject: Silence gcc compiler error

---
 src/declarative/qml/qmldom.cpp | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/declarative/qml/qmldom.cpp b/src/declarative/qml/qmldom.cpp
index 2aaf492..9e12485 100644
--- a/src/declarative/qml/qmldom.cpp
+++ b/src/declarative/qml/qmldom.cpp
@@ -765,8 +765,11 @@ Text { id: MyText }
 */
 QString QmlDomObject::objectId() const
 {
-    if (d->object) return d->object->id;
-    else return QByteArray();
+    if (d->object) {
+        return d->object->id;
+    } else {
+        return QString();
+    }
 }
 
 /*!
-- 
cgit v0.12