From: Simon Hausmann <simon.hausmann@nokia.com>
Date: Fri, 21 Oct 2011 10:38:00 +0000 (+0200)
Subject: Fix compilation on Harmattan
X-Git-Tag: qt-v5.0.0-alpha1~3139
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=6a7da1fb581da17d9408f755387a7798336176ae;p=profile%2Fivi%2Fqtbase.git

Fix compilation on Harmattan

Commit 87274e272d2a854563066489e20d019b4e6320de removed the maemo "specific"
bearer monitory example .ui file, but the .pro file wasn't updated.

Change-Id: I9daa000fe3e4b69789519f53541c106d01748ffd
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
---

diff --git a/examples/network/bearermonitor/bearermonitor.pro b/examples/network/bearermonitor/bearermonitor.pro
index 3486bc1..c8ae6d6 100644
--- a/examples/network/bearermonitor/bearermonitor.pro
+++ b/examples/network/bearermonitor/bearermonitor.pro
@@ -8,15 +8,9 @@ SOURCES = main.cpp \
           bearermonitor.cpp \
           sessionwidget.cpp
 
-maemo5|maemo6|linux-g++-maemo {
-  DEFINES += MAEMO_UI
-  FORMS = bearermonitor_maemo.ui \
-          sessionwidget_maemo.ui
-} else {
-  FORMS = bearermonitor_240_320.ui \
-          bearermonitor_640_480.ui \
-          sessionwidget.ui
-}
+FORMS = bearermonitor_240_320.ui \
+        bearermonitor_640_480.ui \
+        sessionwidget.ui
 
 win32:!wince*:LIBS += -lws2_32
 wince*:LIBS += -lws2