From de88b9663c01691c64e2677444aab5c1b806c4c2 Mon Sep 17 00:00:00 2001
From: Miikka Heikkinen <miikka.heikkinen@digia.com>
Date: Wed, 10 Feb 2010 12:12:00 +0200
Subject: Removed dependency to moc.exe from Symbian builds

Having dependency to moc.exe makes no sense since we cannot build it
anyway when building with Symbian toolchain.

Task-number: QTBUG-7836
Reviewed-by: Janne Koskinen
---
 mkspecs/features/moc.prf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mkspecs/features/moc.prf b/mkspecs/features/moc.prf
index 42ce1bc..e4b7dae 100644
--- a/mkspecs/features/moc.prf
+++ b/mkspecs/features/moc.prf
@@ -97,7 +97,7 @@ equals(MOC_DIR, .) {
 }
 
 #auto depend on moc
-unix:!no_mocdepend {
+unix:!symbian:!no_mocdepend {
      moc_source.depends += $$first(QMAKE_MOC)
      moc_header.depends += $$first(QMAKE_MOC)
      !contains(TARGET, moc) { #auto build moc
-- 
cgit v0.12


From d7f8be6ec47bc8c241df95f7d13547a60362677b Mon Sep 17 00:00:00 2001
From: Thomas Zander <t.zander@nokia.com>
Date: Wed, 10 Feb 2010 11:24:27 +0100
Subject: Make compile

Reviewed-By: Alessandro Portale
---
 src/gui/text/qfontengine_s60.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/gui/text/qfontengine_s60.cpp b/src/gui/text/qfontengine_s60.cpp
index 9dd4af7..3ea084b 100644
--- a/src/gui/text/qfontengine_s60.cpp
+++ b/src/gui/text/qfontengine_s60.cpp
@@ -44,7 +44,7 @@
 #include "qglobal.h"
 #include <private/qapplication_p.h>
 #include "qimage.h"
-#include "qt_s60_p.h"
+#include <private/qt_s60_p.h>
 
 #include <e32base.h>
 #include <e32std.h>
-- 
cgit v0.12


From 709a3a4b96f4cc483e63958494adbc5efdf6c57d Mon Sep 17 00:00:00 2001
From: Janne Anttila <janne.anttila@digia.com>
Date: Wed, 10 Feb 2010 14:08:17 +0200
Subject: License update as requested by legal for file relicensed from S60.

Rev-By: TrustMe
---
 src/3rdparty/s60/eiksoftkeyimage.h | 17 -----------------
 1 file changed, 17 deletions(-)

diff --git a/src/3rdparty/s60/eiksoftkeyimage.h b/src/3rdparty/s60/eiksoftkeyimage.h
index 84f6108a..a658421 100644
--- a/src/3rdparty/s60/eiksoftkeyimage.h
+++ b/src/3rdparty/s60/eiksoftkeyimage.h
@@ -39,23 +39,6 @@
 **
 ****************************************************************************/
 
-/*
-* Copyright (c) 2002 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:  Changes cba button's label to image.
-*
-*/
-
 #ifndef EIKSOFTKEYIMAGE_H
 #define EIKSOFTKEYIMAGE_H
 
-- 
cgit v0.12