[oe-commits] org.oe.dev packages/qt4/qtopia-core: Prepare for someone to use -qconfig

[freyther commit]

packages/qt4/qtopia-core: Prepare for someone to use -qconfig
    -We don't disable any features, but passing -qconfig will automatically
     disable q3support so we can't enable the usage of -qconfig by default
    -Install an OE qconfig-oe.h and QT_QCONFIG can be overriden by the default
     OVERRIDE system (this makes up a bit for the lacking documentation)

Author: freyther at openembedded.org
Branch: org.openembedded.dev
Revision: f1621de24fc1acbb89be67256867ca01cea8c10d
ViewMTN: http://monotone.openembedded.org/revision/info/f1621de24fc1acbb89be67256867ca01cea8c10d
Files:
1
packages/qt4/qtopia-core-4.3.3/qconfig-oe.h
packages/qt4/qtopia-core.inc
Diffs:

#
# mt diff -rc35f3da4f599772bf1ca71246b81a4339996bb5c -rf1621de24fc1acbb89be67256867ca01cea8c10d
#
# 
# 
# add_file "packages/qt4/qtopia-core-4.3.3/qconfig-oe.h"
#  content [b03c0cf1186234b787173c4ebb4d6ee12103b1b6]
# 
# patch "packages/qt4/qtopia-core.inc"
#  from [d84b9bbe970aba94f5e3b17f97d946f54e674a25]
#    to [3fc8e29466adb68cfe7d5609ee964d7ba4951bbe]
# 
============================================================
--- packages/qt4/qtopia-core-4.3.3/qconfig-oe.h	b03c0cf1186234b787173c4ebb4d6ee12103b1b6
+++ packages/qt4/qtopia-core-4.3.3/qconfig-oe.h	b03c0cf1186234b787173c4ebb4d6ee12103b1b6
@@ -0,0 +1,45 @@
+/****************************************************************************
+**
+** Copyright (C) 1992-2007 Trolltech ASA. All rights reserved.
+**
+** This file is part of the QtCore module of the Qt Toolkit.
+**
+** This file may be used under the terms of the GNU General Public
+** License version 2.0 as published by the Free Software Foundation
+** and appearing in the file LICENSE.GPL included in the packaging of
+** this file.  Please review the following information to ensure GNU
+** General Public Licensing requirements will be met:
+** http://trolltech.com/products/qt/licenses/licensing/opensource/
+**
+** If you are unsure which license is appropriate for your use, please
+** review the following information:
+** http://trolltech.com/products/qt/licenses/licensing/licensingoverview
+** or contact the sales department at sales at trolltech.com.
+**
+** In addition, as a special exception, Trolltech gives you certain
+** additional rights. These rights are described in the Trolltech GPL
+** Exception version 1.0, which can be found at
+** http://www.trolltech.com/products/qt/gplexception/ and in the file
+** GPL_EXCEPTION.txt in this package.
+**
+** In addition, as a special exception, Trolltech, as the sole copyright
+** holder for Qt Designer, grants users of the Qt/Eclipse Integration
+** plug-in the right for the Qt/Eclipse Integration to link to
+** functionality provided by Qt Designer and its related libraries.
+**
+** Trolltech reserves all rights not expressly granted herein.
+**
+** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
+** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+**
+****************************************************************************/
+
+
+/*
+ Empty leaves all features enabled. See doc/html/emb-features.html for choices.
+
+ Note that disabling some features will produce a libqt that is not
+ compatible with other libqt builds. Such modifications are only
+ supported on Qtopia Core where reducing the library size is important
+ and where the application-suite is often a fixed set.
+*/
============================================================
--- packages/qt4/qtopia-core.inc	d84b9bbe970aba94f5e3b17f97d946f54e674a25
+++ packages/qt4/qtopia-core.inc	3fc8e29466adb68cfe7d5609ee964d7ba4951bbe
@@ -7,6 +7,7 @@ SRC_URI = "ftp://ftp.trolltech.com/qt/so
 PR = "r1"
 
 SRC_URI = "ftp://ftp.trolltech.com/qt/source/qtopia-core-opensource-src-${PV}.tar.gz \
+           file://qconfig-oe.h \
            file://0001-cross-compile.patch;patch=1 \
            file://0003-no-tools.patch;patch=1 \
            file://0004-no-qmake.patch;patch=1 \
@@ -25,6 +26,10 @@ QT_CONFIG_FLAGS += " \
     ${QT_QCONFIG} \
     "
 
+do_configure_prepend() {
+    cp ${WORKDIR}/qconfig-oe.h ${S}/src/corelib/global
+}
+
 QT_QCONFIG = ""
 QT_BASE_NAME = "qtopiacore"
 QT_BASE_LIB  = "libqtopiacore"