diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-10 16:45:58 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-10 16:45:58 (GMT) |
| commit | edd1dc8caedf099422b5efeed48b7feea0927681 (patch) | |
| tree | 2414f6c0f1a7462ee8115a738fc414c51a0abd15 | |
| parent | 9c8f678ef95ed3eb6eae09a72695a27728a0e1c6 (diff) | |
| parent | 709a3a4b96f4cc483e63958494adbc5efdf6c57d (diff) | |
| download | Qt-edd1dc8caedf099422b5efeed48b7feea0927681.zip Qt-edd1dc8caedf099422b5efeed48b7feea0927681.tar.gz Qt-edd1dc8caedf099422b5efeed48b7feea0927681.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public:
License update as requested by legal for file relicensed from S60.
Make compile
Removed dependency to moc.exe from Symbian builds
| -rw-r--r-- | mkspecs/features/moc.prf | 2 | ||||
| -rw-r--r-- | src/3rdparty/s60/eiksoftkeyimage.h | 17 | ||||
| -rw-r--r-- | src/gui/text/qfontengine_s60.cpp | 2 |
3 files changed, 2 insertions, 19 deletions
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 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 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> |