+++ /dev/null
-#
-# Copyright (C) 2008 OpenedHand Ltd.
-#
-
-SUMMARY = "Testing tools/applications"
-LICENSE = "MIT"
-
-PR = "r2"
-
-inherit packagegroup
-
-PACKAGE_ARCH = "${MACHINE_ARCH}"
-
-# For backwards compatibility after rename
-RPROVIDES_${PN} = "task-core-tools-testapps"
-RREPLACES_${PN} = "task-core-tools-testapps"
-RCONFLICTS_${PN} = "task-core-tools-testapps"
-
-# kexec-tools doesn't work on Mips
-KEXECTOOLS ?= "kexec"
-KEXECTOOLS_mips ?= ""
-KEXECTOOLS_mipsel ?= ""
-KEXECTOOLS_powerpc ?= ""
-KEXECTOOLS_e5500-64b ?= ""
-KEXECTOOLS_aarch64 ?= ""
-
-X11GLTOOLS = "\
- mesa-demos \
- piglit \
- "
-
-3GTOOLS = "\
- ofono-tests \
- "
-
-X11TOOLS = "\
- fstests \
- owl-video \
- x11perf \
- xrestop \
- xwininfo \
- xprop \
- xvideo-tests \
- "
-
-RDEPENDS_${PN} = "\
- blktool \
- tslib-calibrate \
- tslib-tests \
- lrzsz \
- ${KEXECTOOLS} \
- alsa-utils-amixer \
- alsa-utils-aplay \
- gst-meta-video \
- gst-meta-audio \
- ltp \
- connman-tools \
- connman-tests \
- connman-client \
- ${@base_contains('DISTRO_FEATURES', 'x11', "${X11TOOLS}", "", d)} \
- ${@base_contains('DISTRO_FEATURES', 'x11 opengl', "${X11GLTOOLS}", "", d)} \
- ${@base_contains('DISTRO_FEATURES', '3g', "${3GTOOLS}", "", d)} \
- "
+++ /dev/null
-#
-# Copyright (C) 2010 Intel Corporation
-#
-
-SUMMARY = "Linux Standard Base (LSB)"
-DESCRIPTION = "Packages required to satisfy the Linux Standard Base (LSB) specification"
-PR = "r10"
-LICENSE = "MIT"
-
-inherit packagegroup
-
-PACKAGES = "\
- packagegroup-core-lsb \
- packagegroup-core-sys-extended \
- packagegroup-core-db \
- packagegroup-core-perl \
- packagegroup-core-python \
- packagegroup-core-tcl \
- packagegroup-core-lsb-misc \
- packagegroup-core-lsb-core \
- packagegroup-core-lsb-perl \
- packagegroup-core-lsb-python \
- packagegroup-core-lsb-desktop \
- packagegroup-core-lsb-runtime-add \
- "
-
-
-RPROVIDES_packagegroup-core-lsb = "task-core-lsb"
-RDEPENDS_packagegroup-core-lsb = "\
- packagegroup-core-sys-extended \
- packagegroup-core-db \
- packagegroup-core-perl \
- packagegroup-core-python \
- packagegroup-core-tcl \
- packagegroup-core-lsb-misc \
- packagegroup-core-lsb-core \
- packagegroup-core-lsb-perl \
- packagegroup-core-lsb-python \
- packagegroup-core-lsb-desktop \
- packagegroup-core-lsb-runtime-add \
- "
-
-
-RDEPENDS_packagegroup-core-sys-extended = "\
- curl \
- dhcp-client \
- gamin \
- hdparm \
- libaio \
- lrzsz \
- lzo \
- mc \
- mc-fish \
- mc-helpers \
- mc-helpers-perl \
- mc-helpers-python \
- mdadm \
- minicom \
- neon \
- parted \
- ${PTH} \
- quota \
- screen \
- setserial \
- sysstat \
- udev-extraconf \
- unzip \
- watchdog \
- wget \
- which \
- xinetd \
- zip \
- "
-
-RDEPENDS_packagegroup-core-db = "\
- db \
- sqlite3 \
- "
-
-RDEPENDS_packagegroup-core-perl = "\
- gdbm \
- perl \
- zlib \
- "
-
-
-RDEPENDS_packagegroup-core-python = "\
- expat \
- gdbm \
- gmp \
- ncurses \
- openssl \
- python \
- readline \
- zip \
- "
-
-RDEPENDS_packagegroup-core-tcl = "\
- tcl \
- "
-
-# Miscellaneous packages required by LSB (or LSB tests)
-RDEPENDS_packagegroup-core-lsb-misc = "\
- chkconfig \
- gettext \
- gettext-runtime \
- groff \
- lsbinitscripts \
- lsbtest \
- lsof \
- strace \
- libusb1 \
- usbutils \
- rpm \
- "
-
-SUMMARY_packagegroup-core-lsb-core = "LSB Core"
-DESCRIPTION_packagegroup-core-lsb-core = "Packages required to support commands/libraries \
- specified in the LSB Core specification"
-RDEPENDS_packagegroup-core-lsb-core = "\
- at \
- bash \
- bc \
- binutils \
- binutils-symlinks \
- coreutils \
- cpio \
- cronie \
- cups \
- diffutils \
- ed \
- eglibc-utils \
- elfutils \
- file \
- findutils \
- fontconfig-utils \
- foomatic-filters \
- gawk \
- ghostscript \
- grep \
- gzip \
- localedef \
- lsb \
- m4 \
- mailx \
- make \
- man \
- man-pages \
- mktemp \
- msmtp \
- patch \
- pax \
- procps \
- psmisc \
- sed \
- shadow \
- tar \
- time \
- util-linux \
- xdg-utils \
- \
- eglibc \
- libgcc \
- libpam \
- libxml2 \
- ncurses \
- zlib \
- nspr \
- libpng12 \
- nss \
-"
-
-SUMMARY_packagegroup-core-lsb-perl = "LSB Runtime Languages (Perl)"
-DESCRIPTION_packagegroup-core-lsb-perl = "Packages required to support libraries \
- specified in the LSB Runtime languages specification (Perl parts)"
-RDEPENDS_packagegroup-core-lsb-perl = "\
- perl \
- perl-modules \
- perl-misc \
- perl-pod \
- perl-dev \
- perl-doc \
-"
-
-SUMMARY_packagegroup-core-lsb-python = "LSB Runtime Languages (Python)"
-DESCRIPTION_packagegroup-core-lsb-python = "Packages required to support libraries \
- specified in the LSB Runtime languages specification (Python parts)"
-RDEPENDS_packagegroup-core-lsb-python = "\
- python \
- python-modules \
- python-misc \
-"
-
-def get_libqt3(d):
- if 'linuxstdbase' in d.getVar('DISTROOVERRIDES') or "":
- if 'qt3' in d.getVar('BBFILE_COLLECTIONS') or "":
- return 'libqt-mt3'
-
- bb.warn('The meta-qt3 layer should be added, this layer provides Qt 3.x')
- bb.warn('libraries. Its intended use is for passing LSB tests as Qt3 is')
- bb.warn('a requirement for LSB')
- return ''
-
-QT4PKGS = " \
- libqtcore4 \
- libqtgui4 \
- libqtsql4 \
- libqtsvg4 \
- libqtxml4 \
- libqtnetwork4 \
- qt4-plugin-sqldriver-sqlite \
- ${@base_contains("DISTRO_FEATURES", "opengl", "libqtopengl4", "", d)} \
- "
-QT4PKGS_mips64 = ""
-
-SUMMARY_packagegroup-core-lsb-desktop = "LSB Desktop"
-DESCRIPTION_packagegroup-core-lsb-desktop = "Packages required to support libraries \
- specified in the LSB Desktop specification"
-RDEPENDS_packagegroup-core-lsb-desktop = "\
- libxt \
- libxxf86vm \
- libdrm \
- libglu \
- libxi \
- libxtst \
- libx11-locale \
- xorg-minimal-fonts \
- gdk-pixbuf-loader-ico \
- gdk-pixbuf-loader-bmp \
- gdk-pixbuf-loader-ani \
- gdk-pixbuf-xlib \
- liberation-fonts \
- gtk+ \
- atk \
- libasound \
- ${QT4PKGS} \
- ${@get_libqt3(d)} \
-"
-
-RDEPENDS_packagegroup-core-lsb-runtime-add = "\
- ldd \
- pam-plugin-wheel \
- e2fsprogs-mke2fs \
- mkfontdir \
- liburi-perl \
- libxml-parser-perl \
- libxml-perl \
- libxml-sax-perl \
- eglibc-localedatas \
- eglibc-gconvs \
- eglibc-charmaps \
- eglibc-binaries \
- eglibc-localedata-posix \
- eglibc-extra-nss \
- eglibc-pcprofile \
- libclass-isa-perl \
- libenv-perl \
- libdumpvalue-perl \
- libfile-checktree-perl \
- libi18n-collate-perl \
- libpod-plainer-perl \
-"
-
-PTH = "pth"
-PTH_libc-uclibc = ""
-
+++ /dev/null
-SUMMARY = "Basic X11 session"
-DESCRIPTION = "Packages required to set up a basic working X11 session"
-LICENSE = "MIT"
-PR = "r1"
-
-inherit packagegroup
-
-# For backwards compatibility after rename
-RPROVIDES_${PN} = "task-core-x11-mini task-core-x11-base"
-RREPLACES_${PN} = "task-core-x11-mini task-core-x11-base"
-RCONFLICTS_${PN} = "task-core-x11-mini task-core-x11-base"
-
-RDEPENDS_${PN} = "\
- packagegroup-core-x11-xserver \
- packagegroup-core-x11-utils \
- dbus \
- pointercal \
- matchbox-terminal \
- matchbox-wm \
- mini-x-session \
- liberation-fonts \
- "
+++ /dev/null
-DESCRIPTION = "An image that will launch into the demo application for the embedded (not based on X11) version of Qt."
-LICENSE = "MIT"
-PR = "r3"
-
-LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=4d92cd373abda3937c2bc47fbc49d690 \
- file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
-
-IMAGE_INSTALL += "\
- ${CORE_IMAGE_BASE_INSTALL} \
- packagegroup-core-qt4e \
-"
-
-inherit core-image
-
+++ /dev/null
-# Qt toolchain
-QTNAME = "qt"
-QT_DIR_NAME = "qt4"
-
-require meta-toolchain-qt.inc
+++ /dev/null
-TOOLCHAIN_HOST_TASK = "nativesdk-packagegroup-${QTNAME}-toolchain-host packagegroup-cross-canadian-${MACHINE}"
-TOOLCHAIN_TARGET_TASK = "packagegroup-${QTNAME}-toolchain-target"
-TOOLCHAIN_OUTPUTNAME = "${SDK_NAME}-toolchain-${QTNAME}-${DISTRO_VERSION}"
-
-require recipes-core/meta/meta-toolchain.bb
-
-QT_TOOLS_PREFIX = "${SDKPATHNATIVE}${bindir_nativesdk}"
-
-toolchain_create_sdk_env_script_append() {
- echo 'export OE_QMAKE_CFLAGS="$CFLAGS"' >> $script
- echo 'export OE_QMAKE_CXXFLAGS="$CXXFLAGS"' >> $script
- echo 'export OE_QMAKE_LDFLAGS="$LDFLAGS"' >> $script
- echo 'export OE_QMAKE_CC=$CC' >> $script
- echo 'export OE_QMAKE_CXX=$CXX' >> $script
- echo 'export OE_QMAKE_LINK=$CXX' >> $script
- echo 'export OE_QMAKE_AR=$AR' >> $script
- echo 'export OE_QMAKE_LIBDIR_QT=${SDKTARGETSYSROOT}/${libdir}' >> $script
- echo 'export OE_QMAKE_INCDIR_QT=${SDKTARGETSYSROOT}/${includedir}/${QT_DIR_NAME}' >> $script
- echo 'export OE_QMAKE_MOC=${QT_TOOLS_PREFIX}/moc4' >> $script
- echo 'export OE_QMAKE_UIC=${QT_TOOLS_PREFIX}/uic4' >> $script
- echo 'export OE_QMAKE_UIC3=${QT_TOOLS_PREFIX}/uic34' >> $script
- echo 'export OE_QMAKE_RCC=${QT_TOOLS_PREFIX}/rcc4' >> $script
- echo 'export OE_QMAKE_QDBUSCPP2XML=${QT_TOOLS_PREFIX}/qdbuscpp2xml4' >> $script
- echo 'export OE_QMAKE_QDBUSXML2CPP=${QT_TOOLS_PREFIX}/qdbusxml2cpp4' >> $script
- echo 'export OE_QMAKE_QT_CONFIG=${SDKTARGETSYSROOT}/${datadir}/${QT_DIR_NAME}/mkspecs/qconfig.pri' >> $script
- echo 'export QMAKESPEC=${SDKTARGETSYSROOT}/${datadir}/${QT_DIR_NAME}/mkspecs/linux-g++' >> $script
- echo 'export QT_CONF_PATH=${SDKPATHNATIVE}/${sysconfdir}/qt.conf' >> $script
-
- # make a symbolic link to mkspecs for compatibility with Nokia's SDK
- # and QTCreator
- (cd ${SDK_OUTPUT}/${QT_TOOLS_PREFIX}/..; ln -s ${SDKTARGETSYSROOT}/usr/share/${QT_DIR_NAME}/mkspecs mkspecs;)
-}
+++ /dev/null
-# Qt Embedded toolchain
-PR = "r6"
-QTNAME = "qte"
-QT_DIR_NAME = "qtopia"
-
-require meta-toolchain-qt.inc
+++ /dev/null
-require nativesdk-packagegroup-qt-toolchain-host.inc
-
-SUMMARY = "Host packages for Qt SDK"
+++ /dev/null
-require recipes-core/packagegroups/nativesdk-packagegroup-sdk-host.bb
-
-DESCRIPTION = "Host packages for Qt Embedded SDK"
-LICENSE = "MIT"
-
-RDEPENDS_${PN} += "nativesdk-qt4-tools"
+++ /dev/null
-require nativesdk-packagegroup-qt-toolchain-host.inc
-
-SUMMARY = "Host packages for Qt Embedded SDK"
+++ /dev/null
-#
-# Copyright (C) 2010 Intel Corporation. All rights reserved
-#
-
-SUMMARY = "Qt package groups"
-LICENSE = "MIT"
-PR = "r4"
-
-# Qt4 could NOT be built on MIPS64 with 64 bits userspace
-COMPATIBLE_HOST_mips64 = "mips64.*-linux-gnun32"
-
-inherit packagegroup
-
-PACKAGES = "${PN}-demoapps"
-
-# For backwards compatibility after rename
-RPROVIDES_${PN}-demoapps = "task-core-qt-demos"
-RREPLACES_${PN}-demoapps = "task-core-qt-demos"
-RCONFLICTS_${PN}-demoapps = "task-core-qt-demos"
-
-QTDEMOS ?= "quicky ${COMMERCIAL_QT} fotowall"
-
-SUMMARY_${PN}-demoapps = "Qt demo applications"
-RDEPENDS_${PN}-demoapps = "${QTDEMOS}"
+++ /dev/null
-SUMMARY = "Qt for Embedded Linux (Qt without X11)"
-PR = "r2"
-LICENSE = "MIT"
-
-# Qt4 could NOT be built on MIPS64 with 64 bits userspace
-COMPATIBLE_HOST_mips64 = "mips64.*-linux-gnun32"
-
-inherit packagegroup
-
-# For backwards compatibility after rename
-RPROVIDES_${PN} = "task-qt4e-base"
-RREPLACES_${PN} = "task-qt4e-base"
-RCONFLICTS_${PN} = "task-qt4e-base"
-
-TOUCH = ' ${@base_contains("MACHINE_FEATURES", "touchscreen", "tslib tslib-calibrate tslib-tests", "",d)}'
-
-RDEPENDS_${PN} = " \
- qt4-embedded \
- libqt-embedded3support4 \
- libqt-embeddedclucene4 \
- libqt-embeddedcore4 \
- libqt-embeddeddbus4 \
- libqt-embeddedgui4 \
- libqt-embeddedhelp4 \
- libqt-embeddedmultimedia4 \
- libqt-embeddednetwork4 \
- libqt-embeddedscript4 \
- libqt-embeddedscripttools4 \
- libqt-embeddedsql4 \
- libqt-embeddedsvg4 \
- libqt-embeddedtest4 \
- libqt-embeddedwebkit4 \
- libqt-embeddedxml4 \
- qt4-embedded-fonts-ttf-dejavu \
- qt4-embedded-fonts-ttf-vera \
- qt4-embedded-plugin-iconengine-svgicon \
- qt4-embedded-plugin-imageformat-gif \
- qt4-embedded-plugin-imageformat-ico \
- qt4-embedded-plugin-imageformat-jpeg \
- qt4-embedded-plugin-imageformat-mng \
- qt4-embedded-plugin-imageformat-svg \
- qt4-embedded-plugin-imageformat-tiff \
- qt4-embedded-plugin-mousedriver-tslib \
- qt4-embedded-plugin-phonon-backend-gstreamer \
- qt4-embedded-plugin-script-dbus \
- qt4-embedded-plugin-sqldriver-sqlite \
- ${TOUCH} \
- qt4-embedded-demos \
- qt4-embedded-examples \
- qt-demo-init \
- qt4-embedded-assistant \
-"
-
-RRECOMMENDS_${PN} = " \
- libqt-embeddedxmlpatterns4 \
-"
-
+++ /dev/null
-SUMMARY = "Target packages for Qt SDK"
-
-QTLIBPREFIX = ""
-
-require packagegroup-qt-toolchain-target.inc
-
-RDEPENDS_${PN} += " \
- qt4-x11-free-dev \
- ${@base_contains('DISTRO_FEATURES', 'opengl', 'libqtopengl4-dev', '', d)} \
- ${@base_contains('DISTRO_FEATURES', 'openvg', 'libqtopenvg4-dev', '', d)} \
- "
+++ /dev/null
-LICENSE = "MIT"
-
-# Qt4 could NOT be built on MIPS64 with 64 bits userspace
-COMPATIBLE_HOST_mips64 = "mips64.*-linux-gnun32"
-
-inherit packagegroup
-
-PACKAGEGROUP_DISABLE_COMPLEMENTARY = "1"
-
-RDEPENDS_${PN} += " \
- packagegroup-core-standalone-sdk-target \
- qt4${QTLIBPREFIX}-mkspecs \
- libqt${QTLIBPREFIX}multimedia4-dev \
- libqt${QTLIBPREFIX}phonon4-dev \
- libqt${QTLIBPREFIX}3support4-dev \
- libqt${QTLIBPREFIX}clucene4-dev \
- libqt${QTLIBPREFIX}core4-dev \
- libqt${QTLIBPREFIX}dbus4-dev \
- libqt${QTLIBPREFIX}designercomponents4-dev \
- libqt${QTLIBPREFIX}designer4-dev \
- libqt${QTLIBPREFIX}uitools4-dev \
- libqt${QTLIBPREFIX}gui4-dev \
- libqt${QTLIBPREFIX}help4-dev \
- libqt${QTLIBPREFIX}network4-dev \
- libqt${QTLIBPREFIX}script4-dev \
- libqt${QTLIBPREFIX}scripttools4-dev \
- libqt${QTLIBPREFIX}sql4-dev \
- libqt${QTLIBPREFIX}svg4-dev \
- libqt${QTLIBPREFIX}test4-dev \
- libqt${QTLIBPREFIX}webkit4-dev \
- libqt${QTLIBPREFIX}xml4-dev \
- libqt${QTLIBPREFIX}declarative4-dev \
- libqt${QTLIBPREFIX}xmlpatterns4-dev \
- libsqlite3-dev \
- expat-dev \
- "
+++ /dev/null
-SUMMARY = "Target packages for Qt Embedded SDK"
-
-PR = "r7"
-
-QTLIBPREFIX = "-embedded"
-
-require packagegroup-qt-toolchain-target.inc
+++ /dev/null
-App/ExportWizard.cpp depends on wizard.h which depends on ui_wizard. The last one
-should be already generated before compiling ExportWizard.cpp.
-
-Signed-off-by: Andrei Gherzan <andrei@gherzan.ro>
-Upstream-Status: Pending
-
-Index: Fotowall-0.9/App/ExportWizard.cpp
-===================================================================
---- Fotowall-0.9.orig/App/ExportWizard.cpp 2009-11-30 13:21:31.000000000 +0200
-+++ Fotowall-0.9/App/ExportWizard.cpp 2012-05-10 17:12:06.765230830 +0300
-@@ -23,6 +23,7 @@
- #include "imageloaderqt.h"
- #include "posterazorcore.h"
- #include "wizard.h"
-+#include "ui_wizard.h"
-
- #include <QDesktopServices>
- #include <QDesktopWidget>
+++ /dev/null
-SUMMARY = "Creative photo display application"
-DESCRIPTION = "Fotowall is a creative tool that allows you to layout your photos or pictures \
-in a personal way. You can add pictures, then resize, move, change colors, text, shadows, etc.."
-
-HOMEPAGE = "http://www.enricoros.com/opensource/fotowall"
-LICENSE = "GPLv2+"
-LIC_FILES_CHKSUM = "file://GPL_V2;md5=79808397c3355f163c012616125c9e26 \
- file://main.cpp;beginline=6;endline=11;md5=b569acc2bf8974a3082b58fc53b9d8dc"
-SECTION = "x11/apps"
-
-PR = "r4"
-
-SRC_URI = "http://qt-apps.org/CONTENT/content-files/71316-Fotowall-0.9.tar.bz2 \
- file://ExportWizard-depends-on-ui_wizard.patch \
- "
-
-SRC_URI[md5sum] = "142ef697332e0777c6d22c5bc96cc438"
-SRC_URI[sha256sum] = "e4d0c005d2cb1d7c09438bfc3098eadebc08946e4fbc0655b7fc8b046de3810d"
-
-S = "${WORKDIR}/Fotowall-${PV}"
-
-inherit qt4x11
-
-EXTRA_QMAKEVARS_PRE = "CONFIG+=no-webcam"
-
-do_install() {
- oe_runmake INSTALL_ROOT=${D} install
-}
-
-# Ensure we have some plugins for some useful image formats
-RRECOMMENDS_${PN} += "qt4-plugin-imageformat-gif qt4-plugin-imageformat-jpeg qt4-plugin-imageformat-tiff"
+++ /dev/null
-Do not include /usr/include host paths
-
-These were added upstream apparently for freebsd support, but trigger
-compiler warnings during the build and could be dangerous, so remove
-them.
-
-Upstream-Status: Inappropriate [cross]
-
-Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
-
-Update patch for version 0.7.4.
-
-Signed-off-by: Kai Kang <kai.kang@windriver.com>
-
---- qmmp-0.7.4/CMakeLists.txt 2014-01-10 09:59:44.971837746 +0800
-+++ qmmp-0.7.4/CMakeLists.txt.new 2014-01-10 10:24:51.855837566 +0800
-@@ -1,9 +1,5 @@
- cmake_minimum_required(VERSION 2.6.0)
-
--#freebsd support
--include_directories(SYSTEM /usr/local/include)
--SET(CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES} /usr/local/include)
--
- #extract version from qmmp.h
- FILE(STRINGS "${CMAKE_CURRENT_SOURCE_DIR}/src/qmmp/qmmp.h"
- QMMP_VERSION_DATA REGEX "^#define[ \t]+QMMP_VERSION_[A-Z]+[ \t]+[0-9]+.*$")
+++ /dev/null
-SUMMARY = "Qt-based Multimedia Player"
-DESCRIPTION = "Qmmp is an audio player, written with the help of the Qt library. The user interface is similar to Winamp or XMMS."
-HOMEPAGE = "http://qmmp.ylsoftware.com"
-LICENSE = "GPLv2"
-LICENSE_FLAGS = "commercial"
-LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
-SECTION = "multimedia"
-
-DEPENDS = "taglib libmad libvorbis libogg alsa-lib libsndfile1 libsamplerate0 curl"
-
-SRC_URI = "http://qmmp.ylsoftware.com/files/${BPN}-${PV}.tar.bz2 \
- file://no-host-paths.patch \
- "
-
-SRC_URI[md5sum] = "dcc3c9ecd4dfbf0ced91c59cb894d460"
-SRC_URI[sha256sum] = "6066aea939813667dae7cf32ff1d6eb9913894977d132c2cd729fea22d24cf67"
-
-inherit cmake qt4x11
-
-QMMP_PLUGIN_OPTIONS ??= "\
- -DUSE_MMS:BOOL=FALSE \
- -DUSE_MPC:BOOL=FALSE \
- -DUSE_MODPLUG:BOOL=FALSE \
- -DUSE_WAVPACK:BOOL=FALSE \
- -DUSE_FFMPEG:BOOL=FALSE \
- -DUSE_AAC:BOOL=FALSE \
- -DUSE_CDA:BOOL=FALSE \
- -DUSE_MIDI:BOOL=FALSE \
- -DUSE_GME:BOOL=FALSE \
- -DUSE_OSS4:BOOL=FALSE \
- -DUSE_JACK:BOOL=FALSE \
- -DUSE_BS2B:BOOL=FALSE \
- -DUSE_PROJECTM:BOOL=FALSE \
- -DUSE_ENCA:BOOL=FALSE \
- "
-
-export EXTRA_OECMAKE = "-DQT_QMAKE_EXECUTABLE=${OE_QMAKE_QMAKE} \
- -DQT_LRELEASE_EXECUTABLE=${OE_QMAKE_LRELEASE} \
- -DQT_MOC_EXECUTABLE=${OE_QMAKE_MOC} \
- -DQT_UIC_EXECUTABLE=${OE_QMAKE_UIC} \
- -DQT_RCC_EXECUTABLE=${OE_QMAKE_RCC} \
- -DQT_LIBRARY_DIR=${OE_QMAKE_LIBDIR_QT} \
- -DQT_HEADERS_DIR=${OE_QMAKE_INCDIR_QT} \
- -DQT_QTCORE_INCLUDE_DIR=${OE_QMAKE_INCDIR_QT}/QtCore \
- ${QMMP_PLUGIN_OPTIONS} \
- "
-
-do_configure() {
- # Ensure we get the cmake configure and not qmake
- cmake_do_configure
-}
-
-PACKAGES_DYNAMIC += "^qmmp-plugin-.* "
-
-python populate_packages_prepend () {
- qmmp_libdir = d.expand('${libdir}/qmmp')
- gd = d.expand('${D}/${libdir}/qmmp')
- plug_dirs = os.listdir(gd)
-
- for plug_dir in plug_dirs:
- g_plug_dir = os.path.join(qmmp_libdir,plug_dir)
- do_split_packages(d, g_plug_dir, '^lib(.*)\.so$', 'qmmp-plugin-' + plug_dir.lower() + '-%s', 'Qmmp ' + plug_dir + ' plugin for %s')
-}
-
-FILES_${PN} = "\
- ${bindir}/qmmp \
- ${libdir}/lib*${SOLIBS} \
- ${datadir}/icons/* \
- ${datadir}/qmmp/images/* \
- ${datadir}/applications/* \
- "
-
-FILES_${PN}-dbg += "\
- ${libdir}/qmmp/*/.debug/* \
- "
-
-RDEPENDS_${PN} += "taglib alsa-lib libmad curl"
+++ /dev/null
-SUMMARY = "A simple note-taking application with Wiki-style syntax and behaviour"
-HOMEPAGE = "http://qt-apps.org/content/show.php/Quicky?content=80325"
-LICENSE = "GPLv2+"
-LIC_FILES_CHKSUM = "file://version.h;endline=19;md5=878bdaff438dab86298301fd1a210e14"
-SECTION = "x11/apps"
-
-PR = "r2"
-
-SRC_URI = "http://qt-apps.org/CONTENT/content-files/80325-quicky-0.4.tar.gz"
-
-SRC_URI[md5sum] = "824d9e477ee9c4994f73a3cb215161d9"
-SRC_URI[sha256sum] = "9c66376e0035d44547612bf629890769a6178c3e7eafbcf95f1c6207ac0f352a"
-
-inherit qt4x11
-
-do_install() {
- install -d ${D}${bindir}
- install -m 0755 ${S}/${BPN} ${D}${bindir}
-}
+++ /dev/null
-#!/bin/sh
-
-set -e
-
-if [ -f /usr/bin/qtdemo ]; then
- QTDEMO="qtdemo > /var/log/Xsession.log 2> &1"
-else
- QTDEMO="qtdemoE -qws"
-fi
-
-case "$1" in
- start)
- echo "Starting qtdemo"
- if [ -f /etc/profile.d/tslib.sh ]; then
- . /etc/profile.d/tslib.sh
- fi
- if [ -e "$TSLIB_TSDEVICE" ]; then
- if [ ! -f /etc/pointercal ]; then
- /usr/bin/ts_calibrate
- fi
- if [ "$QTDEMO" = qtdemo ]; then
- Xorg &
- export DISPLAY=:0
- $QTDEMO &
- else
- QWS_MOUSE_PROTO=tslib:$TSLIB_TSDEVICE $QTDEMO &
- fi
- else
- if [ "$QTDEMO" = qtdemo ]; then
- Xorg &
- export DISPLAY=:0
- fi
- $QTDEMO &
- fi
- ;;
- stop)
- echo "Stopping qtdemo"
- if [ "$QTDEMO" = qtdemo ]; then
- killall Xorg
- killall qtdemo
- else
- killall qtdemoE
- fi
- ;;
- restart)
- $0 stop
- $0 start
- ;;
- *)
- echo "usage: $0 { start | stop | restart }" >&2
- exit 1
- ;;
-esac
-
-exit 0
+++ /dev/null
-SUMMARY = "Init script for qtdemo"
-LICENSE = "MIT"
-SRC_URI = "file://qtdemo-init"
-PR = "r3"
-
-LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=4d92cd373abda3937c2bc47fbc49d690 \
- file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
-
-do_install() {
- install -d ${D}${sysconfdir}/init.d/
- install -m 0755 ${WORKDIR}/qtdemo-init ${D}${sysconfdir}/init.d/qtdemo
-}
-
-inherit update-rc.d allarch
-
-INITSCRIPT_NAME = "qtdemo"
-INITSCRIPT_PARAMS = "start 99 5 2 . stop 19 0 1 6 ."
+++ /dev/null
-SUMMARY = "Sets default Qt4 Graphics System to ${QT_GRAPHICS_SYSTEM}"
-SECTION = "x11/base"
-LICENSE = "MIT-X"
-LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
-
-PR = "r1"
-
-QT_GRAPHICS_SYSTEM ?= "raster"
-
-def _get_extra_rdepends(d):
- gs = d.getVar('QT_GRAPHICS_SYSTEM', True)
- if gs == "opengl":
- return "qt4-plugin-graphicssystems-glgraphicssystem"
-
- return ""
-
-do_install () {
- install -d ${D}/${sysconfdir}/profile.d/
- cfg_file=${D}/${sysconfdir}/profile.d/qt-graphicssystem
- echo "export QT_GRAPHICSSYSTEM=${QT_GRAPHICS_SYSTEM}" > $cfg_file
-}
-
-RDEPENDS_${PN} = "${@_get_extra_rdepends(d)}"
-
-PACKAGE_ARCH = "${MACHINE_ARCH}"
+++ /dev/null
-SUMMARY = "SDK tools for Qt version 4.x"
-DEPENDS = "nativesdk-zlib nativesdk-dbus nativesdk-libx11 qt4-native"
-SECTION = "libs"
-HOMEPAGE = "http://qt-project.org/"
-LICENSE = "LGPLv2.1 | GPLv3"
-
-INC_PR = "r13"
-
-FILESEXTRAPATHS =. "${FILE_DIRNAME}/qt4-${PV}:"
-
-inherit nativesdk qmake2
-
-SRC_URI = "http://download.qt-project.org/official_releases/qt/4.8/${PV}/qt-everywhere-opensource-src-${PV}.tar.gz \
- file://0001-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch \
- file://0004-configure-qmake-is-already-built-in-qt4-tools-native.patch \
- file://0005-configure-set-LFLAGS-to-pick-up-zlib-from-staging.patch \
- file://0006-configure-Use-OE_QMAKE_-values-to-specify-Qt-utility.patch \
- file://0007-dbus-Remove-const-usage-that-causes-compile-failure-.patch \
- file://0008-qmake.pro-Allow-building-a-separate-qmake-for-the-ta.patch \
- file://g++.conf \
- file://linux.conf"
-
-S = "${WORKDIR}/qt-everywhere-opensource-src-${PV}"
-
-LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=fbc093901857fcd118f065f900982c24 \
- file://LICENSE.GPL3;md5=6e1694ee338db410417517884918d4d2 \
- file://LGPL_EXCEPTION.txt;md5=0145c4d1b6f96a661c2c139dfb268fb6"
-
-require qt4_arch.inc
-
-# FIXME: make it work with "${STAGING_BINDIR_NATIVE}/pkg-config --cflags dbus-1"
-EXTRA_OECONF = "-prefix ${prefix} \
- -qt-libjpeg -system-zlib \
- -no-libjpeg -no-libpng -no-libmng -no-libtiff \
- -no-accessibility \
- -no-cups \
- -no-exceptions \
- -no-nas-sound \
- -no-nis -no-openssl \
- -verbose -release -fast -static \
- -platform ${TARGET_OS}-oe-g++ \
- -xplatform ${TARGET_OS}-oe-g++ \
- -arch ${QT_ARCH} \
- -embedded -no-freetype -no-glib -no-iconv \
- -qt3support \
- -I${STAGING_DIR_HOST}${SDKPATHNATIVE}/usr/include/dbus-1.0 \
- -I${STAGING_DIR_HOST}${SDKPATHNATIVE}/usr/lib/dbus-1.0/include"
-
-# yank default -e, otherwise we get the following error:
-# moc_qbuffer.cpp: No such file or directory
-EXTRA_OEMAKE = " "
-
-do_configure() {
- # Avoid problems with Qt 4.8.0 configure setting QMAKE_LINK from LD (since we want the linker to be g++)
- unset LD
-
- if [ ! -e mkspecs/${TARGET_OS}-oe-g++ ]; then
- ln -sf linux-g++ mkspecs/${TARGET_OS}-oe-g++
- fi
-
- cp ../g++.conf mkspecs/common
- cp ../linux.conf mkspecs/common
-
- if [ -f mkspecs/common/g++-base.conf ] ; then
- # don't use host g++ even during configure (4.8.0+)
- sed -i -e "s#= g++#= ${CXX}#" mkspecs/common/g++-base.conf
- sed -i -e "s#= gcc#= ${CC}#" mkspecs/common/g++-base.conf
- fi
-
- # Use qmake from qt4-native for building
- if [ ! -e bin/qmake ]; then
- ln -sf ${STAGING_BINDIR_NATIVE}/qmake2 bin/qmake
- fi
- set_arch
- (echo o; echo yes) | CC="${CC}" CXX="${CXX}" ./configure ${EXTRA_OECONF} || die "Configuring qt failed. EXTRA_OECONF was ${EXTRA_OECONF}"
-}
-
-TOBUILD = "\
- src/tools/bootstrap \
- src/tools/moc \
- src/corelib \
- src/sql \
- src/dbus \
- src/qt3support \
- src/xml \
- src/tools/uic \
- src/tools/rcc \
- src/network \
- src/gui \
- src/tools/uic3 \
- tools/linguist/lrelease \
- tools/linguist/lupdate \
- tools/qdbus \
-"
-
-do_compile() {
- for i in ${TOBUILD}; do
- cd ${S}/$i && oe_runmake CC="${CC}" CXX="${CXX}"
- done
-
- # Build nativesdk qmake
- export QMAKESPEC="${S}/mkspecs/${TARGET_OS}-oe-g++"
- cd ${S}/qmake
- ${OE_QMAKE_QMAKE}
- oe_runmake CC="${CC}" CXX="${CXX}"
- cd ${S}
-}
-
-do_install() {
- install -d ${D}${bindir}
- install -m 0755 bin/qmake2 ${D}${bindir}/qmake2
- for i in moc uic uic3 rcc lrelease lupdate qdbuscpp2xml qdbusxml2cpp; do
- install -m 0755 bin/${i} ${D}${bindir}/${i}4
- done
-
- (cd ${D}${bindir}; \
- ln -s qmake2 qmake; \
- for i in moc uic uic3 rcc lrelease lupdate qdbuscpp2xml qdbusxml2cpp; do \
- ln -s ${i}4 ${i}; \
- done)
-
- install -d ${D}${sysconfdir}
- cat >${D}${sysconfdir}/qt.conf <<EOF
-[Paths]
-Prefix = ${prefix}
-EOF
-}
+++ /dev/null
-require nativesdk-qt4-tools.inc
-
-SRC_URI += "file://0009-qmake-fix-source-file-references-in-qmake.pri.patch"
-
-SRC_URI[md5sum] = "1864987bdbb2f58f8ae8b350dfdbe133"
-SRC_URI[sha256sum] = "eb728f8268831dc4373be6403b7dd5d5dde03c169ad6882f9a8cb560df6aa138"
+++ /dev/null
-From de2b568a4f14f38ae26960f543277bd2ac57c9d6 Mon Sep 17 00:00:00 2001
-From: Alex <qt-info@nokia.com>
-Date: Tue, 10 May 2011 14:54:49 +1000
-Subject: [PATCH] fix !embedded usage (doesn't work outside of Qt)
-
-embedded is part of QT_CONFIG and not CONFIG
-
-Task-number: QTMOBILITY-1586
----
-Upstream-Status: Backport
-https://qt.gitorious.org/qt-mobility/qt-mobility/commit/de2b568a4f14f38ae26960f543277bd2ac57c9d6
-EB: refreshed the patch for it to apply properly
-
- plugins/multimedia/gstreamer/gstreamer.pro | 2 +-
- src/systeminfo/systeminfo.pro | 6 +++---
- tests/auto/auto.pro | 2 +-
- 3 files changed, 5 insertions(+), 5 deletions(-)
-
-Index: qt-mobility-opensource-src-1.2.0/plugins/multimedia/gstreamer/gstreamer.pro
-===================================================================
---- qt-mobility-opensource-src-1.2.0.orig/plugins/multimedia/gstreamer/gstreamer.pro 2013-09-19 10:34:40.880862884 +0200
-+++ qt-mobility-opensource-src-1.2.0/plugins/multimedia/gstreamer/gstreamer.pro 2013-09-19 10:35:22.844862550 +0200
-@@ -85,7 +85,7 @@
- qgstutils.cpp
-
-
--!win32:!embedded:!mac:!symbian:!simulator:!contains(QT_CONFIG, qpa) {
-+!win32:!contains(QT_CONFIG,embedded):!mac:!symbian:!simulator:!contains(QT_CONFIG, qpa) {
- LIBS += -lXv -lX11 -lXext
-
- HEADERS += \
-Index: qt-mobility-opensource-src-1.2.0/src/systeminfo/systeminfo.pro
-===================================================================
---- qt-mobility-opensource-src-1.2.0.orig/src/systeminfo/systeminfo.pro 2013-09-19 10:34:40.884862884 +0200
-+++ qt-mobility-opensource-src-1.2.0/src/systeminfo/systeminfo.pro 2013-09-19 10:36:05.480862210 +0200
-@@ -101,7 +101,7 @@
- LIBS += -lblkid
- }
-
-- !embedded:!contains(QT_CONFIG,qpa): {
-+ !contains(QT_CONFIG,embedded):!contains(QT_CONFIG,qpa): {
- LIBS += -lX11 -lXrandr
- }
-
-@@ -154,7 +154,7 @@
- #for now... udisks
- } else {
- DEFINES += QT_NO_UDISKS
-- !embedded:!contains(QT_CONFIG,qpa): LIBS += -lX11 -lXrandr
-+ !contains(QT_CONFIG,embedded):!contains(QT_CONFIG,qpa): LIBS += -lX11 -lXrandr
- }
-
- contains(connman_enabled, yes): {
-@@ -165,7 +165,7 @@
- }
- } else {
- DEFINES += QT_NO_NETWORKMANAGER QT_NO_UDISKS QT_NO_CONNMAN
-- !embedded:!contains(QT_CONFIG,qpa): LIBS += -lX11 -lXrandr
-+ !contains(QT_CONFIG,embedded):!contains(QT_CONFIG,qpa): LIBS += -lX11 -lXrandr
- }
- }
-
-Index: qt-mobility-opensource-src-1.2.0/tests/auto/auto.pro
-===================================================================
---- qt-mobility-opensource-src-1.2.0.orig/tests/auto/auto.pro 2013-09-19 10:34:40.884862884 +0200
-+++ qt-mobility-opensource-src-1.2.0/tests/auto/auto.pro 2013-09-19 10:35:22.844862550 +0200
-@@ -21,5 +21,5 @@
- # which require that the autotest is run on the same machine
- # doing the build - i.e. cross-compilation is not allowed.
- win32|mac|linux-g++* {
-- !embedded:!maemo5:!maemo6:SUBDIRS+=host.pro
-+ !contains(QT_CONFIG,embedded):!maemo5:!maemo6:SUBDIRS+=host.pro
- }
+++ /dev/null
-Upstream-Status: Submitted [QTMOBILITY-1611]
-
-From b308508b49afa9a129b4e4589c57cd107d1320b8 Mon Sep 17 00:00:00 2001
-From: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>
-Date: Fri, 6 May 2011 10:35:11 +1000
-Subject: [PATCH] gstvideoconnector: fixed buffers allocation
-
-It should not be necessary, but at least theora video decoder doesn't
-iniatilize *buf, while gst_pad_alloc_buffer relies on buf being NULL.
-
-Task-number: QTMOBILITY-1611
-Reviewed-by: Michael Goddard
----
- plugins/multimedia/gstreamer/gstvideoconnector.c | 4 ++++
- 1 files changed, 4 insertions(+), 0 deletions(-)
-
-diff --git a/plugins/multimedia/gstreamer/gstvideoconnector.c b/plugins/multimedia/gstreamer/gstvideoconnector.c
-index ddf68e0..9f8ceae 100644
---- a/plugins/multimedia/gstreamer/gstvideoconnector.c
-+++ b/plugins/multimedia/gstreamer/gstvideoconnector.c
-@@ -186,6 +186,10 @@ gst_video_connector_buffer_alloc (GstPad * pad, guint64 offset, guint size,
- GstFlowReturn res = GST_FLOW_OK;
- element = GST_VIDEO_CONNECTOR (GST_PAD_PARENT (pad));
-
-+ if (!buf)
-+ return GST_FLOW_ERROR;
-+ *buf = NULL;
-+
- GST_OBJECT_LOCK (element);
- gst_object_ref(element->srcpad);
- GST_OBJECT_UNLOCK (element);
---
-1.7.4.1
-
+++ /dev/null
-From 92e0c611f4969c716616d64df64831387e5b1632 Mon Sep 17 00:00:00 2001
-From: Paul Eggleton <paul.eggleton@linux.intel.com>
-Date: Fri, 16 Mar 2012 10:24:00 +0000
-Subject: [PATCH] Remove unnecessary rpaths from qml_device example
-
-These can't be valid in any case.
-
-Upstream-Status: Pending
-
-Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
----
- examples/declarative-systeminfo/device/device.pro | 3 ---
- 1 files changed, 0 insertions(+), 3 deletions(-)
-
-diff --git a/examples/declarative-systeminfo/device/device.pro b/examples/declarative-systeminfo/device/device.pro
-index 698e5fb..05be9b7 100644
---- a/examples/declarative-systeminfo/device/device.pro
-+++ b/examples/declarative-systeminfo/device/device.pro
-@@ -17,6 +17,3 @@ symbian {
- }
- RESOURCES += device.qrc
-
--QMAKE_LFLAGS_DEBUG += "-Wl,-rpath,/home/user/qt/lib"
--QMAKE_LFLAGS_RPATH += "-Wl,-rpath,/home/user/qt/lib"
--QMAKE_LFLAGS_RELEASE += "-Wl,-rpath,/home/user/qt/lib"
---
-1.7.5.4
-
+++ /dev/null
-Fix metaobjectbuilder build errors against Qt 4.8 and 4.7
-
-Error message:
-ipc/qmetaobjectbuilder.cpp:803:65: error: invalid conversion from \
-'QMetaObjectExtraData::StaticMetacallFunction {aka void (*)(QObject*, \
-QMetaObject::Call, int, void**)}' to 'QtMobility::QMetaObjectBuilder:: \
-StaticMetacallFunction {aka int (*)(QMetaObject::Call, int, void**)}
-
-Upstream-commit:
-http://qt.gitorious.org/qt-mobility/qt-mobility/commit/f102053b28009b3094b0e5777177208afa6097c5
-
-Task-number: QTMOBILITY-1990
-
-Upstream-Status: Backport
-
-Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com>
-------------------------------------------------------
-diff --git a/plugins/declarative/common/dynamicproperties.pri b/plugins/declarative/common/dynamicproperties.pri
-index 52737a3..4bd06de 100644
---- a/plugins/declarative/common/dynamicproperties.pri
-+++ b/plugins/declarative/common/dynamicproperties.pri
-@@ -1,6 +1,8 @@
- INCLUDEPATH += ../../../plugins/declarative/common/dynamicproperties/
--HEADERS += ../../../plugins/declarative/common/dynamicproperties/qdeclarativeopenmetaobject_p.h \
-- ../../../plugins/declarative/common/dynamicproperties/qmetaobjectbuilder_p.h
--SOURCES += ../../../plugins/declarative/common/dynamicproperties/qdeclarativeopenmetaobject.cpp \
-- ../../../src/serviceframework/ipc/qmetaobjectbuilder.cpp
--
-+HEADERS += ../../../plugins/declarative/common/dynamicproperties/qdeclarativeopenmetaobject_p.h
-+SOURCES += ../../../plugins/declarative/common/dynamicproperties/qdeclarativeopenmetaobject.cpp
-+include(../../../src/serviceframework/ipc/metaobjectbuilder.pri)
-+INCLUDEPATH += ../../../src/serviceframework/$$OBJECTBUILDER_INCLUDEPATH
-+DEPENDPATH += ../../../src/serviceframework/$$OBJECTBUILDER_DEPENDPATH
-+HEADERS += ../../../src/serviceframework/$$OBJECTBUILDER_HEADERS
-+SOURCES += ../../../src/serviceframework/$$OBJECTBUILDER_SOURCES
-diff --git a/plugins/declarative/common/dynamicproperties/qdeclarativeopenmetaobject.cpp b/plugins/declarative/common/dynamicproperties/qdeclarativeopenmetaobject.cpp
-index 79a2064..9eb6810 100644
---- a/plugins/declarative/common/dynamicproperties/qdeclarativeopenmetaobject.cpp
-+++ b/plugins/declarative/common/dynamicproperties/qdeclarativeopenmetaobject.cpp
-@@ -65,8 +65,7 @@ public:
- {
- int id = mob.propertyCount();
- mob.addSignal("__" + QByteArray::number(id) + "()");
-- QMetaPropertyBuilder build = mob.addProperty(name, type, id);
-- build.setDynamic(true);
-+ mob.addProperty(name, type, id);
- qFree(mem);
- mem = mob.toMetaObject();
-
-diff --git a/plugins/declarative/common/dynamicproperties/qmetaobjectbuilder_p.h b/plugins/declarative/common/dynamicproperties/qmetaobjectbuilder_p.h
-deleted file mode 100644
-index bd937e4..0000000
---- a/plugins/declarative/common/dynamicproperties/qmetaobjectbuilder_p.h
-+++ /dev/null
-@@ -1,48 +0,0 @@
--/****************************************************************************
--**
--** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
--** All rights reserved.
--** Contact: Nokia Corporation (qt-info@nokia.com)
--**
--** This file is part of the Qt Mobility Components.
--**
--** $QT_BEGIN_LICENSE:LGPL$
--** No Commercial Usage
--** This file contains pre-release code and may not be distributed.
--** You may use this file in accordance with the terms and conditions
--** contained in the Technology Preview License Agreement accompanying
--** this package.
--**
--** GNU Lesser General Public License Usage
--** Alternatively, this file may be used under the terms of the GNU Lesser
--** General Public License version 2.1 as published by the Free Software
--** Foundation and appearing in the file LICENSE.LGPL included in the
--** packaging of this file. Please review the following information to
--** ensure the GNU Lesser General Public License version 2.1 requirements
--** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
--**
--** In addition, as a special exception, Nokia gives you certain additional
--** rights. These rights are described in the Nokia Qt LGPL Exception
--** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
--**
--** If you have questions regarding the use of this file, please contact
--** Nokia at qt-info@nokia.com.
--**
--**
--**
--**
--**
--**
--**
--**
--** $QT_END_LICENSE$
--**
--****************************************************************************/
--
--/*
--This header gets used in a number of different QML plugins
--and also in the source tree of Mobility itself.
--
--So this header is just a wrapper to grab it from there.
--*/
--#include "../../../../src/serviceframework/ipc/qmetaobjectbuilder_p.h"
-diff --git a/src/serviceframework/ipc/ipc.pri b/src/serviceframework/ipc/ipc.pri
-index 28b910f..d809f59 100644
---- a/src/serviceframework/ipc/ipc.pri
-+++ b/src/serviceframework/ipc/ipc.pri
-@@ -25,9 +25,14 @@ else {
- }
- }
-
-+include(metaobjectbuilder.pri)
-+INCLUDEPATH += $$OBJECTBUILDER_INCLUDEPATH
-+DEPENDPATH += $$OBJECTBUILDER_DEPENDPATH
-+PRIVATE_HEADERS += $$OBJECTBUILDER_HEADERS
-+SOURCES += $$OBJECTBUILDER_SOURCES
-+
- PRIVATE_HEADERS += ipc/qslotinvoker_p.h \
- ipc/qsignalintercepter_p.h \
-- ipc/qmetaobjectbuilder_p.h \
- ipc/instancemanager_p.h \
- ipc/qservicepackage_p.h \
- ipc/proxyobject_p.h \
-@@ -37,7 +42,6 @@ PRIVATE_HEADERS += ipc/qslotinvoker_p.h \
-
- SOURCES += ipc/qslotinvoker.cpp \
- ipc/qsignalintercepter.cpp \
-- ipc/qmetaobjectbuilder.cpp \
- ipc/instancemanager.cpp \
- ipc/qservicepackage.cpp \
- ipc/proxyobject.cpp \
-diff --git a/src/serviceframework/ipc/metaobjectbuilder.pri b/src/serviceframework/ipc/metaobjectbuilder.pri
-new file mode 100644
-index 0000000..cc905f9
---- /dev/null
-+++ b/src/serviceframework/ipc/metaobjectbuilder.pri
-@@ -0,0 +1,12 @@
-+#check version for 4.7 ...
-+contains(QT_MAJOR_VERSION, 4):lessThan(QT_MINOR_VERSION, 8) {
-+ OBJECTBUILDER_INCLUDEPATH += ipc
-+ OBJECTBUILDER_DEPENDPATH += ipc
-+ OBJECTBUILDER_HEADERS += ipc/qmetaobjectbuilder_47_p.h
-+ OBJECTBUILDER_SOURCES += ipc/qmetaobjectbuilder_47.cpp
-+} else {
-+ OBJECTBUILDER_INCLUDEPATH += ipc
-+ OBJECTBUILDER_DEPENDPATH += ipc
-+ OBJECTBUILDER_HEADERS += ipc/qmetaobjectbuilder_p.h
-+ OBJECTBUILDER_SOURCES += ipc/qmetaobjectbuilder.cpp
-+}
-diff --git a/src/serviceframework/ipc/qmetaobjectbuilder.cpp b/src/serviceframework/ipc/qmetaobjectbuilder.cpp
-index b19eb1a..6ffaa20 100644
---- a/src/serviceframework/ipc/qmetaobjectbuilder.cpp
-+++ b/src/serviceframework/ipc/qmetaobjectbuilder.cpp
-@@ -117,6 +117,8 @@ enum PropertyFlags {
- EnumOrFlag = 0x00000008,
- StdCppSet = 0x00000100,
- // Override = 0x00000200,
-+ Constant = 0x00000400,
-+ Final = 0x00000800,
- Designable = 0x00001000,
- ResolveDesignable = 0x00002000,
- Scriptable = 0x00004000,
-@@ -128,7 +130,7 @@ enum PropertyFlags {
- User = 0x00100000,
- ResolveUser = 0x00200000,
- Notify = 0x00400000,
-- Dynamic = 0x00800000
-+ Revisioned = 0x00800000
- };
-
- enum MethodFlags {
-@@ -145,7 +147,8 @@ enum MethodFlags {
-
- MethodCompatibility = 0x10,
- MethodCloned = 0x20,
-- MethodScriptable = 0x40
-+ MethodScriptable = 0x40,
-+ MethodRevisioned = 0x80
- };
-
- struct QMetaObjectPrivate
-@@ -623,6 +626,8 @@ QMetaPropertyBuilder QMetaObjectBuilder::addProperty(const QMetaProperty& protot
- property.setUser(prototype.isUser());
- property.setStdCppSet(prototype.hasStdCppSet());
- property.setEnumOrFlag(prototype.isEnumType());
-+ property.setConstant(prototype.isConstant());
-+ property.setFinal(prototype.isFinal());
- if (prototype.hasNotifySignal()) {
- // Find an existing method for the notify signal, or add a new one.
- QMetaMethod method = prototype.notifySignal();
-@@ -796,7 +801,7 @@ void QMetaObjectBuilder::addMetaObject
- }
-
- if ((members & StaticMetacall) != 0) {
-- if (priv(prototype->d.data)->revision >= 2) {
-+ if (priv(prototype->d.data)->revision >= 6) {
- const QMetaObjectExtraData *extra =
- (const QMetaObjectExtraData *)(prototype->d.extradata);
- if (extra && extra->static_metacall)
-@@ -1266,8 +1271,8 @@ static int buildMetaObject(QMetaObjectBuilderPrivate *d, char *buf,
- char *str = reinterpret_cast<char *>(buf + size);
- if (buf) {
- if (relocatable) {
-- meta->d.stringdata = reinterpret_cast<const char *>((intptr_t)size);
-- meta->d.data = reinterpret_cast<uint *>((intptr_t)pmetaSize);
-+ meta->d.stringdata = reinterpret_cast<const char *>((quintptr)size);
-+ meta->d.data = reinterpret_cast<uint *>((quintptr)pmetaSize);
- } else {
- meta->d.stringdata = str;
- meta->d.data = reinterpret_cast<uint *>(data);
-@@ -1504,8 +1509,8 @@ void QMetaObjectBuilder::fromRelocatableData(QMetaObject *output,
- const char *buf = data.constData();
- const QMetaObject *dataMo = reinterpret_cast<const QMetaObject *>(buf);
-
-- intptr_t stringdataOffset = (intptr_t)dataMo->d.stringdata;
-- intptr_t dataOffset = (intptr_t)dataMo->d.data;
-+ quintptr stringdataOffset = (quintptr)dataMo->d.stringdata;
-+ quintptr dataOffset = (quintptr)dataMo->d.data;
-
- output->d.superdata = superclass;
- output->d.stringdata = buf + stringdataOffset;
-@@ -2289,16 +2294,27 @@ bool QMetaPropertyBuilder::isEnumOrFlag() const
- }
-
- /*!
-- Returns true if the property has the dynamic flag set;
-- otherwise returns false. The default value is false.
-+ Returns true if the property is constant; otherwise returns false.
-+ The default value is false.
-+*/
-+bool QMetaPropertyBuilder::isConstant() const
-+{
-+ QMetaPropertyBuilderPrivate *d = d_func();
-+ if (d)
-+ return d->flag(Constant);
-+ else
-+ return false;
-+}
-
-- \sa setDynamic()
-+/*!
-+ Returns true if the property is final; otherwise returns false.
-+ The default value is false.
- */
--bool QMetaPropertyBuilder::isDynamic() const
-+bool QMetaPropertyBuilder::isFinal() const
- {
- QMetaPropertyBuilderPrivate *d = d_func();
- if (d)
-- return d->flag(Dynamic);
-+ return d->flag(Final);
- else
- return false;
- }
-@@ -2427,16 +2443,27 @@ void QMetaPropertyBuilder::setEnumOrFlag(bool value)
- }
-
- /*!
-- Sets this property to have the dynamic flag if \a value is
-- true.
-+ Sets the \c CONSTANT flag on this property to \a value.
-+
-+ \sa isConstant()
-+*/
-+void QMetaPropertyBuilder::setConstant(bool value)
-+{
-+ QMetaPropertyBuilderPrivate *d = d_func();
-+ if (d)
-+ d->setFlag(Constant, value);
-+}
-+
-+/*!
-+ Sets the \c FINAL flag on this property to \a value.
-
-- \sa isDynamic()
-+ \sa isFinal()
- */
--void QMetaPropertyBuilder::setDynamic(bool value)
-+void QMetaPropertyBuilder::setFinal(bool value)
- {
- QMetaPropertyBuilderPrivate *d = d_func();
- if (d)
-- d->setFlag(Dynamic, value);
-+ d->setFlag(Final, value);
- }
-
- /*!
-diff --git a/src/serviceframework/ipc/qmetaobjectbuilder_47.cpp b/src/serviceframework/ipc/qmetaobjectbuilder_47.cpp
-new file mode 100644
-index 0000000..509d6c6
---- /dev/null
-+++ b/src/serviceframework/ipc/qmetaobjectbuilder_47.cpp
-@@ -0,0 +1,2583 @@
-+/****************************************************************************
-+**
-+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-+** All rights reserved.
-+** Contact: Nokia Corporation (qt-info@nokia.com)
-+**
-+** This file is part of the QtDeclarative module of the Qt Toolkit.
-+**
-+** $QT_BEGIN_LICENSE:LGPL$
-+** No Commercial Usage
-+** This file contains pre-release code and may not be distributed.
-+** You may use this file in accordance with the terms and conditions
-+** contained in the Technology Preview License Agreement accompanying
-+** this package.
-+**
-+** GNU Lesser General Public License Usage
-+** Alternatively, this file may be used under the terms of the GNU Lesser
-+** General Public License version 2.1 as published by the Free Software
-+** Foundation and appearing in the file LICENSE.LGPL included in the
-+** packaging of this file. Please review the following information to
-+** ensure the GNU Lesser General Public License version 2.1 requirements
-+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-+**
-+** In addition, as a special exception, Nokia gives you certain additional
-+** rights. These rights are described in the Nokia Qt LGPL Exception
-+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-+**
-+** If you have questions regarding the use of this file, please contact
-+** Nokia at qt-info@nokia.com.
-+**
-+**
-+**
-+**
-+**
-+**
-+**
-+**
-+** $QT_END_LICENSE$
-+**
-+****************************************************************************/
-+
-+#include "qmetaobjectbuilder_47_p.h"
-+#include <QDebug>
-+
-+#ifndef Q_OS_WIN
-+#include <stdint.h>
-+#endif
-+
-+QTM_BEGIN_NAMESPACE
-+
-+/*!
-+ \class QMetaObjectBuilder
-+ \internal
-+ \brief The QMetaObjectBuilder class supports building QMetaObject objects at runtime.
-+ \since 1.1
-+
-+*/
-+
-+/*!
-+ \enum QMetaObjectBuilder::AddMember
-+ This enum defines which members of QMetaObject should be copied by QMetaObjectBuilder::addMetaObject()
-+
-+ \value ClassName Add the class name.
-+ \value SuperClass Add the super class.
-+ \value Methods Add methods that aren't signals or slots.
-+ \value Signals Add signals.
-+ \value Slots Add slots.
-+ \value Constructors Add constructors.
-+ \value Properties Add properties.
-+ \value Enumerators Add enumerators.
-+ \value ClassInfos Add items of class information.
-+ \value RelatedMetaObjects Add related meta objects.
-+ \value StaticMetacall Add the static metacall function.
-+ \value PublicMethods Add public methods (ignored for signals).
-+ \value ProtectedMethods Add protected methods (ignored for signals).
-+ \value PrivateMethods All private methods (ignored for signals).
-+ \value AllMembers Add all members.
-+ \value AllPrimaryMembers Add everything except the class name, super class, and static metacall function.
-+*/
-+
-+// copied from moc's generator.cpp
-+uint qvariant_nameToType(const char* name)
-+{
-+ if (!name)
-+ return 0;
-+
-+ if (strcmp(name, "QVariant") == 0)
-+ return 0xffffffff;
-+ if (strcmp(name, "QCString") == 0)
-+ return QMetaType::QByteArray;
-+ if (strcmp(name, "Q_LLONG") == 0)
-+ return QMetaType::LongLong;
-+ if (strcmp(name, "Q_ULLONG") == 0)
-+ return QMetaType::ULongLong;
-+ if (strcmp(name, "QIconSet") == 0)
-+ return QMetaType::QIcon;
-+
-+ uint tp = QMetaType::type(name);
-+ return tp < QMetaType::User ? tp : 0;
-+}
-+
-+/*
-+ Returns true if the type is a QVariant types.
-+*/
-+bool isVariantType(const char* type)
-+{
-+ return qvariant_nameToType(type) != 0;
-+}
-+
-+// copied from qmetaobject.cpp
-+// do not touch without touching the moc as well
-+enum PropertyFlags {
-+ Invalid = 0x00000000,
-+ Readable = 0x00000001,
-+ Writable = 0x00000002,
-+ Resettable = 0x00000004,
-+ EnumOrFlag = 0x00000008,
-+ StdCppSet = 0x00000100,
-+// Override = 0x00000200,
-+ Designable = 0x00001000,
-+ ResolveDesignable = 0x00002000,
-+ Scriptable = 0x00004000,
-+ ResolveScriptable = 0x00008000,
-+ Stored = 0x00010000,
-+ ResolveStored = 0x00020000,
-+ Editable = 0x00040000,
-+ ResolveEditable = 0x00080000,
-+ User = 0x00100000,
-+ ResolveUser = 0x00200000,
-+ Notify = 0x00400000,
-+ Dynamic = 0x00800000
-+};
-+
-+enum MethodFlags {
-+ AccessPrivate = 0x00,
-+ AccessProtected = 0x01,
-+ AccessPublic = 0x02,
-+ AccessMask = 0x03, //mask
-+
-+ MethodMethod = 0x00,
-+ MethodSignal = 0x04,
-+ MethodSlot = 0x08,
-+ MethodConstructor = 0x0c,
-+ MethodTypeMask = 0x0c,
-+
-+ MethodCompatibility = 0x10,
-+ MethodCloned = 0x20,
-+ MethodScriptable = 0x40
-+};
-+
-+struct QMetaObjectPrivate
-+{
-+ int revision;
-+ int className;
-+ int classInfoCount, classInfoData;
-+ int methodCount, methodData;
-+ int propertyCount, propertyData;
-+ int enumeratorCount, enumeratorData;
-+ int constructorCount, constructorData;
-+ int flags;
-+};
-+
-+static inline const QMetaObjectPrivate *priv(const uint* data)
-+{ return reinterpret_cast<const QMetaObjectPrivate*>(data); }
-+// end of copied lines from qmetaobject.cpp
-+
-+class QMetaMethodBuilderPrivate
-+{
-+public:
-+ QMetaMethodBuilderPrivate
-+ (QMetaMethod::MethodType _methodType,
-+ const QByteArray& _signature,
-+ const QByteArray& _returnType = QByteArray(),
-+ QMetaMethod::Access _access = QMetaMethod::Public)
-+ : signature(QMetaObject::normalizedSignature(_signature.constData())),
-+ returnType(QMetaObject::normalizedType(_returnType)),
-+ attributes(((int)_access) | (((int)_methodType) << 2))
-+ {
-+ }
-+
-+ QByteArray signature;
-+ QByteArray returnType;
-+ QList<QByteArray> parameterNames;
-+ QByteArray tag;
-+ int attributes;
-+
-+ QMetaMethod::MethodType methodType() const
-+ {
-+ return (QMetaMethod::MethodType)((attributes & MethodTypeMask) >> 2);
-+ }
-+
-+ QMetaMethod::Access access() const
-+ {
-+ return (QMetaMethod::Access)(attributes & AccessMask);
-+ }
-+
-+ void setAccess(QMetaMethod::Access value)
-+ {
-+ attributes = ((attributes & ~AccessMask) | (int)value);
-+ }
-+};
-+
-+class QMetaPropertyBuilderPrivate
-+{
-+public:
-+ QMetaPropertyBuilderPrivate
-+ (const QByteArray& _name, const QByteArray& _type, int notifierIdx=-1)
-+ : name(_name),
-+ type(QMetaObject::normalizedType(_type.constData())),
-+ flags(Readable | Writable | Scriptable), notifySignal(-1)
-+ {
-+ if (notifierIdx >= 0) {
-+ flags |= Notify;
-+ notifySignal = notifierIdx;
-+ }
-+ }
-+
-+ QByteArray name;
-+ QByteArray type;
-+ int flags;
-+ int notifySignal;
-+
-+ bool flag(int f) const
-+ {
-+ return ((flags & f) != 0);
-+ }
-+
-+ void setFlag(int f, bool value)
-+ {
-+ if (value)
-+ flags |= f;
-+ else
-+ flags &= ~f;
-+ }
-+};
-+
-+class QMetaEnumBuilderPrivate
-+{
-+public:
-+ QMetaEnumBuilderPrivate(const QByteArray& _name)
-+ : name(_name), isFlag(false)
-+ {
-+ }
-+
-+ QByteArray name;
-+ bool isFlag;
-+ QList<QByteArray> keys;
-+ QList<int> values;
-+};
-+
-+class QMetaObjectBuilderPrivate
-+{
-+public:
-+ QMetaObjectBuilderPrivate()
-+ : flags(0)
-+ {
-+ superClass = &QObject::staticMetaObject;
-+ staticMetacallFunction = 0;
-+ }
-+
-+ QByteArray className;
-+ const QMetaObject *superClass;
-+ QMetaObjectBuilder::StaticMetacallFunction staticMetacallFunction;
-+ QList<QMetaMethodBuilderPrivate> methods;
-+ QList<QMetaMethodBuilderPrivate> constructors;
-+ QList<QMetaPropertyBuilderPrivate> properties;
-+ QList<QByteArray> classInfoNames;
-+ QList<QByteArray> classInfoValues;
-+ QList<QMetaEnumBuilderPrivate> enumerators;
-+#ifdef Q_NO_DATA_RELOCATION
-+ QList<QMetaObjectAccessor> relatedMetaObjects;
-+#else
-+ QList<const QMetaObject *> relatedMetaObjects;
-+#endif
-+ int flags;
-+};
-+
-+/*!
-+ Constructs a new QMetaObjectBuilder.
-+*/
-+QMetaObjectBuilder::QMetaObjectBuilder()
-+{
-+ d = new QMetaObjectBuilderPrivate();
-+}
-+
-+/*!
-+ Constructs a new QMetaObjectBuilder which is a copy of the
-+ meta object information in \a prototype. Note: the super class
-+ contents for \a prototype are not copied, only the immediate
-+ class that is defined by \a prototype.
-+
-+ The \a members parameter indicates which members of \a prototype
-+ should be added. The default is AllMembers.
-+
-+ \sa addMetaObject()
-+*/
-+QMetaObjectBuilder::QMetaObjectBuilder
-+ (const QMetaObject *prototype, QMetaObjectBuilder::AddMembers members)
-+{
-+ d = new QMetaObjectBuilderPrivate();
-+ addMetaObject(prototype, members);
-+}
-+
-+/*!
-+ Destroys this meta object builder.
-+*/
-+QMetaObjectBuilder::~QMetaObjectBuilder()
-+{
-+ delete d;
-+}
-+
-+/*!
-+ Returns the name of the class being constructed by this
-+ meta object builder. The default value is an empty QByteArray.
-+
-+ \sa setClassName(), superClass()
-+*/
-+QByteArray QMetaObjectBuilder::className() const
-+{
-+ return d->className;
-+}
-+
-+/*!
-+ Sets the \a name of the class being constructed by this
-+ meta object builder.
-+
-+ \sa className(), setSuperClass()
-+*/
-+void QMetaObjectBuilder::setClassName(const QByteArray& name)
-+{
-+ d->className = name;
-+}
-+
-+/*!
-+ Returns the superclass meta object of the class being constructed
-+ by this meta object builder. The default value is the meta object
-+ for QObject.
-+
-+ \sa setSuperClass(), className()
-+*/
-+const QMetaObject *QMetaObjectBuilder::superClass() const
-+{
-+ return d->superClass;
-+}
-+
-+/*!
-+ Sets the superclass meta object of the class being constructed
-+ by this meta object builder to \a meta. The \a meta parameter
-+ must not be null.
-+
-+ \sa superClass(), setClassName()
-+*/
-+void QMetaObjectBuilder::setSuperClass(const QMetaObject *meta)
-+{
-+ Q_ASSERT(meta);
-+ d->superClass = meta;
-+}
-+
-+/*!
-+ Returns the flags of the class being constructed by this meta object
-+ builder.
-+
-+ \sa setFlags()
-+*/
-+QMetaObjectBuilder::MetaObjectFlags QMetaObjectBuilder::flags() const
-+{
-+ return (QMetaObjectBuilder::MetaObjectFlags)d->flags;
-+}
-+
-+/*!
-+ Sets the \a flags of the class being constructed by this meta object
-+ builder.
-+
-+ \sa flags()
-+*/
-+void QMetaObjectBuilder::setFlags(MetaObjectFlags flags)
-+{
-+ d->flags = flags;
-+}
-+
-+/*!
-+ Returns the number of methods in this class, excluding the number
-+ of methods in the base class. These include signals and slots
-+ as well as normal member functions.
-+
-+ \sa addMethod(), method(), removeMethod(), indexOfMethod()
-+*/
-+int QMetaObjectBuilder::methodCount() const
-+{
-+ return d->methods.size();
-+}
-+
-+/*!
-+ Returns the number of constructors in this class.
-+
-+ \sa addConstructor(), constructor(), removeConstructor(), indexOfConstructor()
-+*/
-+int QMetaObjectBuilder::constructorCount() const
-+{
-+ return d->constructors.size();
-+}
-+
-+/*!
-+ Returns the number of properties in this class, excluding the number
-+ of properties in the base class.
-+
-+ \sa addProperty(), property(), removeProperty(), indexOfProperty()
-+*/
-+int QMetaObjectBuilder::propertyCount() const
-+{
-+ return d->properties.size();
-+}
-+
-+/*!
-+ Returns the number of enumerators in this class, excluding the
-+ number of enumerators in the base class.
-+
-+ \sa addEnumerator(), enumerator(), removeEnumerator()
-+ \sa indexOfEnumerator()
-+*/
-+int QMetaObjectBuilder::enumeratorCount() const
-+{
-+ return d->enumerators.size();
-+}
-+
-+/*!
-+ Returns the number of items of class information in this class,
-+ exclusing the number of items of class information in the base class.
-+
-+ \sa addClassInfo(), classInfoName(), classInfoValue(), removeClassInfo()
-+ \sa indexOfClassInfo()
-+*/
-+int QMetaObjectBuilder::classInfoCount() const
-+{
-+ return d->classInfoNames.size();
-+}
-+
-+/*!
-+ Returns the number of related meta objects that are associated
-+ with this class.
-+
-+ Related meta objects are used when resolving the enumerated type
-+ associated with a property, where the enumerated type is in a
-+ different class from the property.
-+
-+ \sa addRelatedMetaObject(), relatedMetaObject()
-+ \sa removeRelatedMetaObject()
-+*/
-+int QMetaObjectBuilder::relatedMetaObjectCount() const
-+{
-+ return d->relatedMetaObjects.size();
-+}
-+
-+/*!
-+ Adds a new public method to this class with the specified \a signature.
-+ Returns an object that can be used to adjust the other attributes
-+ of the method. The \a signature will be normalized before it is
-+ added to the class.
-+
-+ \sa method(), methodCount(), removeMethod(), indexOfMethod()
-+*/
-+QMetaMethodBuilder QMetaObjectBuilder::addMethod(const QByteArray& signature)
-+{
-+ int index = d->methods.size();
-+ d->methods.append(QMetaMethodBuilderPrivate(QMetaMethod::Method, signature));
-+ return QMetaMethodBuilder(this, index);
-+}
-+
-+/*!
-+ Adds a new public method to this class with the specified
-+ \a signature and \a returnType. Returns an object that can be
-+ used to adjust the other attributes of the method. The \a signature
-+ and \a returnType will be normalized before they are added to
-+ the class. If \a returnType is empty, then it indicates that
-+ the method has \c{void} as its return type.
-+
-+ \sa method(), methodCount(), removeMethod(), indexOfMethod()
-+*/
-+QMetaMethodBuilder QMetaObjectBuilder::addMethod
-+ (const QByteArray& signature, const QByteArray& returnType)
-+{
-+ int index = d->methods.size();
-+ d->methods.append(QMetaMethodBuilderPrivate
-+ (QMetaMethod::Method, signature, returnType));
-+ return QMetaMethodBuilder(this, index);
-+}
-+
-+/*!
-+ Adds a new public method to this class that has the same information as
-+ \a prototype. This is used to clone the methods of an existing
-+ QMetaObject. Returns an object that can be used to adjust the
-+ attributes of the method.
-+
-+ This function will detect if \a prototype is an ordinary method,
-+ signal, slot, or constructor and act accordingly.
-+
-+ \sa method(), methodCount(), removeMethod(), indexOfMethod()
-+*/
-+QMetaMethodBuilder QMetaObjectBuilder::addMethod(const QMetaMethod& prototype)
-+{
-+ QMetaMethodBuilder method;
-+ if (prototype.methodType() == QMetaMethod::Method)
-+ method = addMethod(prototype.signature());
-+ else if (prototype.methodType() == QMetaMethod::Signal)
-+ method = addSignal(prototype.signature());
-+ else if (prototype.methodType() == QMetaMethod::Slot)
-+ method = addSlot(prototype.signature());
-+ else if (prototype.methodType() == QMetaMethod::Constructor)
-+ method = addConstructor(prototype.signature());
-+ method.setReturnType(prototype.typeName());
-+ method.setParameterNames(prototype.parameterNames());
-+ method.setTag(prototype.tag());
-+ method.setAccess(prototype.access());
-+ method.setAttributes(prototype.attributes());
-+ return method;
-+}
-+
-+/*!
-+ Adds a new public slot to this class with the specified \a signature.
-+ Returns an object that can be used to adjust the other attributes
-+ of the slot. The \a signature will be normalized before it is
-+ added to the class.
-+
-+ \sa addMethod(), addSignal(), indexOfSlot()
-+*/
-+QMetaMethodBuilder QMetaObjectBuilder::addSlot(const QByteArray& signature)
-+{
-+ int index = d->methods.size();
-+ d->methods.append(QMetaMethodBuilderPrivate(QMetaMethod::Slot, signature));
-+ return QMetaMethodBuilder(this, index);
-+}
-+
-+/*!
-+ Adds a new signal to this class with the specified \a signature.
-+ Returns an object that can be used to adjust the other attributes
-+ of the signal. The \a signature will be normalized before it is
-+ added to the class.
-+
-+ \sa addMethod(), addSlot(), indexOfSignal()
-+*/
-+QMetaMethodBuilder QMetaObjectBuilder::addSignal(const QByteArray& signature)
-+{
-+ int index = d->methods.size();
-+ d->methods.append(QMetaMethodBuilderPrivate
-+ (QMetaMethod::Signal, signature, QByteArray(), QMetaMethod::Protected));
-+ return QMetaMethodBuilder(this, index);
-+}
-+
-+/*!
-+ Adds a new constructor to this class with the specified \a signature.
-+ Returns an object that can be used to adjust the other attributes
-+ of the constructor. The \a signature will be normalized before it is
-+ added to the class.
-+
-+ \sa constructor(), constructorCount(), removeConstructor()
-+ \sa indexOfConstructor()
-+*/
-+QMetaMethodBuilder QMetaObjectBuilder::addConstructor(const QByteArray& signature)
-+{
-+ int index = d->constructors.size();
-+ d->constructors.append(QMetaMethodBuilderPrivate(QMetaMethod::Constructor, signature));
-+ return QMetaMethodBuilder(this, -(index + 1));
-+}
-+
-+/*!
-+ Adds a new constructor to this class that has the same information as
-+ \a prototype. This is used to clone the constructors of an existing
-+ QMetaObject. Returns an object that can be used to adjust the
-+ attributes of the constructor.
-+
-+ This function requires that \a prototype be a constructor.
-+
-+ \sa constructor(), constructorCount(), removeConstructor()
-+ \sa indexOfConstructor()
-+*/
-+QMetaMethodBuilder QMetaObjectBuilder::addConstructor(const QMetaMethod& prototype)
-+{
-+ Q_ASSERT(prototype.methodType() == QMetaMethod::Constructor);
-+ QMetaMethodBuilder ctor = addConstructor(prototype.signature());
-+ ctor.setReturnType(prototype.typeName());
-+ ctor.setParameterNames(prototype.parameterNames());
-+ ctor.setTag(prototype.tag());
-+ ctor.setAccess(prototype.access());
-+ ctor.setAttributes(prototype.attributes());
-+ return ctor;
-+}
-+
-+/*!
-+ Adds a new readable/writable property to this class with the
-+ specified \a name and \a type. Returns an object that can be used
-+ to adjust the other attributes of the property. The \a type will
-+ be normalized before it is added to the class. \a notifierId will
-+ be registered as the property's \e notify signal.
-+
-+ \sa property(), propertyCount(), removeProperty(), indexOfProperty()
-+*/
-+QMetaPropertyBuilder QMetaObjectBuilder::addProperty
-+ (const QByteArray& name, const QByteArray& type, int notifierId)
-+{
-+ int index = d->properties.size();
-+ d->properties.append(QMetaPropertyBuilderPrivate(name, type, notifierId));
-+ return QMetaPropertyBuilder(this, index);
-+}
-+
-+/*!
-+ Adds a new property to this class that has the same information as
-+ \a prototype. This is used to clone the properties of an existing
-+ QMetaObject. Returns an object that can be used to adjust the
-+ attributes of the property.
-+
-+ \sa property(), propertyCount(), removeProperty(), indexOfProperty()
-+*/
-+QMetaPropertyBuilder QMetaObjectBuilder::addProperty(const QMetaProperty& prototype)
-+{
-+ QMetaPropertyBuilder property = addProperty(prototype.name(), prototype.typeName());
-+ property.setReadable(prototype.isReadable());
-+ property.setWritable(prototype.isWritable());
-+ property.setResettable(prototype.isResettable());
-+ property.setDesignable(prototype.isDesignable());
-+ property.setScriptable(prototype.isScriptable());
-+ property.setStored(prototype.isStored());
-+ property.setEditable(prototype.isEditable());
-+ property.setUser(prototype.isUser());
-+ property.setStdCppSet(prototype.hasStdCppSet());
-+ property.setEnumOrFlag(prototype.isEnumType());
-+ if (prototype.hasNotifySignal()) {
-+ // Find an existing method for the notify signal, or add a new one.
-+ QMetaMethod method = prototype.notifySignal();
-+ int index = indexOfMethod(method.signature());
-+ if (index == -1)
-+ index = addMethod(method).index();
-+ d->properties[property._index].notifySignal = index;
-+ d->properties[property._index].setFlag(Notify, true);
-+ }
-+ return property;
-+}
-+
-+/*!
-+ Adds a new enumerator to this class with the specified
-+ \a name. Returns an object that can be used to adjust
-+ the other attributes of the enumerator.
-+
-+ \sa enumerator(), enumeratorCount(), removeEnumerator(),
-+ \sa indexOfEnumerator()
-+*/
-+QMetaEnumBuilder QMetaObjectBuilder::addEnumerator(const QByteArray& name)
-+{
-+ int index = d->enumerators.size();
-+ d->enumerators.append(QMetaEnumBuilderPrivate(name));
-+ return QMetaEnumBuilder(this, index);
-+}
-+
-+/*!
-+ Adds a new enumerator to this class that has the same information as
-+ \a prototype. This is used to clone the enumerators of an existing
-+ QMetaObject. Returns an object that can be used to adjust the
-+ attributes of the enumerator.
-+
-+ \sa enumerator(), enumeratorCount(), removeEnumerator(),
-+ \sa indexOfEnumerator()
-+*/
-+QMetaEnumBuilder QMetaObjectBuilder::addEnumerator(const QMetaEnum& prototype)
-+{
-+ QMetaEnumBuilder en = addEnumerator(prototype.name());
-+ en.setIsFlag(prototype.isFlag());
-+ int count = prototype.keyCount();
-+ for (int index = 0; index < count; ++index)
-+ en.addKey(prototype.key(index), prototype.value(index));
-+ return en;
-+}
-+
-+/*!
-+ Adds \a name and \a value as an item of class information to this class.
-+ Returns the index of the new item of class information.
-+
-+ \sa classInfoCount(), classInfoName(), classInfoValue(), removeClassInfo()
-+ \sa indexOfClassInfo()
-+*/
-+int QMetaObjectBuilder::addClassInfo(const QByteArray& name, const QByteArray& value)
-+{
-+ int index = d->classInfoNames.size();
-+ d->classInfoNames += name;
-+ d->classInfoValues += value;
-+ return index;
-+}
-+
-+/*!
-+ Adds \a meta to this class as a related meta object. Returns
-+ the index of the new related meta object entry.
-+
-+ Related meta objects are used when resolving the enumerated type
-+ associated with a property, where the enumerated type is in a
-+ different class from the property.
-+
-+ \sa relatedMetaObjectCount(), relatedMetaObject()
-+ \sa removeRelatedMetaObject()
-+*/
-+#ifdef Q_NO_DATA_RELOCATION
-+int QMetaObjectBuilder::addRelatedMetaObject(const QMetaObjectAccessor &meta)
-+#else
-+int QMetaObjectBuilder::addRelatedMetaObject(const QMetaObject *meta)
-+#endif
-+{
-+ Q_ASSERT(meta);
-+ int index = d->relatedMetaObjects.size();
-+ d->relatedMetaObjects.append(meta);
-+ return index;
-+}
-+
-+/*!
-+ Adds the contents of \a prototype to this meta object builder.
-+ This function is useful for cloning the contents of an existing QMetaObject.
-+
-+ The \a members parameter indicates which members of \a prototype
-+ should be added. The default is AllMembers.
-+*/
-+void QMetaObjectBuilder::addMetaObject
-+ (const QMetaObject *prototype, QMetaObjectBuilder::AddMembers members)
-+{
-+ Q_ASSERT(prototype);
-+ int index;
-+
-+ if ((members & ClassName) != 0)
-+ d->className = prototype->className();
-+
-+ if ((members & SuperClass) != 0)
-+ d->superClass = prototype->superClass();
-+
-+ if ((members & (Methods | Signals | Slots)) != 0) {
-+ for (index = prototype->methodOffset(); index < prototype->methodCount(); ++index) {
-+ QMetaMethod method = prototype->method(index);
-+ if (method.methodType() != QMetaMethod::Signal) {
-+ if (method.access() == QMetaMethod::Public && (members & PublicMethods) == 0)
-+ continue;
-+ if (method.access() == QMetaMethod::Private && (members & PrivateMethods) == 0)
-+ continue;
-+ if (method.access() == QMetaMethod::Protected && (members & ProtectedMethods) == 0)
-+ continue;
-+ }
-+ if (method.methodType() == QMetaMethod::Method && (members & Methods) != 0) {
-+ addMethod(method);
-+ } else if (method.methodType() == QMetaMethod::Signal &&
-+ (members & Signals) != 0) {
-+ addMethod(method);
-+ } else if (method.methodType() == QMetaMethod::Slot &&
-+ (members & Slots) != 0) {
-+ addMethod(method);
-+ }
-+ }
-+ }
-+
-+ if ((members & Constructors) != 0) {
-+ for (index = 0; index < prototype->constructorCount(); ++index)
-+ addConstructor(prototype->constructor(index));
-+ }
-+
-+ if ((members & Properties) != 0) {
-+ for (index = prototype->propertyOffset(); index < prototype->propertyCount(); ++index)
-+ addProperty(prototype->property(index));
-+ }
-+
-+ if ((members & Enumerators) != 0) {
-+ for (index = prototype->enumeratorOffset(); index < prototype->enumeratorCount(); ++index)
-+ addEnumerator(prototype->enumerator(index));
-+ }
-+
-+ if ((members & ClassInfos) != 0) {
-+ for (index = prototype->classInfoOffset(); index < prototype->classInfoCount(); ++index) {
-+ QMetaClassInfo ci = prototype->classInfo(index);
-+ addClassInfo(ci.name(), ci.value());
-+ }
-+ }
-+
-+ if ((members & RelatedMetaObjects) != 0) {
-+#ifdef Q_NO_DATA_RELOCATION
-+ const QMetaObjectAccessor *objects = 0;
-+#else
-+ const QMetaObject **objects;
-+ if (priv(prototype->d.data)->revision < 2) {
-+ objects = (const QMetaObject **)(prototype->d.extradata);
-+ } else
-+#endif
-+ {
-+ const QMetaObjectExtraData *extra = (const QMetaObjectExtraData *)(prototype->d.extradata);
-+ if (extra)
-+ objects = extra->objects;
-+ else
-+ objects = 0;
-+ }
-+ if (objects) {
-+ while (*objects != 0) {
-+ addRelatedMetaObject(*objects);
-+ ++objects;
-+ }
-+ }
-+ }
-+
-+ if ((members & StaticMetacall) != 0) {
-+ if (priv(prototype->d.data)->revision >= 2) {
-+ const QMetaObjectExtraData *extra =
-+ (const QMetaObjectExtraData *)(prototype->d.extradata);
-+ if (extra && extra->static_metacall)
-+ setStaticMetacallFunction(extra->static_metacall);
-+ }
-+ }
-+}
-+
-+/*!
-+ Returns the method at \a index in this class.
-+
-+ \sa methodCount(), addMethod(), removeMethod(), indexOfMethod()
-+*/
-+QMetaMethodBuilder QMetaObjectBuilder::method(int index) const
-+{
-+ if (index >= 0 && index < d->methods.size())
-+ return QMetaMethodBuilder(this, index);
-+ else
-+ return QMetaMethodBuilder();
-+}
-+
-+/*!
-+ Returns the constructor at \a index in this class.
-+
-+ \sa methodCount(), addMethod(), removeMethod(), indexOfConstructor()
-+*/
-+QMetaMethodBuilder QMetaObjectBuilder::constructor(int index) const
-+{
-+ if (index >= 0 && index < d->constructors.size())
-+ return QMetaMethodBuilder(this, -(index + 1));
-+ else
-+ return QMetaMethodBuilder();
-+}
-+
-+/*!
-+ Returns the property at \a index in this class.
-+
-+ \sa methodCount(), addMethod(), removeMethod(), indexOfProperty()
-+*/
-+QMetaPropertyBuilder QMetaObjectBuilder::property(int index) const
-+{
-+ if (index >= 0 && index < d->properties.size())
-+ return QMetaPropertyBuilder(this, index);
-+ else
-+ return QMetaPropertyBuilder();
-+}
-+
-+/*!
-+ Returns the enumerator at \a index in this class.
-+
-+ \sa enumeratorCount(), addEnumerator(), removeEnumerator()
-+ \sa indexOfEnumerator()
-+*/
-+QMetaEnumBuilder QMetaObjectBuilder::enumerator(int index) const
-+{
-+ if (index >= 0 && index < d->enumerators.size())
-+ return QMetaEnumBuilder(this, index);
-+ else
-+ return QMetaEnumBuilder();
-+}
-+
-+/*!
-+ Returns the related meta object at \a index in this class.
-+
-+ Related meta objects are used when resolving the enumerated type
-+ associated with a property, where the enumerated type is in a
-+ different class from the property.
-+
-+ \sa relatedMetaObjectCount(), addRelatedMetaObject()
-+ \sa removeRelatedMetaObject()
-+*/
-+const QMetaObject *QMetaObjectBuilder::relatedMetaObject(int index) const
-+{
-+ if (index >= 0 && index < d->relatedMetaObjects.size())
-+#ifdef Q_NO_DATA_RELOCATION
-+ return &((*(d->relatedMetaObjects[index]))());
-+#else
-+ return d->relatedMetaObjects[index];
-+#endif
-+ else
-+ return 0;
-+}
-+
-+/*!
-+ Returns the name of the item of class information at \a index
-+ in this class.
-+
-+ \sa classInfoCount(), addClassInfo(), classInfoValue(), removeClassInfo()
-+ \sa indexOfClassInfo()
-+*/
-+QByteArray QMetaObjectBuilder::classInfoName(int index) const
-+{
-+ if (index >= 0 && index < d->classInfoNames.size())
-+ return d->classInfoNames[index];
-+ else
-+ return QByteArray();
-+}
-+
-+/*!
-+ Returns the value of the item of class information at \a index
-+ in this class.
-+
-+ \sa classInfoCount(), addClassInfo(), classInfoName(), removeClassInfo()
-+ \sa indexOfClassInfo()
-+*/
-+QByteArray QMetaObjectBuilder::classInfoValue(int index) const
-+{
-+ if (index >= 0 && index < d->classInfoValues.size())
-+ return d->classInfoValues[index];
-+ else
-+ return QByteArray();
-+}
-+
-+/*!
-+ Removes the method at \a index from this class. The indices of
-+ all following methods will be adjusted downwards by 1. If the
-+ method is registered as a notify signal on a property, then the
-+ notify signal will be removed from the property.
-+
-+ \sa methodCount(), addMethod(), method(), indexOfMethod()
-+*/
-+void QMetaObjectBuilder::removeMethod(int index)
-+{
-+ if (index >= 0 && index < d->methods.size()) {
-+ d->methods.removeAt(index);
-+ for (int prop = 0; prop < d->properties.size(); ++prop) {
-+ // Adjust the indices of property notify signal references.
-+ if (d->properties[prop].notifySignal == index) {
-+ d->properties[prop].notifySignal = -1;
-+ d->properties[prop].setFlag(Notify, false);
-+ } else if (d->properties[prop].notifySignal > index)
-+ (d->properties[prop].notifySignal)--;
-+ }
-+ }
-+}
-+
-+/*!
-+ Removes the constructor at \a index from this class. The indices of
-+ all following constructors will be adjusted downwards by 1.
-+
-+ \sa constructorCount(), addConstructor(), constructor()
-+ \sa indexOfConstructor()
-+*/
-+void QMetaObjectBuilder::removeConstructor(int index)
-+{
-+ if (index >= 0 && index < d->constructors.size())
-+ d->constructors.removeAt(index);
-+}
-+
-+/*!
-+ Removes the property at \a index from this class. The indices of
-+ all following properties will be adjusted downwards by 1.
-+
-+ \sa propertyCount(), addProperty(), property(), indexOfProperty()
-+*/
-+void QMetaObjectBuilder::removeProperty(int index)
-+{
-+ if (index >= 0 && index < d->properties.size())
-+ d->properties.removeAt(index);
-+}
-+
-+/*!
-+ Removes the enumerator at \a index from this class. The indices of
-+ all following enumerators will be adjusted downwards by 1.
-+
-+ \sa enumertorCount(), addEnumerator(), enumerator()
-+ \sa indexOfEnumerator()
-+*/
-+void QMetaObjectBuilder::removeEnumerator(int index)
-+{
-+ if (index >= 0 && index < d->enumerators.size())
-+ d->enumerators.removeAt(index);
-+}
-+
-+/*!
-+ Removes the item of class information at \a index from this class.
-+ The indices of all following items will be adjusted downwards by 1.
-+
-+ \sa classInfoCount(), addClassInfo(), classInfoName(), classInfoValue()
-+ \sa indexOfClassInfo()
-+*/
-+void QMetaObjectBuilder::removeClassInfo(int index)
-+{
-+ if (index >= 0 && index < d->classInfoNames.size()) {
-+ d->classInfoNames.removeAt(index);
-+ d->classInfoValues.removeAt(index);
-+ }
-+}
-+
-+/*!
-+ Removes the related meta object at \a index from this class.
-+ The indices of all following related meta objects will be adjusted
-+ downwards by 1.
-+
-+ Related meta objects are used when resolving the enumerated type
-+ associated with a property, where the enumerated type is in a
-+ different class from the property.
-+
-+ \sa relatedMetaObjectCount(), addRelatedMetaObject()
-+ \sa relatedMetaObject()
-+*/
-+void QMetaObjectBuilder::removeRelatedMetaObject(int index)
-+{
-+ if (index >= 0 && index < d->relatedMetaObjects.size())
-+ d->relatedMetaObjects.removeAt(index);
-+}
-+
-+/*!
-+ Finds a method with the specified \a signature and returns its index;
-+ otherwise returns -1. The \a signature will be normalized by this method.
-+
-+ \sa method(), methodCount(), addMethod(), removeMethod()
-+*/
-+int QMetaObjectBuilder::indexOfMethod(const QByteArray& signature)
-+{
-+ QByteArray sig = QMetaObject::normalizedSignature(signature);
-+ for (int index = 0; index < d->methods.size(); ++index) {
-+ if (sig == d->methods[index].signature)
-+ return index;
-+ }
-+ return -1;
-+}
-+
-+/*!
-+ Finds a signal with the specified \a signature and returns its index;
-+ otherwise returns -1. The \a signature will be normalized by this method.
-+
-+ \sa indexOfMethod(), indexOfSlot()
-+*/
-+int QMetaObjectBuilder::indexOfSignal(const QByteArray& signature)
-+{
-+ QByteArray sig = QMetaObject::normalizedSignature(signature);
-+ for (int index = 0; index < d->methods.size(); ++index) {
-+ if (sig == d->methods[index].signature &&
-+ d->methods[index].methodType() == QMetaMethod::Signal)
-+ return index;
-+ }
-+ return -1;
-+}
-+
-+/*!
-+ Finds a slot with the specified \a signature and returns its index;
-+ otherwise returns -1. The \a signature will be normalized by this method.
-+
-+ \sa indexOfMethod(), indexOfSignal()
-+*/
-+int QMetaObjectBuilder::indexOfSlot(const QByteArray& signature)
-+{
-+ QByteArray sig = QMetaObject::normalizedSignature(signature);
-+ for (int index = 0; index < d->methods.size(); ++index) {
-+ if (sig == d->methods[index].signature &&
-+ d->methods[index].methodType() == QMetaMethod::Slot)
-+ return index;
-+ }
-+ return -1;
-+}
-+
-+/*!
-+ Finds a constructor with the specified \a signature and returns its index;
-+ otherwise returns -1. The \a signature will be normalized by this method.
-+
-+ \sa constructor(), constructorCount(), addConstructor(), removeConstructor()
-+*/
-+int QMetaObjectBuilder::indexOfConstructor(const QByteArray& signature)
-+{
-+ QByteArray sig = QMetaObject::normalizedSignature(signature);
-+ for (int index = 0; index < d->constructors.size(); ++index) {
-+ if (sig == d->constructors[index].signature)
-+ return index;
-+ }
-+ return -1;
-+}
-+
-+/*!
-+ Finds a property with the specified \a name and returns its index;
-+ otherwise returns -1.
-+
-+ \sa property(), propertyCount(), addProperty(), removeProperty()
-+*/
-+int QMetaObjectBuilder::indexOfProperty(const QByteArray& name)
-+{
-+ for (int index = 0; index < d->properties.size(); ++index) {
-+ if (name == d->properties[index].name)
-+ return index;
-+ }
-+ return -1;
-+}
-+
-+/*!
-+ Finds an enumerator with the specified \a name and returns its index;
-+ otherwise returns -1.
-+
-+ \sa enumertor(), enumeratorCount(), addEnumerator(), removeEnumerator()
-+*/
-+int QMetaObjectBuilder::indexOfEnumerator(const QByteArray& name)
-+{
-+ for (int index = 0; index < d->enumerators.size(); ++index) {
-+ if (name == d->enumerators[index].name)
-+ return index;
-+ }
-+ return -1;
-+}
-+
-+/*!
-+ Finds an item of class information with the specified \a name and
-+ returns its index; otherwise returns -1.
-+
-+ \sa classInfoName(), classInfoValue(), classInfoCount(), addClassInfo()
-+ \sa removeClassInfo()
-+*/
-+int QMetaObjectBuilder::indexOfClassInfo(const QByteArray& name)
-+{
-+ for (int index = 0; index < d->classInfoNames.size(); ++index) {
-+ if (name == d->classInfoNames[index])
-+ return index;
-+ }
-+ return -1;
-+}
-+
-+// Align on a specific type boundary.
-+#define ALIGN(size,type) \
-+ (size) = ((size) + sizeof(type) - 1) & ~(sizeof(type) - 1)
-+
-+// Build a string into a QMetaObject representation. Returns the
-+// position in the string table where the string was placed.
-+static int buildString
-+ (char *buf, char *str, int *offset, const QByteArray& value, int empty)
-+{
-+ if (value.size() == 0 && empty >= 0)
-+ return empty;
-+ if (buf) {
-+ memcpy(str + *offset, value.constData(), value.size());
-+ str[*offset + value.size()] = '\0';
-+ }
-+ int posn = *offset;
-+ *offset += value.size() + 1;
-+ return posn;
-+}
-+
-+// Build the parameter array string for a method.
-+static QByteArray buildParameterNames
-+ (const QByteArray& signature, const QList<QByteArray>& parameterNames)
-+{
-+ // If the parameter name list is specified, then concatenate them.
-+ if (!parameterNames.isEmpty()) {
-+ QByteArray names;
-+ bool first = true;
-+ foreach (const QByteArray &name, parameterNames) {
-+ if (first)
-+ first = false;
-+ else
-+ names += (char)',';
-+ names += name;
-+ }
-+ return names;
-+ }
-+
-+ // Count commas in the signature, excluding those inside template arguments.
-+ int index = signature.indexOf('(');
-+ if (index < 0)
-+ return QByteArray();
-+ ++index;
-+ if (index >= signature.size())
-+ return QByteArray();
-+ if (signature[index] == ')')
-+ return QByteArray();
-+ int count = 1;
-+ int brackets = 0;
-+ while (index < signature.size() && signature[index] != ',') {
-+ char ch = signature[index++];
-+ if (ch == '<')
-+ ++brackets;
-+ else if (ch == '>')
-+ --brackets;
-+ else if (ch == ',' && brackets <= 0)
-+ ++count;
-+ }
-+ return QByteArray(count - 1, ',');
-+}
-+
-+// Build a QMetaObject in "buf" based on the information in "d".
-+// If "buf" is null, then return the number of bytes needed to
-+// build the QMetaObject. Returns -1 if the metaobject if
-+// relocatable is set, but the metaobject contains extradata.
-+static int buildMetaObject(QMetaObjectBuilderPrivate *d, char *buf,
-+ bool relocatable)
-+{
-+ int size = 0;
-+ int dataIndex;
-+ int enumIndex;
-+ int index;
-+ bool hasNotifySignals = false;
-+
-+ if (relocatable &&
-+ (d->relatedMetaObjects.size() > 0 || d->staticMetacallFunction))
-+ return -1;
-+
-+ // Create the main QMetaObject structure at the start of the buffer.
-+ QMetaObject *meta = reinterpret_cast<QMetaObject *>(buf);
-+ size += sizeof(QMetaObject);
-+ ALIGN(size, int);
-+ if (buf) {
-+ if (!relocatable) meta->d.superdata = d->superClass;
-+ meta->d.extradata = 0;
-+ }
-+
-+ // Populate the QMetaObjectPrivate structure.
-+ QMetaObjectPrivate *pmeta
-+ = reinterpret_cast<QMetaObjectPrivate *>(buf + size);
-+ int pmetaSize = size;
-+ dataIndex = 13; // Number of fields in the QMetaObjectPrivate.
-+ for (index = 0; index < d->properties.size(); ++index) {
-+ if (d->properties[index].notifySignal != -1) {
-+ hasNotifySignals = true;
-+ break;
-+ }
-+ }
-+ if (buf) {
-+ pmeta->revision = 3;
-+ pmeta->flags = d->flags;
-+ pmeta->className = 0; // Class name is always the first string.
-+
-+ pmeta->classInfoCount = d->classInfoNames.size();
-+ pmeta->classInfoData = dataIndex;
-+ dataIndex += 2 * d->classInfoNames.size();
-+
-+ pmeta->methodCount = d->methods.size();
-+ pmeta->methodData = dataIndex;
-+ dataIndex += 5 * d->methods.size();
-+
-+ pmeta->propertyCount = d->properties.size();
-+ pmeta->propertyData = dataIndex;
-+ dataIndex += 3 * d->properties.size();
-+ if (hasNotifySignals)
-+ dataIndex += d->properties.size();
-+
-+ pmeta->enumeratorCount = d->enumerators.size();
-+ pmeta->enumeratorData = dataIndex;
-+ dataIndex += 4 * d->enumerators.size();
-+
-+ pmeta->constructorCount = d->constructors.size();
-+ pmeta->constructorData = dataIndex;
-+ dataIndex += 5 * d->constructors.size();
-+ } else {
-+ dataIndex += 2 * d->classInfoNames.size();
-+ dataIndex += 5 * d->methods.size();
-+ dataIndex += 3 * d->properties.size();
-+ if (hasNotifySignals)
-+ dataIndex += d->properties.size();
-+ dataIndex += 4 * d->enumerators.size();
-+ dataIndex += 5 * d->constructors.size();
-+ }
-+
-+ // Allocate space for the enumerator key names and values.
-+ enumIndex = dataIndex;
-+ for (index = 0; index < d->enumerators.size(); ++index) {
-+ QMetaEnumBuilderPrivate *enumerator = &(d->enumerators[index]);
-+ dataIndex += 2 * enumerator->keys.size();
-+ }
-+
-+ // Zero terminator at the end of the data offset table.
-+ ++dataIndex;
-+
-+ // Find the start of the data and string tables.
-+ int *data = reinterpret_cast<int *>(pmeta);
-+ size += dataIndex * sizeof(int);
-+ char *str = reinterpret_cast<char *>(buf + size);
-+ if (buf) {
-+ if (relocatable) {
-+ meta->d.stringdata = reinterpret_cast<const char *>((intptr_t)size);
-+ meta->d.data = reinterpret_cast<uint *>((intptr_t)pmetaSize);
-+ } else {
-+ meta->d.stringdata = str;
-+ meta->d.data = reinterpret_cast<uint *>(data);
-+ }
-+ }
-+
-+ // Reset the current data position to just past the QMetaObjectPrivate.
-+ dataIndex = 13;
-+
-+ // Add the class name to the string table.
-+ int offset = 0;
-+ buildString(buf, str, &offset, d->className, -1);
-+
-+ // Add a common empty string, which is used to indicate "void"
-+ // method returns, empty tag strings, etc.
-+ int empty = buildString(buf, str, &offset, QByteArray(), -1);
-+
-+ // Output the class infos,
-+ for (index = 0; index < d->classInfoNames.size(); ++index) {
-+ int name = buildString(buf, str, &offset, d->classInfoNames[index], empty);
-+ int value = buildString(buf, str, &offset, d->classInfoValues[index], empty);
-+ if (buf) {
-+ data[dataIndex] = name;
-+ data[dataIndex + 1] = value;
-+ }
-+ dataIndex += 2;
-+ }
-+
-+ // Output the methods in the class.
-+ for (index = 0; index < d->methods.size(); ++index) {
-+ QMetaMethodBuilderPrivate *method = &(d->methods[index]);
-+ int sig = buildString(buf, str, &offset, method->signature, empty);
-+ int params;
-+ QByteArray names = buildParameterNames
-+ (method->signature, method->parameterNames);
-+ params = buildString(buf, str, &offset, names, empty);
-+ int ret = buildString(buf, str, &offset, method->returnType, empty);
-+ int tag = buildString(buf, str, &offset, method->tag, empty);
-+ int attrs = method->attributes;
-+ if (buf) {
-+ data[dataIndex] = sig;
-+ data[dataIndex + 1] = params;
-+ data[dataIndex + 2] = ret;
-+ data[dataIndex + 3] = tag;
-+ data[dataIndex + 4] = attrs;
-+ }
-+ dataIndex += 5;
-+ }
-+
-+ // Output the properties in the class.
-+ for (index = 0; index < d->properties.size(); ++index) {
-+ QMetaPropertyBuilderPrivate *prop = &(d->properties[index]);
-+ int name = buildString(buf, str, &offset, prop->name, empty);
-+ int type = buildString(buf, str, &offset, prop->type, empty);
-+ int flags = prop->flags;
-+
-+ if (!isVariantType(prop->type)) {
-+ flags |= EnumOrFlag;
-+ } else {
-+ flags |= qvariant_nameToType(prop->type) << 24;
-+ }
-+
-+ if (buf) {
-+ data[dataIndex] = name;
-+ data[dataIndex + 1] = type;
-+ data[dataIndex + 2] = flags;
-+ }
-+ dataIndex += 3;
-+ }
-+ if (hasNotifySignals) {
-+ for (index = 0; index < d->properties.size(); ++index) {
-+ QMetaPropertyBuilderPrivate *prop = &(d->properties[index]);
-+ if (buf) {
-+ if (prop->notifySignal != -1)
-+ data[dataIndex] = prop->notifySignal;
-+ else
-+ data[dataIndex] = 0;
-+ }
-+ ++dataIndex;
-+ }
-+ }
-+
-+ // Output the enumerators in the class.
-+ for (index = 0; index < d->enumerators.size(); ++index) {
-+ QMetaEnumBuilderPrivate *enumerator = &(d->enumerators[index]);
-+ int name = buildString(buf, str, &offset, enumerator->name, empty);
-+ int isFlag = (int)(enumerator->isFlag);
-+ int count = enumerator->keys.size();
-+ int enumOffset = enumIndex;
-+ if (buf) {
-+ data[dataIndex] = name;
-+ data[dataIndex + 1] = isFlag;
-+ data[dataIndex + 2] = count;
-+ data[dataIndex + 3] = enumOffset;
-+ }
-+ for (int key = 0; key < count; ++key) {
-+ int keyIndex = buildString(buf, str, &offset, enumerator->keys[key], empty);
-+ if (buf) {
-+ data[enumOffset++] = keyIndex;
-+ data[enumOffset++] = enumerator->values[key];
-+ }
-+ }
-+ dataIndex += 4;
-+ enumIndex += 2 * count;
-+ }
-+
-+ // Output the constructors in the class.
-+ for (index = 0; index < d->constructors.size(); ++index) {
-+ QMetaMethodBuilderPrivate *method = &(d->constructors[index]);
-+ int sig = buildString(buf, str, &offset, method->signature, empty);
-+ int params;
-+ QByteArray names = buildParameterNames
-+ (method->signature, method->parameterNames);
-+ params = buildString(buf, str, &offset, names, empty);
-+ int ret = buildString(buf, str, &offset, method->returnType, empty);
-+ int tag = buildString(buf, str, &offset, method->tag, empty);
-+ int attrs = method->attributes;
-+ if (buf) {
-+ data[dataIndex] = sig;
-+ data[dataIndex + 1] = params;
-+ data[dataIndex + 2] = ret;
-+ data[dataIndex + 3] = tag;
-+ data[dataIndex + 4] = attrs;
-+ }
-+ dataIndex += 5;
-+ }
-+
-+ // One more empty string to act as a terminator.
-+ buildString(buf, str, &offset, QByteArray(), -1);
-+ size += offset;
-+
-+ // Output the zero terminator in the data array.
-+ if (buf)
-+ data[enumIndex] = 0;
-+
-+ // Create the extradata block if we need one.
-+ if (d->relatedMetaObjects.size() > 0 || d->staticMetacallFunction) {
-+ ALIGN(size, QMetaObject **);
-+ ALIGN(size, QMetaObjectBuilder::StaticMetacallFunction);
-+ QMetaObjectExtraData *extra =
-+ reinterpret_cast<QMetaObjectExtraData *>(buf + size);
-+ size += sizeof(QMetaObjectExtraData);
-+ ALIGN(size, QMetaObject *);
-+#ifdef Q_NO_DATA_RELOCATION
-+ QMetaObjectAccessor *objects =
-+ reinterpret_cast<QMetaObjectAccessor *>(buf + size);
-+#else
-+ const QMetaObject **objects =
-+ reinterpret_cast<const QMetaObject **>(buf + size);
-+#endif
-+ if (buf) {
-+ if (d->relatedMetaObjects.size() > 0) {
-+ extra->objects = objects;
-+ for (index = 0; index < d->relatedMetaObjects.size(); ++index)
-+ objects[index] = d->relatedMetaObjects[index];
-+ objects[index] = 0;
-+ } else {
-+ extra->objects = 0;
-+ }
-+ extra->static_metacall = d->staticMetacallFunction;
-+ meta->d.extradata = reinterpret_cast<void *>(extra);
-+ }
-+ if (d->relatedMetaObjects.size() > 0)
-+ size += sizeof(QMetaObject *) * (d->relatedMetaObjects.size() + 1);
-+ }
-+
-+ // Align the final size and return it.
-+ ALIGN(size, void *);
-+ return size;
-+}
-+
-+/*!
-+ Converts this meta object builder into a concrete QMetaObject.
-+ The return value should be deallocated using qFree() once it
-+ is no longer needed.
-+
-+ The returned meta object is a snapshot of the state of the
-+ QMetaObjectBuilder. Any further modifications to the QMetaObjectBuilder
-+ will not be reflected in previous meta objects returned by
-+ this method.
-+*/
-+QMetaObject *QMetaObjectBuilder::toMetaObject() const
-+{
-+ int size = buildMetaObject(d, 0, false);
-+ char *buf = reinterpret_cast<char *>(qMalloc(size));
-+ buildMetaObject(d, buf, false);
-+ return reinterpret_cast<QMetaObject *>(buf);
-+}
-+
-+/*
-+ \internal
-+
-+ Converts this meta object builder into relocatable data. This data can
-+ be stored, copied and later passed to fromRelocatableData() to create a
-+ concrete QMetaObject.
-+
-+ The data is specific to the architecture on which it was created, but is not
-+ specific to the process that created it. Not all meta object builder's can
-+ be converted to data in this way. If \a ok is provided, it will be set to
-+ true if the conversion succeeds, and false otherwise. If a
-+ staticMetacallFunction() or any relatedMetaObject()'s are specified the
-+ conversion to relocatable data will fail.
-+*/
-+QByteArray QMetaObjectBuilder::toRelocatableData(bool *ok) const
-+{
-+ int size = buildMetaObject(d, 0, true);
-+ if (size == -1) {
-+ if (ok) *ok = false;
-+ return QByteArray();
-+ }
-+
-+ QByteArray data;
-+ data.resize(size);
-+ char *buf = data.data();
-+ buildMetaObject(d, buf, true);
-+ if (ok) *ok = true;
-+ return data;
-+}
-+
-+/*
-+ \internal
-+
-+ Sets the \a data returned from toRelocatableData() onto a concrete
-+ QMetaObject instance, \a output. As the meta object's super class is not
-+ saved in the relocatable data, it must be passed as \a superClass.
-+*/
-+void QMetaObjectBuilder::fromRelocatableData(QMetaObject *output,
-+ const QMetaObject *superclass,
-+ const QByteArray &data)
-+{
-+ if (!output)
-+ return;
-+
-+ const char *buf = data.constData();
-+ const QMetaObject *dataMo = reinterpret_cast<const QMetaObject *>(buf);
-+
-+ intptr_t stringdataOffset = (intptr_t)dataMo->d.stringdata;
-+ intptr_t dataOffset = (intptr_t)dataMo->d.data;
-+
-+ output->d.superdata = superclass;
-+ output->d.stringdata = buf + stringdataOffset;
-+ output->d.data = reinterpret_cast<const uint *>(buf + dataOffset);
-+}
-+
-+/*!
-+ \typedef QMetaObjectBuilder::StaticMetacallFunction
-+
-+ Typedef for static metacall functions. The three parameters are
-+ the call type value, the constructor index, and the
-+ array of parameters.
-+*/
-+
-+/*!
-+ Returns the static metacall function to use to construct objects
-+ of this class. The default value is null.
-+
-+ \sa setStaticMetacallFunction()
-+*/
-+QMetaObjectBuilder::StaticMetacallFunction QMetaObjectBuilder::staticMetacallFunction() const
-+{
-+ return d->staticMetacallFunction;
-+}
-+
-+/*!
-+ Sets the static metacall function to use to construct objects
-+ of this class to \a value. The default value is null.
-+
-+ \sa staticMetacallFunction()
-+*/
-+void QMetaObjectBuilder::setStaticMetacallFunction
-+ (QMetaObjectBuilder::StaticMetacallFunction value)
-+{
-+ d->staticMetacallFunction = value;
-+}
-+
-+#ifndef QT_NO_DATASTREAM
-+
-+/*!
-+ Serializes the contents of the meta object builder onto \a stream.
-+
-+ \sa deserialize()
-+*/
-+void QMetaObjectBuilder::serialize(QDataStream& stream) const
-+{
-+ int index;
-+
-+ // Write the class and super class names.
-+ stream << d->className;
-+ if (d->superClass)
-+ stream << QByteArray(d->superClass->className());
-+ else
-+ stream << QByteArray();
-+
-+ // Write the counts for each type of class member.
-+ stream << d->classInfoNames.size();
-+ stream << d->methods.size();
-+ stream << d->properties.size();
-+ stream << d->enumerators.size();
-+ stream << d->constructors.size();
-+ stream << d->relatedMetaObjects.size();
-+
-+ // Write the items of class information.
-+ for (index = 0; index < d->classInfoNames.size(); ++index) {
-+ stream << d->classInfoNames[index];
-+ stream << d->classInfoValues[index];
-+ }
-+
-+ // Write the methods.
-+ for (index = 0; index < d->methods.size(); ++index) {
-+ const QMetaMethodBuilderPrivate *method = &(d->methods[index]);
-+ stream << method->signature;
-+ stream << method->returnType;
-+ stream << method->parameterNames;
-+ stream << method->tag;
-+ stream << method->attributes;
-+ }
-+
-+ // Write the properties.
-+ for (index = 0; index < d->properties.size(); ++index) {
-+ const QMetaPropertyBuilderPrivate *property = &(d->properties[index]);
-+ stream << property->name;
-+ stream << property->type;
-+ stream << property->flags;
-+ stream << property->notifySignal;
-+ }
-+
-+ // Write the enumerators.
-+ for (index = 0; index < d->enumerators.size(); ++index) {
-+ const QMetaEnumBuilderPrivate *enumerator = &(d->enumerators[index]);
-+ stream << enumerator->name;
-+ stream << enumerator->isFlag;
-+ stream << enumerator->keys;
-+ stream << enumerator->values;
-+ }
-+
-+ // Write the constructors.
-+ for (index = 0; index < d->constructors.size(); ++index) {
-+ const QMetaMethodBuilderPrivate *method = &(d->constructors[index]);
-+ stream << method->signature;
-+ stream << method->returnType;
-+ stream << method->parameterNames;
-+ stream << method->tag;
-+ stream << method->attributes;
-+ }
-+
-+ // Write the related meta objects.
-+#ifdef Q_NO_DATA_RELOCATION
-+ //the related meta objects will be function pointers
-+ //which you have to add to the builder manually.
-+ //e.g.
-+ //builder2.addRelatedMetaObject(QLocale::getStaticMetaObject);
-+#else
-+ for (index = 0; index < d->relatedMetaObjects.size(); ++index) {
-+ const QMetaObject *meta = d->relatedMetaObjects[index];
-+ stream << QByteArray(meta->className());
-+ }
-+#endif
-+
-+ // Add an extra empty QByteArray for additional data in future versions.
-+ // This should help maintain backwards compatibility, allowing older
-+ // versions to read newer data.
-+ stream << QByteArray();
-+}
-+
-+// Resolve a class name using the name reference map.
-+static const QMetaObject *resolveClassName
-+ (const QMap<QByteArray, const QMetaObject *>& references,
-+ const QByteArray& name)
-+{
-+ if (name == QByteArray("QObject"))
-+ return &QObject::staticMetaObject;
-+ else
-+ return references.value(name, 0);
-+}
-+
-+/*!
-+ Deserializes a meta object builder from \a stream into
-+ this meta object builder.
-+
-+ The \a references parameter specifies a mapping from class names
-+ to QMetaObject instances for resolving the super class name and
-+ related meta objects in the object that is deserialized.
-+ The meta object for QObject is implicitly added to \a references
-+ and does not need to be supplied.
-+
-+ The QDataStream::status() value on \a stream will be set to
-+ QDataStream::ReadCorruptData if the input data is corrupt.
-+ The status will be set to QDataStream::ReadPastEnd if the
-+ input was exhausted before the full meta object was read.
-+
-+ \sa serialize()
-+*/
-+void QMetaObjectBuilder::deserialize
-+ (QDataStream& stream,
-+ const QMap<QByteArray, const QMetaObject *>& references)
-+{
-+ QByteArray name;
-+ const QMetaObject *cl;
-+ int index;
-+
-+ // Clear all members in the builder to their default states.
-+ d->className.clear();
-+ d->superClass = &QObject::staticMetaObject;
-+ d->classInfoNames.clear();
-+ d->classInfoValues.clear();
-+ d->methods.clear();
-+ d->properties.clear();
-+ d->enumerators.clear();
-+ d->constructors.clear();
-+ d->relatedMetaObjects.clear();
-+ d->staticMetacallFunction = 0;
-+
-+ // Read the class and super class names.
-+ stream >> d->className;
-+ stream >> name;
-+ if (name.isEmpty()) {
-+ d->superClass = 0;
-+ } else if ((cl = resolveClassName(references, name)) != 0) {
-+ d->superClass = cl;
-+ } else {
-+ stream.setStatus(QDataStream::ReadCorruptData);
-+ return;
-+ }
-+
-+ // Read the counts for each type of class member.
-+ int classInfoCount, methodCount, propertyCount;
-+ int enumeratorCount, constructorCount, relatedMetaObjectCount;
-+ stream >> classInfoCount;
-+ stream >> methodCount;
-+ stream >> propertyCount;
-+ stream >> enumeratorCount;
-+ stream >> constructorCount;
-+ stream >> relatedMetaObjectCount;
-+ if (classInfoCount < 0 || methodCount < 0 ||
-+ propertyCount < 0 || enumeratorCount < 0 ||
-+ constructorCount < 0 || relatedMetaObjectCount < 0) {
-+ stream.setStatus(QDataStream::ReadCorruptData);
-+ return;
-+ }
-+
-+ // Read the items of class information.
-+ for (index = 0; index < classInfoCount; ++index) {
-+ if (stream.status() != QDataStream::Ok)
-+ return;
-+ QByteArray value;
-+ stream >> name;
-+ stream >> value;
-+ addClassInfo(name, value);
-+ }
-+
-+ // Read the member methods.
-+ for (index = 0; index < methodCount; ++index) {
-+ if (stream.status() != QDataStream::Ok)
-+ return;
-+ stream >> name;
-+ addMethod(name);
-+ QMetaMethodBuilderPrivate *method = &(d->methods[index]);
-+ stream >> method->returnType;
-+ stream >> method->parameterNames;
-+ stream >> method->tag;
-+ stream >> method->attributes;
-+ if (method->methodType() == QMetaMethod::Constructor) {
-+ // Cannot add a constructor in this set of methods.
-+ stream.setStatus(QDataStream::ReadCorruptData);
-+ return;
-+ }
-+ }
-+
-+ // Read the properties.
-+ for (index = 0; index < propertyCount; ++index) {
-+ if (stream.status() != QDataStream::Ok)
-+ return;
-+ QByteArray type;
-+ stream >> name;
-+ stream >> type;
-+ addProperty(name, type);
-+ QMetaPropertyBuilderPrivate *property = &(d->properties[index]);
-+ stream >> property->flags;
-+ stream >> property->notifySignal;
-+ if (property->notifySignal < -1 ||
-+ property->notifySignal >= d->methods.size()) {
-+ // Notify signal method index is out of range.
-+ stream.setStatus(QDataStream::ReadCorruptData);
-+ return;
-+ }
-+ if (property->notifySignal >= 0 &&
-+ d->methods[property->notifySignal].methodType() != QMetaMethod::Signal) {
-+ // Notify signal method index does not refer to a signal.
-+ stream.setStatus(QDataStream::ReadCorruptData);
-+ return;
-+ }
-+ }
-+
-+ // Read the enumerators.
-+ for (index = 0; index < enumeratorCount; ++index) {
-+ if (stream.status() != QDataStream::Ok)
-+ return;
-+ stream >> name;
-+ addEnumerator(name);
-+ QMetaEnumBuilderPrivate *enumerator = &(d->enumerators[index]);
-+ stream >> enumerator->isFlag;
-+ stream >> enumerator->keys;
-+ stream >> enumerator->values;
-+ if (enumerator->keys.size() != enumerator->values.size()) {
-+ // Mismatch between number of keys and number of values.
-+ stream.setStatus(QDataStream::ReadCorruptData);
-+ return;
-+ }
-+ }
-+
-+ // Read the constructor methods.
-+ for (index = 0; index < constructorCount; ++index) {
-+ if (stream.status() != QDataStream::Ok)
-+ return;
-+ stream >> name;
-+ addConstructor(name);
-+ QMetaMethodBuilderPrivate *method = &(d->constructors[index]);
-+ stream >> method->returnType;
-+ stream >> method->parameterNames;
-+ stream >> method->tag;
-+ stream >> method->attributes;
-+ if (method->methodType() != QMetaMethod::Constructor) {
-+ // The type must be Constructor.
-+ stream.setStatus(QDataStream::ReadCorruptData);
-+ return;
-+ }
-+ }
-+
-+ // Read the related meta objects.
-+#ifdef Q_NO_DATA_RELOCATION
-+ //the related meta objects will be function pointers
-+ //which you have to add to the builder manually.
-+ //e.g.
-+ //builder2.addRelatedMetaObject(QLocale::getStaticMetaObject);
-+#else
-+ for (index = 0; index < relatedMetaObjectCount; ++index) {
-+ if (stream.status() != QDataStream::Ok)
-+ return;
-+ stream >> name;
-+ cl = resolveClassName(references, name);
-+ if (!cl) {
-+ stream.setStatus(QDataStream::ReadCorruptData);
-+ return;
-+ }
-+ addRelatedMetaObject(cl);
-+ }
-+#endif
-+
-+ // Read the extra data block, which is reserved for future use.
-+ stream >> name;
-+}
-+
-+#endif // !QT_NO_DATASTREAM
-+
-+/*!
-+ \class QMetaMethodBuilder
-+ \internal
-+ \brief The QMetaMethodBuilder class enables modifications to a method definition on a meta object builder.
-+*/
-+
-+QMetaMethodBuilderPrivate *QMetaMethodBuilder::d_func() const
-+{
-+ // Positive indices indicate methods, negative indices indicate constructors.
-+ if (_mobj && _index >= 0 && _index < _mobj->d->methods.size())
-+ return &(_mobj->d->methods[_index]);
-+ else if (_mobj && -_index >= 1 && -_index <= _mobj->d->constructors.size())
-+ return &(_mobj->d->constructors[(-_index) - 1]);
-+ else
-+ return 0;
-+}
-+
-+/*!
-+ \fn QMetaMethodBuilder::QMetaMethodBuilder()
-+ \internal
-+*/
-+
-+/*!
-+ Returns the index of this method within its QMetaObjectBuilder.
-+*/
-+int QMetaMethodBuilder::index() const
-+{
-+ if (_index >= 0)
-+ return _index; // Method, signal, or slot
-+ else
-+ return (-_index) - 1; // Constructor
-+}
-+
-+/*!
-+ Returns the type of this method (signal, slot, method, or constructor).
-+*/
-+QMetaMethod::MethodType QMetaMethodBuilder::methodType() const
-+{
-+ QMetaMethodBuilderPrivate *d = d_func();
-+ if (d)
-+ return d->methodType();
-+ else
-+ return QMetaMethod::Method;
-+}
-+
-+/*!
-+ Returns the signature of this method.
-+
-+ \sa parameterNames(), returnType()
-+*/
-+QByteArray QMetaMethodBuilder::signature() const
-+{
-+ QMetaMethodBuilderPrivate *d = d_func();
-+ if (d)
-+ return d->signature;
-+ else
-+ return QByteArray();
-+}
-+
-+/*!
-+ Returns the return type for this method; empty if the method's
-+ return type is \c{void}.
-+
-+ \sa setReturnType(), signature()
-+*/
-+QByteArray QMetaMethodBuilder::returnType() const
-+{
-+ QMetaMethodBuilderPrivate *d = d_func();
-+ if (d)
-+ return d->returnType;
-+ else
-+ return QByteArray();
-+}
-+
-+/*!
-+ Sets the return type for this method to \a value. If \a value
-+ is empty, then the method's return type is \c{void}. The \a value
-+ will be normalized before it is added to the method.
-+
-+ \sa returnType(), signature()
-+*/
-+void QMetaMethodBuilder::setReturnType(const QByteArray& value)
-+{
-+ QMetaMethodBuilderPrivate *d = d_func();
-+ if (d)
-+ d->returnType = QMetaObject::normalizedType(value);
-+}
-+
-+/*!
-+ Returns the list of parameter names for this method.
-+
-+ \sa setParameterNames()
-+*/
-+QList<QByteArray> QMetaMethodBuilder::parameterNames() const
-+{
-+ QMetaMethodBuilderPrivate *d = d_func();
-+ if (d)
-+ return d->parameterNames;
-+ else
-+ return QList<QByteArray>();
-+}
-+
-+/*!
-+ Sets the list of parameter names for this method to \a value.
-+
-+ \sa parameterNames()
-+*/
-+void QMetaMethodBuilder::setParameterNames(const QList<QByteArray>& value)
-+{
-+ QMetaMethodBuilderPrivate *d = d_func();
-+ if (d)
-+ d->parameterNames = value;
-+}
-+
-+/*!
-+ Returns the tag associated with this method.
-+
-+ \sa setTag()
-+*/
-+QByteArray QMetaMethodBuilder::tag() const
-+{
-+ QMetaMethodBuilderPrivate *d = d_func();
-+ if (d)
-+ return d->tag;
-+ else
-+ return QByteArray();
-+}
-+
-+/*!
-+ Sets the tag associated with this method to \a value.
-+
-+ \sa setTag()
-+*/
-+void QMetaMethodBuilder::setTag(const QByteArray& value)
-+{
-+ QMetaMethodBuilderPrivate *d = d_func();
-+ if (d)
-+ d->tag = value;
-+}
-+
-+/*!
-+ Returns the access specification of this method (private, protected,
-+ or public). The default value is QMetaMethod::Public for methods,
-+ slots, and constructors. The default value is QMetaMethod::Protected
-+ for signals.
-+
-+ \sa setAccess()
-+*/
-+QMetaMethod::Access QMetaMethodBuilder::access() const
-+{
-+ QMetaMethodBuilderPrivate *d = d_func();
-+ if (d)
-+ return d->access();
-+ else
-+ return QMetaMethod::Public;
-+}
-+
-+/*!
-+ Sets the access specification of this method (private, protected,
-+ or public) to \a value. If the method is a signal, this function
-+ will be ignored.
-+
-+ \sa access()
-+*/
-+void QMetaMethodBuilder::setAccess(QMetaMethod::Access value)
-+{
-+ QMetaMethodBuilderPrivate *d = d_func();
-+ if (d && d->methodType() != QMetaMethod::Signal)
-+ d->setAccess(value);
-+}
-+
-+/*!
-+ Returns the additional attributes for this method.
-+
-+ \sa setAttributes()
-+*/
-+int QMetaMethodBuilder::attributes() const
-+{
-+ QMetaMethodBuilderPrivate *d = d_func();
-+ if (d)
-+ return (d->attributes >> 4);
-+ else
-+ return 0;
-+}
-+
-+/*!
-+ Sets the additional attributes for this method to \a value.
-+
-+ \sa attributes()
-+*/
-+void QMetaMethodBuilder::setAttributes(int value)
-+{
-+ QMetaMethodBuilderPrivate *d = d_func();
-+ if (d)
-+ d->attributes = ((d->attributes & 0x0f) | (value << 4));
-+}
-+
-+/*!
-+ \class QMetaPropertyBuilder
-+ \internal
-+ \brief The QMetaPropertyBuilder class enables modifications to a property definition on a meta object builder.
-+*/
-+
-+QMetaPropertyBuilderPrivate *QMetaPropertyBuilder::d_func() const
-+{
-+ if (_mobj && _index >= 0 && _index < _mobj->d->properties.size())
-+ return &(_mobj->d->properties[_index]);
-+ else
-+ return 0;
-+}
-+
-+/*!
-+ \fn QMetaPropertyBuilder::QMetaPropertyBuilder()
-+ \internal
-+*/
-+
-+/*!
-+ \fn int QMetaPropertyBuilder::index() const
-+
-+ Returns the index of this property within its QMetaObjectBuilder.
-+*/
-+
-+/*!
-+ Returns the name associated with this property.
-+
-+ \sa type()
-+*/
-+QByteArray QMetaPropertyBuilder::name() const
-+{
-+ QMetaPropertyBuilderPrivate *d = d_func();
-+ if (d)
-+ return d->name;
-+ else
-+ return QByteArray();
-+}
-+
-+/*!
-+ Returns the type associated with this property.
-+
-+ \sa name()
-+*/
-+QByteArray QMetaPropertyBuilder::type() const
-+{
-+ QMetaPropertyBuilderPrivate *d = d_func();
-+ if (d)
-+ return d->type;
-+ else
-+ return QByteArray();
-+}
-+
-+/*!
-+ Returns true if this property has a notify signal; false otherwise.
-+
-+ \sa notifySignal(), setNotifySignal(), removeNotifySignal()
-+*/
-+bool QMetaPropertyBuilder::hasNotifySignal() const
-+{
-+ QMetaPropertyBuilderPrivate *d = d_func();
-+ if (d)
-+ return d->flag(Notify);
-+ else
-+ return false;
-+}
-+
-+/*!
-+ Returns the notify signal associated with this property.
-+
-+ \sa hasNotifySignal(), setNotifySignal(), removeNotifySignal()
-+*/
-+QMetaMethodBuilder QMetaPropertyBuilder::notifySignal() const
-+{
-+ QMetaPropertyBuilderPrivate *d = d_func();
-+ if (d && d->notifySignal >= 0)
-+ return QMetaMethodBuilder(_mobj, d->notifySignal);
-+ else
-+ return QMetaMethodBuilder();
-+}
-+
-+/*!
-+ Sets the notify signal associated with this property to \a value.
-+
-+ \sa hasNotifySignal(), notifySignal(), removeNotifySignal()
-+*/
-+void QMetaPropertyBuilder::setNotifySignal(const QMetaMethodBuilder& value)
-+{
-+ QMetaPropertyBuilderPrivate *d = d_func();
-+ if (d) {
-+ if (value._mobj) {
-+ d->notifySignal = value._index;
-+ d->setFlag(Notify, true);
-+ } else {
-+ d->notifySignal = -1;
-+ d->setFlag(Notify, false);
-+ }
-+ }
-+}
-+
-+/*!
-+ Removes the notify signal from this property.
-+
-+ \sa hasNotifySignal(), notifySignal(), setNotifySignal()
-+*/
-+void QMetaPropertyBuilder::removeNotifySignal()
-+{
-+ QMetaPropertyBuilderPrivate *d = d_func();
-+ if (d) {
-+ d->notifySignal = -1;
-+ d->setFlag(Notify, false);
-+ }
-+}
-+
-+/*!
-+ Returns true if this property is readable; otherwise returns false.
-+ The default value is true.
-+
-+ \sa setReadable(), isWritable()
-+*/
-+bool QMetaPropertyBuilder::isReadable() const
-+{
-+ QMetaPropertyBuilderPrivate *d = d_func();
-+ if (d)
-+ return d->flag(Readable);
-+ else
-+ return false;
-+}
-+
-+/*!
-+ Returns true if this property is writable; otherwise returns false.
-+ The default value is true.
-+
-+ \sa setWritable(), isReadable()
-+*/
-+bool QMetaPropertyBuilder::isWritable() const
-+{
-+ QMetaPropertyBuilderPrivate *d = d_func();
-+ if (d)
-+ return d->flag(Writable);
-+ else
-+ return false;
-+}
-+
-+/*!
-+ Returns true if this property can be reset to a default value; otherwise
-+ returns false. The default value is false.
-+
-+ \sa setResettable()
-+*/
-+bool QMetaPropertyBuilder::isResettable() const
-+{
-+ QMetaPropertyBuilderPrivate *d = d_func();
-+ if (d)
-+ return d->flag(Resettable);
-+ else
-+ return false;
-+}
-+
-+/*!
-+ Returns true if this property is designable; otherwise returns false.
-+ This default value is false.
-+
-+ \sa setDesignable(), isScriptable(), isStored()
-+*/
-+bool QMetaPropertyBuilder::isDesignable() const
-+{
-+ QMetaPropertyBuilderPrivate *d = d_func();
-+ if (d)
-+ return d->flag(Designable);
-+ else
-+ return false;
-+}
-+
-+/*!
-+ Returns true if the property is scriptable; otherwise returns false.
-+ This default value is true.
-+
-+ \sa setScriptable(), isDesignable(), isStored()
-+*/
-+bool QMetaPropertyBuilder::isScriptable() const
-+{
-+ QMetaPropertyBuilderPrivate *d = d_func();
-+ if (d)
-+ return d->flag(Scriptable);
-+ else
-+ return false;
-+}
-+
-+/*!
-+ Returns true if the property is stored; otherwise returns false.
-+ This default value is false.
-+
-+ \sa setStored(), isDesignable(), isScriptable()
-+*/
-+bool QMetaPropertyBuilder::isStored() const
-+{
-+ QMetaPropertyBuilderPrivate *d = d_func();
-+ if (d)
-+ return d->flag(Stored);
-+ else
-+ return false;
-+}
-+
-+/*!
-+ Returns true if the property is editable; otherwise returns false.
-+ This default value is false.
-+
-+ \sa setEditable(), isDesignable(), isScriptable(), isStored()
-+*/
-+bool QMetaPropertyBuilder::isEditable() const
-+{
-+ QMetaPropertyBuilderPrivate *d = d_func();
-+ if (d)
-+ return d->flag(Editable);
-+ else
-+ return false;
-+}
-+
-+/*!
-+ Returns true if this property is designated as the \c USER
-+ property, i.e., the one that the user can edit or that is
-+ significant in some other way. Otherwise it returns
-+ false. This default value is false.
-+
-+ \sa setUser(), isDesignable(), isScriptable()
-+*/
-+bool QMetaPropertyBuilder::isUser() const
-+{
-+ QMetaPropertyBuilderPrivate *d = d_func();
-+ if (d)
-+ return d->flag(User);
-+ else
-+ return false;
-+}
-+
-+/*!
-+ Returns true if the property has a C++ setter function that
-+ follows Qt's standard "name" / "setName" pattern. Designer and uic
-+ query hasStdCppSet() in order to avoid expensive
-+ QObject::setProperty() calls. All properties in Qt [should] follow
-+ this pattern. The default value is false.
-+
-+ \sa setStdCppSet()
-+*/
-+bool QMetaPropertyBuilder::hasStdCppSet() const
-+{
-+ QMetaPropertyBuilderPrivate *d = d_func();
-+ if (d)
-+ return d->flag(StdCppSet);
-+ else
-+ return false;
-+}
-+
-+/*!
-+ Returns true if the property is an enumerator or flag type;
-+ otherwise returns false. This default value is false.
-+
-+ \sa setEnumOrFlag()
-+*/
-+bool QMetaPropertyBuilder::isEnumOrFlag() const
-+{
-+ QMetaPropertyBuilderPrivate *d = d_func();
-+ if (d)
-+ return d->flag(EnumOrFlag);
-+ else
-+ return false;
-+}
-+
-+/*!
-+ Returns true if the property has the dynamic flag set;
-+ otherwise returns false. The default value is false.
-+
-+ \sa setDynamic()
-+*/
-+bool QMetaPropertyBuilder::isDynamic() const
-+{
-+ QMetaPropertyBuilderPrivate *d = d_func();
-+ if (d)
-+ return d->flag(Dynamic);
-+ else
-+ return false;
-+}
-+
-+/*!
-+ Sets this property to readable if \a value is true.
-+
-+ \sa isReadable(), setWritable()
-+*/
-+void QMetaPropertyBuilder::setReadable(bool value)
-+{
-+ QMetaPropertyBuilderPrivate *d = d_func();
-+ if (d)
-+ d->setFlag(Readable, value);
-+}
-+
-+/*!
-+ Sets this property to writable if \a value is true.
-+
-+ \sa isWritable(), setReadable()
-+*/
-+void QMetaPropertyBuilder::setWritable(bool value)
-+{
-+ QMetaPropertyBuilderPrivate *d = d_func();
-+ if (d)
-+ d->setFlag(Writable, value);
-+}
-+
-+/*!
-+ Sets this property to resettable if \a value is true.
-+
-+ \sa isResettable()
-+*/
-+void QMetaPropertyBuilder::setResettable(bool value)
-+{
-+ QMetaPropertyBuilderPrivate *d = d_func();
-+ if (d)
-+ d->setFlag(Resettable, value);
-+}
-+
-+/*!
-+ Sets this property to designable if \a value is true.
-+
-+ \sa isDesignable(), setScriptable(), setStored()
-+*/
-+void QMetaPropertyBuilder::setDesignable(bool value)
-+{
-+ QMetaPropertyBuilderPrivate *d = d_func();
-+ if (d)
-+ d->setFlag(Designable, value);
-+}
-+
-+/*!
-+ Sets this property to scriptable if \a value is true.
-+
-+ \sa isScriptable(), setDesignable(), setStored()
-+*/
-+void QMetaPropertyBuilder::setScriptable(bool value)
-+{
-+ QMetaPropertyBuilderPrivate *d = d_func();
-+ if (d)
-+ d->setFlag(Scriptable, value);
-+}
-+
-+/*!
-+ Sets this property to storable if \a value is true.
-+
-+ \sa isStored(), setDesignable(), setScriptable()
-+*/
-+void QMetaPropertyBuilder::setStored(bool value)
-+{
-+ QMetaPropertyBuilderPrivate *d = d_func();
-+ if (d)
-+ d->setFlag(Stored, value);
-+}
-+
-+/*!
-+ Sets this property to editable if \a value is true.
-+
-+ \sa isEditable(), setDesignable(), setScriptable(), setStored()
-+*/
-+void QMetaPropertyBuilder::setEditable(bool value)
-+{
-+ QMetaPropertyBuilderPrivate *d = d_func();
-+ if (d)
-+ d->setFlag(Editable, value);
-+}
-+
-+/*!
-+ Sets the \c USER flag on this property to \a value.
-+
-+ \sa isUser(), setDesignable(), setScriptable()
-+*/
-+void QMetaPropertyBuilder::setUser(bool value)
-+{
-+ QMetaPropertyBuilderPrivate *d = d_func();
-+ if (d)
-+ d->setFlag(User, value);
-+}
-+
-+/*!
-+ Sets the C++ setter flag on this property to \a value, which is
-+ true if the property has a C++ setter function that follows Qt's
-+ standard "name" / "setName" pattern.
-+
-+ \sa hasStdCppSet()
-+*/
-+void QMetaPropertyBuilder::setStdCppSet(bool value)
-+{
-+ QMetaPropertyBuilderPrivate *d = d_func();
-+ if (d)
-+ d->setFlag(StdCppSet, value);
-+}
-+
-+/*!
-+ Sets this property to be of an enumerator or flag type if
-+ \a value is true.
-+
-+ \sa isEnumOrFlag()
-+*/
-+void QMetaPropertyBuilder::setEnumOrFlag(bool value)
-+{
-+ QMetaPropertyBuilderPrivate *d = d_func();
-+ if (d)
-+ d->setFlag(EnumOrFlag, value);
-+}
-+
-+/*!
-+ Sets this property to have the dynamic flag if \a value is
-+ true.
-+
-+ \sa isDynamic()
-+*/
-+void QMetaPropertyBuilder::setDynamic(bool value)
-+{
-+ QMetaPropertyBuilderPrivate *d = d_func();
-+ if (d)
-+ d->setFlag(Dynamic, value);
-+}
-+
-+/*!
-+ \class QMetaEnumBuilder
-+ \internal
-+ \brief The QMetaEnumBuilder class enables modifications to an enumerator definition on a meta object builder.
-+*/
-+
-+QMetaEnumBuilderPrivate *QMetaEnumBuilder::d_func() const
-+{
-+ if (_mobj && _index >= 0 && _index < _mobj->d->enumerators.size())
-+ return &(_mobj->d->enumerators[_index]);
-+ else
-+ return 0;
-+}
-+
-+/*!
-+ \fn QMetaEnumBuilder::QMetaEnumBuilder()
-+ \internal
-+*/
-+
-+/*!
-+ \fn int QMetaEnumBuilder::index() const
-+
-+ Returns the index of this enumerator within its QMetaObjectBuilder.
-+*/
-+
-+/*!
-+ Returns the name of the enumerator (without the scope).
-+*/
-+QByteArray QMetaEnumBuilder::name() const
-+{
-+ QMetaEnumBuilderPrivate *d = d_func();
-+ if (d)
-+ return d->name;
-+ else
-+ return QByteArray();
-+}
-+
-+/*!
-+ Returns true if this enumerator is used as a flag; otherwise returns
-+ false.
-+
-+ \sa setIsFlag()
-+*/
-+bool QMetaEnumBuilder::isFlag() const
-+{
-+ QMetaEnumBuilderPrivate *d = d_func();
-+ if (d)
-+ return d->isFlag;
-+ else
-+ return false;
-+}
-+
-+/*!
-+ Sets this enumerator to be used as a flag if \a value is true.
-+
-+ \sa isFlag()
-+*/
-+void QMetaEnumBuilder::setIsFlag(bool value)
-+{
-+ QMetaEnumBuilderPrivate *d = d_func();
-+ if (d)
-+ d->isFlag = value;
-+}
-+
-+/*!
-+ Returns the number of keys.
-+
-+ \sa key(), addKey()
-+*/
-+int QMetaEnumBuilder::keyCount() const
-+{
-+ QMetaEnumBuilderPrivate *d = d_func();
-+ if (d)
-+ return d->keys.size();
-+ else
-+ return 0;
-+}
-+
-+/*!
-+ Returns the key with the given \a index, or an empty QByteArray
-+ if no such key exists.
-+
-+ \sa keyCount(), addKey(), value()
-+*/
-+QByteArray QMetaEnumBuilder::key(int index) const
-+{
-+ QMetaEnumBuilderPrivate *d = d_func();
-+ if (d && index >= 0 && index < d->keys.size())
-+ return d->keys[index];
-+ else
-+ return QByteArray();
-+}
-+
-+/*!
-+ Returns the value with the given \a index; or returns -1 if there
-+ is no such value.
-+
-+ \sa keyCount(), addKey(), key()
-+*/
-+int QMetaEnumBuilder::value(int index) const
-+{
-+ QMetaEnumBuilderPrivate *d = d_func();
-+ if (d && index >= 0 && index < d->keys.size())
-+ return d->values[index];
-+ else
-+ return -1;
-+}
-+
-+/*!
-+ Adds a new key called \a name to this enumerator, associated
-+ with \a value. Returns the index of the new key.
-+
-+ \sa keyCount(), key(), value(), removeKey()
-+*/
-+int QMetaEnumBuilder::addKey(const QByteArray& name, int value)
-+{
-+ QMetaEnumBuilderPrivate *d = d_func();
-+ if (d) {
-+ int index = d->keys.size();
-+ d->keys += name;
-+ d->values += value;
-+ return index;
-+ } else {
-+ return -1;
-+ }
-+}
-+
-+/*!
-+ Removes the key at \a index from this enumerator.
-+
-+ \sa addKey()
-+*/
-+void QMetaEnumBuilder::removeKey(int index)
-+{
-+ QMetaEnumBuilderPrivate *d = d_func();
-+ if (d && index >= 0 && index < d->keys.size()) {
-+ d->keys.removeAt(index);
-+ d->values.removeAt(index);
-+ }
-+}
-+
-+QTM_END_NAMESPACE
-diff --git a/src/serviceframework/ipc/qmetaobjectbuilder_47_p.h b/src/serviceframework/ipc/qmetaobjectbuilder_47_p.h
-new file mode 100644
-index 0000000..5f25e0f
---- /dev/null
-+++ b/src/serviceframework/ipc/qmetaobjectbuilder_47_p.h
-@@ -0,0 +1,338 @@
-+/****************************************************************************
-+**
-+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-+** All rights reserved.
-+** Contact: Nokia Corporation (qt-info@nokia.com)
-+**
-+** This file is part of the Qt Mobility Components.
-+**
-+** $QT_BEGIN_LICENSE:LGPL$
-+** No Commercial Usage
-+** This file contains pre-release code and may not be distributed.
-+** You may use this file in accordance with the terms and conditions
-+** contained in the Technology Preview License Agreement accompanying
-+** this package.
-+**
-+** GNU Lesser General Public License Usage
-+** Alternatively, this file may be used under the terms of the GNU Lesser
-+** General Public License version 2.1 as published by the Free Software
-+** Foundation and appearing in the file LICENSE.LGPL included in the
-+** packaging of this file. Please review the following information to
-+** ensure the GNU Lesser General Public License version 2.1 requirements
-+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-+**
-+** In addition, as a special exception, Nokia gives you certain additional
-+** rights. These rights are described in the Nokia Qt LGPL Exception
-+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-+**
-+** If you have questions regarding the use of this file, please contact
-+** Nokia at qt-info@nokia.com.
-+**
-+**
-+**
-+**
-+**
-+**
-+**
-+**
-+** $QT_END_LICENSE$
-+**
-+****************************************************************************/
-+
-+#ifndef QMETAOBJECTBUILDER_H
-+#define QMETAOBJECTBUILDER_H
-+
-+//
-+// W A R N I N G
-+// -------------
-+//
-+// This file is not part of the Qt API. It exists for the convenience
-+// of moc. This header file may change from version to version without notice,
-+// or even be removed.
-+//
-+// We mean it.
-+//
-+
-+#include <qmobilityglobal.h>
-+#include <QtCore/qobject.h>
-+#include <QtCore/qmetaobject.h>
-+#include <QtCore/qdatastream.h>
-+#include <QtCore/qmap.h>
-+
-+QTM_BEGIN_NAMESPACE
-+
-+class QMetaObjectBuilderPrivate;
-+class QMetaMethodBuilder;
-+class QMetaMethodBuilderPrivate;
-+class QMetaPropertyBuilder;
-+class QMetaPropertyBuilderPrivate;
-+class QMetaEnumBuilder;
-+class QMetaEnumBuilderPrivate;
-+
-+#ifdef IGNORE_METAOBJECTBUILDER_EXPORT
-+ class QMetaObjectBuilder
-+#else
-+ class QM_AUTOTEST_EXPORT QMetaObjectBuilder
-+#endif
-+{
-+public:
-+ enum AddMember
-+ {
-+ ClassName = 0x00000001,
-+ SuperClass = 0x00000002,
-+ Methods = 0x00000004,
-+ Signals = 0x00000008,
-+ Slots = 0x00000010,
-+ Constructors = 0x00000020,
-+ Properties = 0x00000040,
-+ Enumerators = 0x00000080,
-+ ClassInfos = 0x00000100,
-+ RelatedMetaObjects = 0x00000200,
-+ StaticMetacall = 0x00000400,
-+ PublicMethods = 0x00000800,
-+ ProtectedMethods = 0x00001000,
-+ PrivateMethods = 0x00002000,
-+ AllMembers = 0x7FFFFFFF,
-+ AllPrimaryMembers = 0x7FFFFBFC
-+ };
-+ Q_DECLARE_FLAGS(AddMembers, AddMember)
-+
-+ enum MetaObjectFlag {
-+ DynamicMetaObject = 0x01
-+ };
-+ Q_DECLARE_FLAGS(MetaObjectFlags, MetaObjectFlag)
-+
-+ QMetaObjectBuilder();
-+ explicit QMetaObjectBuilder(const QMetaObject *prototype, QMetaObjectBuilder::AddMembers members = AllMembers);
-+ virtual ~QMetaObjectBuilder();
-+
-+ QByteArray className() const;
-+ void setClassName(const QByteArray& name);
-+
-+ const QMetaObject *superClass() const;
-+ void setSuperClass(const QMetaObject *meta);
-+
-+ MetaObjectFlags flags() const;
-+ void setFlags(MetaObjectFlags);
-+
-+ int methodCount() const;
-+ int constructorCount() const;
-+ int propertyCount() const;
-+ int enumeratorCount() const;
-+ int classInfoCount() const;
-+ int relatedMetaObjectCount() const;
-+
-+ QMetaMethodBuilder addMethod(const QByteArray& signature);
-+ QMetaMethodBuilder addMethod(const QByteArray& signature, const QByteArray& returnType);
-+ QMetaMethodBuilder addMethod(const QMetaMethod& prototype);
-+
-+ QMetaMethodBuilder addSlot(const QByteArray& signature);
-+ QMetaMethodBuilder addSignal(const QByteArray& signature);
-+
-+ QMetaMethodBuilder addConstructor(const QByteArray& signature);
-+ QMetaMethodBuilder addConstructor(const QMetaMethod& prototype);
-+
-+ QMetaPropertyBuilder addProperty(const QByteArray& name, const QByteArray& type, int notifierId=-1);
-+ QMetaPropertyBuilder addProperty(const QMetaProperty& prototype);
-+
-+ QMetaEnumBuilder addEnumerator(const QByteArray& name);
-+ QMetaEnumBuilder addEnumerator(const QMetaEnum& prototype);
-+
-+ int addClassInfo(const QByteArray& name, const QByteArray& value);
-+
-+#ifdef Q_NO_DATA_RELOCATION
-+ int addRelatedMetaObject(const QMetaObjectAccessor &meta);
-+#else
-+ int addRelatedMetaObject(const QMetaObject *meta);
-+#endif
-+
-+ void addMetaObject(const QMetaObject *prototype, QMetaObjectBuilder::AddMembers members = AllMembers);
-+
-+ QMetaMethodBuilder method(int index) const;
-+ QMetaMethodBuilder constructor(int index) const;
-+ QMetaPropertyBuilder property(int index) const;
-+ QMetaEnumBuilder enumerator(int index) const;
-+ const QMetaObject *relatedMetaObject(int index) const;
-+
-+ QByteArray classInfoName(int index) const;
-+ QByteArray classInfoValue(int index) const;
-+
-+ void removeMethod(int index);
-+ void removeConstructor(int index);
-+ void removeProperty(int index);
-+ void removeEnumerator(int index);
-+ void removeClassInfo(int index);
-+ void removeRelatedMetaObject(int index);
-+
-+ int indexOfMethod(const QByteArray& signature);
-+ int indexOfSignal(const QByteArray& signature);
-+ int indexOfSlot(const QByteArray& signature);
-+ int indexOfConstructor(const QByteArray& signature);
-+ int indexOfProperty(const QByteArray& name);
-+ int indexOfEnumerator(const QByteArray& name);
-+ int indexOfClassInfo(const QByteArray& name);
-+
-+ typedef int (*StaticMetacallFunction)(QMetaObject::Call, int, void **);
-+
-+ QMetaObjectBuilder::StaticMetacallFunction staticMetacallFunction() const;
-+ void setStaticMetacallFunction(QMetaObjectBuilder::StaticMetacallFunction value);
-+
-+ QMetaObject *toMetaObject() const;
-+ QByteArray toRelocatableData(bool * = 0) const;
-+ static void fromRelocatableData(QMetaObject *, const QMetaObject *, const QByteArray &);
-+
-+#ifndef QT_NO_DATASTREAM
-+ void serialize(QDataStream& stream) const;
-+ void deserialize
-+ (QDataStream& stream,
-+ const QMap<QByteArray, const QMetaObject *>& references);
-+#endif
-+
-+private:
-+ Q_DISABLE_COPY(QMetaObjectBuilder)
-+
-+ QMetaObjectBuilderPrivate *d;
-+
-+ friend class QMetaMethodBuilder;
-+ friend class QMetaPropertyBuilder;
-+ friend class QMetaEnumBuilder;
-+};
-+
-+#ifdef IGNORE_METAOBJECTBUILDER_EXPORT
-+ class QMetaMethodBuilder
-+#else
-+ class QM_AUTOTEST_EXPORT QMetaMethodBuilder
-+#endif
-+{
-+public:
-+ QMetaMethodBuilder() : _mobj(0), _index(0) {}
-+
-+ int index() const;
-+
-+ QMetaMethod::MethodType methodType() const;
-+ QByteArray signature() const;
-+
-+ QByteArray returnType() const;
-+ void setReturnType(const QByteArray& value);
-+
-+ QList<QByteArray> parameterNames() const;
-+ void setParameterNames(const QList<QByteArray>& value);
-+
-+ QByteArray tag() const;
-+ void setTag(const QByteArray& value);
-+
-+ QMetaMethod::Access access() const;
-+ void setAccess(QMetaMethod::Access value);
-+
-+ int attributes() const;
-+ void setAttributes(int value);
-+
-+private:
-+ const QMetaObjectBuilder *_mobj;
-+ int _index;
-+
-+ friend class QMetaObjectBuilder;
-+ friend class QMetaPropertyBuilder;
-+
-+ QMetaMethodBuilder(const QMetaObjectBuilder *mobj, int index)
-+ : _mobj(mobj), _index(index) {}
-+
-+ QMetaMethodBuilderPrivate *d_func() const;
-+};
-+
-+#ifdef IGNORE_METAOBJECTBUILDER_EXPORT
-+ class QMetaPropertyBuilder
-+#else
-+ class QM_AUTOTEST_EXPORT QMetaPropertyBuilder
-+#endif
-+{
-+public:
-+ QMetaPropertyBuilder() : _mobj(0), _index(0) {}
-+
-+ int index() const { return _index; }
-+
-+ QByteArray name() const;
-+ QByteArray type() const;
-+
-+ bool hasNotifySignal() const;
-+ QMetaMethodBuilder notifySignal() const;
-+ void setNotifySignal(const QMetaMethodBuilder& value);
-+ void removeNotifySignal();
-+
-+ bool isReadable() const;
-+ bool isWritable() const;
-+ bool isResettable() const;
-+ bool isDesignable() const;
-+ bool isScriptable() const;
-+ bool isStored() const;
-+ bool isEditable() const;
-+ bool isUser() const;
-+ bool hasStdCppSet() const;
-+ bool isEnumOrFlag() const;
-+ bool isDynamic() const;
-+
-+ void setReadable(bool value);
-+ void setWritable(bool value);
-+ void setResettable(bool value);
-+ void setDesignable(bool value);
-+ void setScriptable(bool value);
-+ void setStored(bool value);
-+ void setEditable(bool value);
-+ void setUser(bool value);
-+ void setStdCppSet(bool value);
-+ void setEnumOrFlag(bool value);
-+ void setDynamic(bool value);
-+
-+private:
-+ const QMetaObjectBuilder *_mobj;
-+ int _index;
-+
-+ friend class QMetaObjectBuilder;
-+
-+ QMetaPropertyBuilder(const QMetaObjectBuilder *mobj, int index)
-+ : _mobj(mobj), _index(index) {}
-+
-+ QMetaPropertyBuilderPrivate *d_func() const;
-+};
-+
-+#ifdef IGNORE_METAOBJECTBUILDER_EXPORT
-+ class QMetaEnumBuilder
-+#else
-+ class QM_AUTOTEST_EXPORT QMetaEnumBuilder
-+#endif
-+{
-+public:
-+ QMetaEnumBuilder() : _mobj(0), _index(0) {}
-+
-+ int index() const { return _index; }
-+
-+ QByteArray name() const;
-+
-+ bool isFlag() const;
-+ void setIsFlag(bool value);
-+
-+ int keyCount() const;
-+ QByteArray key(int index) const;
-+ int value(int index) const;
-+
-+ int addKey(const QByteArray& name, int value);
-+ void removeKey(int index);
-+
-+private:
-+ const QMetaObjectBuilder *_mobj;
-+ int _index;
-+
-+ friend class QMetaObjectBuilder;
-+
-+ QMetaEnumBuilder(const QMetaObjectBuilder *mobj, int index)
-+ : _mobj(mobj), _index(index) {}
-+
-+ QMetaEnumBuilderPrivate *d_func() const;
-+};
-+
-+Q_DECLARE_OPERATORS_FOR_FLAGS(QMetaObjectBuilder::AddMembers)
-+Q_DECLARE_OPERATORS_FOR_FLAGS(QMetaObjectBuilder::MetaObjectFlags)
-+
-+QTM_END_NAMESPACE
-+
-+#endif
-diff --git a/src/serviceframework/ipc/qmetaobjectbuilder_p.h b/src/serviceframework/ipc/qmetaobjectbuilder_p.h
-index 5f25e0f..7f29ddc 100644
---- a/src/serviceframework/ipc/qmetaobjectbuilder_p.h
-+++ b/src/serviceframework/ipc/qmetaobjectbuilder_p.h
-@@ -69,6 +69,8 @@ class QMetaPropertyBuilderPrivate;
- class QMetaEnumBuilder;
- class QMetaEnumBuilderPrivate;
-
-+typedef const QMetaObject& (*QMetaObjectAccessor)();
-+
- #ifdef IGNORE_METAOBJECTBUILDER_EXPORT
- class QMetaObjectBuilder
- #else
-@@ -172,7 +174,7 @@ public:
- int indexOfEnumerator(const QByteArray& name);
- int indexOfClassInfo(const QByteArray& name);
-
-- typedef int (*StaticMetacallFunction)(QMetaObject::Call, int, void **);
-+ typedef QMetaObjectExtraData::StaticMetacallFunction StaticMetacallFunction;
-
- QMetaObjectBuilder::StaticMetacallFunction staticMetacallFunction() const;
- void setStaticMetacallFunction(QMetaObjectBuilder::StaticMetacallFunction value);
-@@ -269,7 +271,8 @@ public:
- bool isUser() const;
- bool hasStdCppSet() const;
- bool isEnumOrFlag() const;
-- bool isDynamic() const;
-+ bool isConstant() const;
-+ bool isFinal() const;
-
- void setReadable(bool value);
- void setWritable(bool value);
-@@ -281,7 +284,8 @@ public:
- void setUser(bool value);
- void setStdCppSet(bool value);
- void setEnumOrFlag(bool value);
-- void setDynamic(bool value);
-+ void setConstant(bool value);
-+ void setFinal(bool value);
-
- private:
- const QMetaObjectBuilder *_mobj;
-diff --git a/tests/auto/qmetaobjectbuilder/qmetaobjectbuilder.pro b/tests/auto/qmetaobjectbuilder/qmetaobjectbuilder.pro
-index 4cbc03a..fa6123b 100644
---- a/tests/auto/qmetaobjectbuilder/qmetaobjectbuilder.pro
-+++ b/tests/auto/qmetaobjectbuilder/qmetaobjectbuilder.pro
-@@ -9,7 +9,11 @@ QT = core
- include(../../../common.pri)
-
- # Input
--SOURCES += tst_qmetaobjectbuilder.cpp
-+contains(QT_MAJOR_VERSION, 4):lessThan(QT_MINOR_VERSION, 8) {
-+ SOURCES += tst_qmetaobjectbuilder_47.cpp
-+} else {
-+ SOURCES += tst_qmetaobjectbuilder.cpp
-+}
-
- CONFIG += mobility
- MOBILITY = serviceframework
-diff --git a/tests/auto/qmetaobjectbuilder/tst_qmetaobjectbuilder.cpp b/tests/auto/qmetaobjectbuilder/tst_qmetaobjectbuilder.cpp
-index 48ba43c..470d9e5 100644
---- a/tests/auto/qmetaobjectbuilder/tst_qmetaobjectbuilder.cpp
-+++ b/tests/auto/qmetaobjectbuilder/tst_qmetaobjectbuilder.cpp
-@@ -149,9 +149,9 @@ void tst_QMetaObjectBuilder::mocVersionCheck()
- // whenenver moc changes. Once QMetaObjectBuilder has been
- // updated, this test can be changed to check for the next version.
- int version = int(QObject::staticMetaObject.d.data[0]);
-- QVERIFY(version == 4 || version == 5);
-+ QVERIFY(version == 4 || version == 5 || version == 6);
- version = int(staticMetaObject.d.data[0]);
-- QVERIFY(version == 4 || version == 5);
-+ QVERIFY(version == 4 || version == 5 || version == 6);
- }
-
- void tst_QMetaObjectBuilder::create()
-@@ -555,7 +555,8 @@ void tst_QMetaObjectBuilder::property()
- QVERIFY(!nullProp.isUser());
- QVERIFY(!nullProp.hasStdCppSet());
- QVERIFY(!nullProp.isEnumOrFlag());
-- QVERIFY(!nullProp.isDynamic());
-+ QVERIFY(!nullProp.isConstant());
-+ QVERIFY(!nullProp.isFinal());
- QCOMPARE(nullProp.index(), 0);
-
- // Add a property and check its attributes.
-@@ -573,7 +574,8 @@ void tst_QMetaObjectBuilder::property()
- QVERIFY(!prop1.isUser());
- QVERIFY(!prop1.hasStdCppSet());
- QVERIFY(!prop1.isEnumOrFlag());
-- QVERIFY(!prop1.isDynamic());
-+ QVERIFY(!prop1.isConstant());
-+ QVERIFY(!prop1.isFinal());
- QCOMPARE(prop1.index(), 0);
- QCOMPARE(builder.propertyCount(), 1);
-
-@@ -592,7 +594,8 @@ void tst_QMetaObjectBuilder::property()
- QVERIFY(!prop2.isUser());
- QVERIFY(!prop2.hasStdCppSet());
- QVERIFY(!prop2.isEnumOrFlag());
-- QVERIFY(!prop2.isDynamic());
-+ QVERIFY(!prop2.isConstant());
-+ QVERIFY(!prop2.isFinal());
- QCOMPARE(prop2.index(), 1);
- QCOMPARE(builder.propertyCount(), 2);
-
-@@ -614,7 +617,8 @@ void tst_QMetaObjectBuilder::property()
- prop1.setUser(true);
- prop1.setStdCppSet(true);
- prop1.setEnumOrFlag(true);
-- prop1.setDynamic(true);
-+ prop1.setConstant(true);
-+ prop1.setFinal(true);
-
- // Check that prop1 is changed, but prop2 is not.
- QCOMPARE(prop1.name(), QByteArray("foo"));
-@@ -629,7 +633,8 @@ void tst_QMetaObjectBuilder::property()
- QVERIFY(prop1.isUser());
- QVERIFY(prop1.hasStdCppSet());
- QVERIFY(prop1.isEnumOrFlag());
-- QVERIFY(prop1.isDynamic());
-+ QVERIFY(prop1.isConstant());
-+ QVERIFY(prop1.isFinal());
- QVERIFY(prop2.isReadable());
- QVERIFY(prop2.isWritable());
- QCOMPARE(prop2.name(), QByteArray("bar"));
-@@ -642,7 +647,8 @@ void tst_QMetaObjectBuilder::property()
- QVERIFY(!prop2.isUser());
- QVERIFY(!prop2.hasStdCppSet());
- QVERIFY(!prop2.isEnumOrFlag());
-- QVERIFY(!prop2.isDynamic());
-+ QVERIFY(!prop2.isConstant());
-+ QVERIFY(!prop2.isFinal());
-
- // Remove prop1 and check that prop2 becomes index 0.
- builder.removeProperty(0);
-@@ -658,7 +664,8 @@ void tst_QMetaObjectBuilder::property()
- QVERIFY(!prop2.isUser());
- QVERIFY(!prop2.hasStdCppSet());
- QVERIFY(!prop2.isEnumOrFlag());
-- QVERIFY(!prop2.isDynamic());
-+ QVERIFY(!prop2.isConstant());
-+ QVERIFY(!prop2.isFinal());
- QCOMPARE(prop2.index(), 0);
-
- // Perform index-based lookup again.
-@@ -682,7 +689,8 @@ void tst_QMetaObjectBuilder::property()
- prop2.setUser(false); \
- prop2.setStdCppSet(false); \
- prop2.setEnumOrFlag(false); \
-- prop2.setDynamic(false); \
-+ prop2.setConstant(false); \
-+ prop2.setFinal(false); \
- } while (0)
- #define COUNT_FLAGS() \
- ((prop2.isReadable() ? 1 : 0) + \
-@@ -695,7 +703,8 @@ void tst_QMetaObjectBuilder::property()
- (prop2.isUser() ? 1 : 0) + \
- (prop2.hasStdCppSet() ? 1 : 0) + \
- (prop2.isEnumOrFlag() ? 1 : 0) + \
-- (prop2.isDynamic() ? 1 : 0))
-+ (prop2.isConstant() ? 1 : 0) + \
-+ (prop2.isFinal() ? 1 : 0))
- #define CHECK_FLAG(setFunc,isFunc) \
- do { \
- CLEAR_FLAGS(); \
-@@ -714,7 +723,8 @@ void tst_QMetaObjectBuilder::property()
- CHECK_FLAG(setUser, isUser);
- CHECK_FLAG(setStdCppSet, hasStdCppSet);
- CHECK_FLAG(setEnumOrFlag, isEnumOrFlag);
-- CHECK_FLAG(setDynamic, isDynamic);
-+ CHECK_FLAG(setConstant, isConstant);
-+ CHECK_FLAG(setFinal, isFinal);
-
- // Check that nothing else changed.
- QVERIFY(checkForSideEffects(builder, QMetaObjectBuilder::Properties));
-@@ -958,9 +968,9 @@ void tst_QMetaObjectBuilder::relatedMetaObject()
- QVERIFY(checkForSideEffects(builder, QMetaObjectBuilder::RelatedMetaObjects));
- }
-
--static int smetacall(QMetaObject::Call, int, void **)
-+static void smetacall(QObject *, QMetaObject::Call, int, void **)
- {
-- return 0;
-+ return;
- }
-
- void tst_QMetaObjectBuilder::staticMetacall()
-@@ -1263,8 +1273,8 @@ bool tst_QMetaObjectBuilder::sameMetaObject
- if (extra1 && extra2) {
- if (extra1->static_metacall != extra2->static_metacall)
- return false;
-- //objects1 = extra1->objects;
-- //objects2 = extra1->objects;
-+ objects1 = extra1->objects;
-+ objects2 = extra1->objects;
- }
- } else if (meta1->d.data[0] == meta2->d.data[0] && meta1->d.data[0] == 1) {
- objects1 = (const QMetaObject **)(meta1->d.extradata);
-diff --git a/tests/auto/qmetaobjectbuilder/tst_qmetaobjectbuilder_47.cpp b/tests/auto/qmetaobjectbuilder/tst_qmetaobjectbuilder_47.cpp
-new file mode 100644
-index 0000000..96a7eca
---- /dev/null
-+++ b/tests/auto/qmetaobjectbuilder/tst_qmetaobjectbuilder_47.cpp
-@@ -0,0 +1,1283 @@
-+/****************************************************************************
-+**
-+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-+** All rights reserved.
-+** Contact: Nokia Corporation (qt-info@nokia.com)
-+**
-+** This file is part of the test suite of the Qt Toolkit.
-+**
-+** $QT_BEGIN_LICENSE:LGPL$
-+** No Commercial Usage
-+** This file contains pre-release code and may not be distributed.
-+** You may use this file in accordance with the terms and conditions
-+** contained in the Technology Preview License Agreement accompanying
-+** this package.
-+**
-+** GNU Lesser General Public License Usage
-+** Alternatively, this file may be used under the terms of the GNU Lesser
-+** General Public License version 2.1 as published by the Free Software
-+** Foundation and appearing in the file LICENSE.LGPL included in the
-+** packaging of this file. Please review the following information to
-+** ensure the GNU Lesser General Public License version 2.1 requirements
-+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-+**
-+** In addition, as a special exception, Nokia gives you certain additional
-+** rights. These rights are described in the Nokia Qt LGPL Exception
-+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-+**
-+** If you have questions regarding the use of this file, please contact
-+** Nokia at qt-info@nokia.com.
-+**
-+**
-+**
-+**
-+**
-+**
-+**
-+**
-+** $QT_END_LICENSE$
-+**
-+****************************************************************************/
-+
-+//TESTED_COMPONENT=src/serviceframework
-+
-+#include <qmobilityglobal.h>
-+#include <QtTest/QtTest>
-+#include <QtCore/qlocale.h>
-+#include <qmetaobjectbuilder_47_p.h>
-+
-+QTM_USE_NAMESPACE
-+
-+class tst_QMetaObjectBuilder : public QObject
-+{
-+ Q_OBJECT
-+public:
-+ tst_QMetaObjectBuilder() {}
-+ ~tst_QMetaObjectBuilder() {}
-+
-+private slots:
-+ void mocVersionCheck();
-+ void create();
-+ void className();
-+ void superClass();
-+ void flags();
-+ void method();
-+ void slot();
-+ void signal();
-+ void constructor();
-+ void property();
-+ void notifySignal();
-+ void enumerator();
-+ void classInfo();
-+ void relatedMetaObject();
-+ void staticMetacall();
-+ void copyMetaObject();
-+ void serialize();
-+ void removeNotifySignal();
-+
-+private:
-+ static bool checkForSideEffects
-+ (const QMetaObjectBuilder& builder,
-+ QMetaObjectBuilder::AddMembers members);
-+ static bool sameMetaObject
-+ (const QMetaObject *meta1, const QMetaObject *meta2);
-+};
-+
-+#ifdef Q_NO_DATA_RELOCATION
-+const QMetaObject *meta;
-+#endif
-+
-+// Dummy class that has something of every type of thing moc can generate.
-+class SomethingOfEverything : public QObject
-+{
-+ Q_OBJECT
-+ Q_CLASSINFO("ci_foo", "ABC")
-+ Q_CLASSINFO("ci_bar", "DEF")
-+ Q_PROPERTY(QString prop READ prop WRITE setProp NOTIFY propChanged)
-+ Q_PROPERTY(QString prop2 READ prop WRITE setProp)
-+ Q_PROPERTY(SomethingEnum eprop READ eprop)
-+ Q_PROPERTY(SomethingFlagEnum fprop READ fprop)
-+ Q_PROPERTY(QLocale::Language language READ language)
-+ Q_ENUMS(SomethingEnum)
-+ Q_FLAGS(SomethingFlagEnum)
-+public:
-+ Q_INVOKABLE SomethingOfEverything() {}
-+ ~SomethingOfEverything() {}
-+
-+ enum SomethingEnum
-+ {
-+ GHI,
-+ JKL = 10
-+ };
-+
-+ enum SomethingFlagEnum
-+ {
-+ XYZ = 1,
-+ UVW = 8
-+ };
-+
-+ Q_INVOKABLE Q_SCRIPTABLE void method1() {}
-+
-+ QString prop() const { return QString(); }
-+ void setProp(const QString& v) { Q_UNUSED(v); }
-+
-+ SomethingOfEverything::SomethingEnum eprop() const { return GHI; }
-+ SomethingOfEverything::SomethingFlagEnum fprop() const { return XYZ; }
-+ QLocale::Language language() const { return QLocale::English; }
-+
-+public slots:
-+ void slot1(const QString&) {}
-+ void slot2(int, const QString&) {}
-+
-+private slots:
-+ void slot3() {}
-+
-+protected slots:
-+ Q_SCRIPTABLE void slot4(int) {}
-+ void slot5(int a, const QString& b) { Q_UNUSED(a); Q_UNUSED(b); }
-+
-+signals:
-+ void sig1();
-+ void sig2(int x, const QString& y);
-+ void propChanged(const QString&);
-+};
-+
-+void tst_QMetaObjectBuilder::mocVersionCheck()
-+{
-+ // This test will fail when the moc version number is changed.
-+ // It is intended as a reminder to also update QMetaObjectBuilder
-+ // whenenver moc changes. Once QMetaObjectBuilder has been
-+ // updated, this test can be changed to check for the next version.
-+ int version = int(QObject::staticMetaObject.d.data[0]);
-+ QVERIFY(version == 4 || version == 5 || version == 6);
-+ version = int(staticMetaObject.d.data[0]);
-+ QVERIFY(version == 4 || version == 5 || version == 6);
-+}
-+
-+void tst_QMetaObjectBuilder::create()
-+{
-+ QMetaObjectBuilder builder;
-+ QVERIFY(builder.className().isEmpty());
-+ QVERIFY(builder.superClass() == &QObject::staticMetaObject);
-+ QCOMPARE(builder.methodCount(), 0);
-+ QCOMPARE(builder.constructorCount(), 0);
-+ QCOMPARE(builder.propertyCount(), 0);
-+ QCOMPARE(builder.enumeratorCount(), 0);
-+ QCOMPARE(builder.classInfoCount(), 0);
-+ QCOMPARE(builder.relatedMetaObjectCount(), 0);
-+ QVERIFY(builder.staticMetacallFunction() == 0);
-+}
-+
-+void tst_QMetaObjectBuilder::className()
-+{
-+ QMetaObjectBuilder builder;
-+
-+ // Change the class name.
-+ builder.setClassName("Foo");
-+ QCOMPARE(builder.className(), QByteArray("Foo"));
-+
-+ // Change it again.
-+ builder.setClassName("Bar");
-+ QCOMPARE(builder.className(), QByteArray("Bar"));
-+
-+ // Clone the class name off a static QMetaObject.
-+ builder.addMetaObject(&QObject::staticMetaObject, QMetaObjectBuilder::ClassName);
-+ QCOMPARE(builder.className(), QByteArray("QObject"));
-+
-+ // Check that nothing else changed.
-+ QVERIFY(checkForSideEffects(builder, QMetaObjectBuilder::ClassName));
-+}
-+
-+void tst_QMetaObjectBuilder::superClass()
-+{
-+ QMetaObjectBuilder builder;
-+
-+ // Change the super class.
-+ builder.setSuperClass(&QObject::staticMetaObject);
-+ QVERIFY(builder.superClass() == &QObject::staticMetaObject);
-+
-+ // Change it again.
-+ builder.setSuperClass(&staticMetaObject);
-+ QVERIFY(builder.superClass() == &staticMetaObject);
-+
-+ // Clone the super class off a static QMetaObject.
-+ builder.addMetaObject(&QObject::staticMetaObject, QMetaObjectBuilder::SuperClass);
-+ QVERIFY(builder.superClass() == 0);
-+ builder.addMetaObject(&staticMetaObject, QMetaObjectBuilder::SuperClass);
-+ QVERIFY(builder.superClass() == staticMetaObject.superClass());
-+
-+ // Check that nothing else changed.
-+ QVERIFY(checkForSideEffects(builder, QMetaObjectBuilder::SuperClass));
-+}
-+
-+void tst_QMetaObjectBuilder::flags()
-+{
-+ QMetaObjectBuilder builder;
-+
-+ // Check default
-+ QVERIFY(builder.flags() == 0);
-+
-+ // Set flags
-+ builder.setFlags(QMetaObjectBuilder::DynamicMetaObject);
-+ QVERIFY(builder.flags() == QMetaObjectBuilder::DynamicMetaObject);
-+}
-+
-+void tst_QMetaObjectBuilder::method()
-+{
-+ QMetaObjectBuilder builder;
-+
-+ // Check null method
-+ QMetaMethodBuilder nullMethod;
-+ QCOMPARE(nullMethod.signature(), QByteArray());
-+ QVERIFY(nullMethod.methodType() == QMetaMethod::Method);
-+ QVERIFY(nullMethod.returnType().isEmpty());
-+ QVERIFY(nullMethod.parameterNames().isEmpty());
-+ QVERIFY(nullMethod.tag().isEmpty());
-+ QVERIFY(nullMethod.access() == QMetaMethod::Public);
-+ QCOMPARE(nullMethod.attributes(), 0);
-+ QCOMPARE(nullMethod.index(), 0);
-+
-+ // Add a method and check its attributes.
-+ QMetaMethodBuilder method1 = builder.addMethod("foo(const QString&, int)");
-+ QCOMPARE(method1.signature(), QByteArray("foo(QString,int)"));
-+ QVERIFY(method1.methodType() == QMetaMethod::Method);
-+ QVERIFY(method1.returnType().isEmpty());
-+ QVERIFY(method1.parameterNames().isEmpty());
-+ QVERIFY(method1.tag().isEmpty());
-+ QVERIFY(method1.access() == QMetaMethod::Public);
-+ QCOMPARE(method1.attributes(), 0);
-+ QCOMPARE(method1.index(), 0);
-+ QCOMPARE(builder.methodCount(), 1);
-+
-+ // Add another method and check again.
-+ QMetaMethodBuilder method2 = builder.addMethod("bar(QString)", "int");
-+ QCOMPARE(method2.signature(), QByteArray("bar(QString)"));
-+ QVERIFY(method2.methodType() == QMetaMethod::Method);
-+ QCOMPARE(method2.returnType(), QByteArray("int"));
-+ QVERIFY(method2.parameterNames().isEmpty());
-+ QVERIFY(method2.tag().isEmpty());
-+ QVERIFY(method2.access() == QMetaMethod::Public);
-+ QCOMPARE(method2.attributes(), 0);
-+ QCOMPARE(method2.index(), 1);
-+ QCOMPARE(builder.methodCount(), 2);
-+
-+ // Perform index-based lookup.
-+ QCOMPARE(builder.indexOfMethod("foo(const QString&, int)"), 0);
-+ QCOMPARE(builder.indexOfMethod("bar(QString)"), 1);
-+ QCOMPARE(builder.indexOfMethod("baz()"), -1);
-+
-+ // Modify the attributes on method1.
-+ method1.setReturnType("int");
-+ method1.setParameterNames(QList<QByteArray>() << "a" << "b");
-+ method1.setTag("tag");
-+ method1.setAccess(QMetaMethod::Private);
-+ method1.setAttributes(42);
-+
-+ // Check that method1 is changed, but method2 is not.
-+ QCOMPARE(method1.signature(), QByteArray("foo(QString,int)"));
-+ QVERIFY(method1.methodType() == QMetaMethod::Method);
-+ QCOMPARE(method1.returnType(), QByteArray("int"));
-+ QCOMPARE(method1.parameterNames(), QList<QByteArray>() << "a" << "b");
-+ QCOMPARE(method1.tag(), QByteArray("tag"));
-+ QVERIFY(method1.access() == QMetaMethod::Private);
-+ QCOMPARE(method1.attributes(), 42);
-+ QCOMPARE(method1.index(), 0);
-+ QCOMPARE(method2.signature(), QByteArray("bar(QString)"));
-+ QVERIFY(method2.methodType() == QMetaMethod::Method);
-+ QCOMPARE(method2.returnType(), QByteArray("int"));
-+ QVERIFY(method2.parameterNames().isEmpty());
-+ QVERIFY(method2.tag().isEmpty());
-+ QVERIFY(method2.access() == QMetaMethod::Public);
-+ QCOMPARE(method2.attributes(), 0);
-+ QCOMPARE(method2.index(), 1);
-+ QCOMPARE(builder.methodCount(), 2);
-+
-+ // Modify the attributes on method2.
-+ method2.setReturnType("QString");
-+ method2.setParameterNames(QList<QByteArray>() << "c");
-+ method2.setTag("Q_FOO");
-+ method2.setAccess(QMetaMethod::Protected);
-+ method2.setAttributes(24);
-+
-+ // This time check that only method2 changed.
-+ QCOMPARE(method1.signature(), QByteArray("foo(QString,int)"));
-+ QVERIFY(method1.methodType() == QMetaMethod::Method);
-+ QCOMPARE(method1.returnType(), QByteArray("int"));
-+ QCOMPARE(method1.parameterNames(), QList<QByteArray>() << "a" << "b");
-+ QCOMPARE(method1.tag(), QByteArray("tag"));
-+ QVERIFY(method1.access() == QMetaMethod::Private);
-+ QCOMPARE(method1.attributes(), 42);
-+ QCOMPARE(method1.index(), 0);
-+ QCOMPARE(method2.signature(), QByteArray("bar(QString)"));
-+ QVERIFY(method2.methodType() == QMetaMethod::Method);
-+ QCOMPARE(method2.returnType(), QByteArray("QString"));
-+ QCOMPARE(method2.parameterNames(), QList<QByteArray>() << "c");
-+ QCOMPARE(method2.tag(), QByteArray("Q_FOO"));
-+ QVERIFY(method2.access() == QMetaMethod::Protected);
-+ QCOMPARE(method2.attributes(), 24);
-+ QCOMPARE(method2.index(), 1);
-+ QCOMPARE(builder.methodCount(), 2);
-+
-+ // Remove method1 and check that method2 becomes index 0.
-+ builder.removeMethod(0);
-+ QCOMPARE(builder.methodCount(), 1);
-+ method2 = builder.method(0);
-+ QCOMPARE(method2.signature(), QByteArray("bar(QString)"));
-+ QVERIFY(method2.methodType() == QMetaMethod::Method);
-+ QCOMPARE(method2.returnType(), QByteArray("QString"));
-+ QCOMPARE(method2.parameterNames(), QList<QByteArray>() << "c");
-+ QCOMPARE(method2.tag(), QByteArray("Q_FOO"));
-+ QVERIFY(method2.access() == QMetaMethod::Protected);
-+ QCOMPARE(method2.attributes(), 24);
-+ QCOMPARE(method2.index(), 0);
-+
-+ // Perform index-based lookup again.
-+ QCOMPARE(builder.indexOfMethod("foo(const QString&, int)"), -1);
-+ QCOMPARE(builder.indexOfMethod("bar(QString)"), 0);
-+ QCOMPARE(builder.indexOfMethod("baz()"), -1);
-+ QCOMPARE(builder.method(0).signature(), QByteArray("bar(QString)"));
-+ QCOMPARE(builder.method(9).signature(), QByteArray());
-+
-+ // Check that nothing else changed.
-+ QVERIFY(checkForSideEffects(builder, QMetaObjectBuilder::Methods));
-+}
-+
-+void tst_QMetaObjectBuilder::slot()
-+{
-+ QMetaObjectBuilder builder;
-+
-+ // Add a slot and check its attributes.
-+ QMetaMethodBuilder method1 = builder.addSlot("foo(const QString&, int)");
-+ QCOMPARE(method1.signature(), QByteArray("foo(QString,int)"));
-+ QVERIFY(method1.methodType() == QMetaMethod::Slot);
-+ QVERIFY(method1.returnType().isEmpty());
-+ QVERIFY(method1.parameterNames().isEmpty());
-+ QVERIFY(method1.tag().isEmpty());
-+ QVERIFY(method1.access() == QMetaMethod::Public);
-+ QCOMPARE(method1.attributes(), 0);
-+ QCOMPARE(method1.index(), 0);
-+ QCOMPARE(builder.methodCount(), 1);
-+
-+ // Add another slot and check again.
-+ QMetaMethodBuilder method2 = builder.addSlot("bar(QString)");
-+ QCOMPARE(method2.signature(), QByteArray("bar(QString)"));
-+ QVERIFY(method2.methodType() == QMetaMethod::Slot);
-+ QVERIFY(method2.returnType().isEmpty());
-+ QVERIFY(method2.parameterNames().isEmpty());
-+ QVERIFY(method2.tag().isEmpty());
-+ QVERIFY(method2.access() == QMetaMethod::Public);
-+ QCOMPARE(method2.attributes(), 0);
-+ QCOMPARE(method2.index(), 1);
-+ QCOMPARE(builder.methodCount(), 2);
-+
-+ // Perform index-based lookup
-+ QCOMPARE(builder.indexOfSlot("foo(const QString &, int)"), 0);
-+ QCOMPARE(builder.indexOfSlot("bar(QString)"), 1);
-+ QCOMPARE(builder.indexOfSlot("baz()"), -1);
-+
-+ // Check that nothing else changed.
-+ QVERIFY(checkForSideEffects(builder, QMetaObjectBuilder::Methods));
-+}
-+
-+void tst_QMetaObjectBuilder::signal()
-+{
-+ QMetaObjectBuilder builder;
-+
-+ // Add a signal and check its attributes.
-+ QMetaMethodBuilder method1 = builder.addSignal("foo(const QString&, int)");
-+ QCOMPARE(method1.signature(), QByteArray("foo(QString,int)"));
-+ QVERIFY(method1.methodType() == QMetaMethod::Signal);
-+ QVERIFY(method1.returnType().isEmpty());
-+ QVERIFY(method1.parameterNames().isEmpty());
-+ QVERIFY(method1.tag().isEmpty());
-+ QVERIFY(method1.access() == QMetaMethod::Protected);
-+ QCOMPARE(method1.attributes(), 0);
-+ QCOMPARE(method1.index(), 0);
-+ QCOMPARE(builder.methodCount(), 1);
-+
-+ // Add another signal and check again.
-+ QMetaMethodBuilder method2 = builder.addSignal("bar(QString)");
-+ QCOMPARE(method2.signature(), QByteArray("bar(QString)"));
-+ QVERIFY(method2.methodType() == QMetaMethod::Signal);
-+ QVERIFY(method2.returnType().isEmpty());
-+ QVERIFY(method2.parameterNames().isEmpty());
-+ QVERIFY(method2.tag().isEmpty());
-+ QVERIFY(method2.access() == QMetaMethod::Protected);
-+ QCOMPARE(method2.attributes(), 0);
-+ QCOMPARE(method2.index(), 1);
-+ QCOMPARE(builder.methodCount(), 2);
-+
-+ // Perform index-based lookup
-+ QCOMPARE(builder.indexOfSignal("foo(const QString &, int)"), 0);
-+ QCOMPARE(builder.indexOfSignal("bar(QString)"), 1);
-+ QCOMPARE(builder.indexOfSignal("baz()"), -1);
-+
-+ // Check that nothing else changed.
-+ QVERIFY(checkForSideEffects(builder, QMetaObjectBuilder::Methods));
-+}
-+
-+void tst_QMetaObjectBuilder::constructor()
-+{
-+ QMetaObjectBuilder builder;
-+
-+ // Add a constructor and check its attributes.
-+ QMetaMethodBuilder ctor1 = builder.addConstructor("foo(const QString&, int)");
-+ QCOMPARE(ctor1.signature(), QByteArray("foo(QString,int)"));
-+ QVERIFY(ctor1.methodType() == QMetaMethod::Constructor);
-+ QVERIFY(ctor1.returnType().isEmpty());
-+ QVERIFY(ctor1.parameterNames().isEmpty());
-+ QVERIFY(ctor1.tag().isEmpty());
-+ QVERIFY(ctor1.access() == QMetaMethod::Public);
-+ QCOMPARE(ctor1.attributes(), 0);
-+ QCOMPARE(ctor1.index(), 0);
-+ QCOMPARE(builder.constructorCount(), 1);
-+
-+ // Add another constructor and check again.
-+ QMetaMethodBuilder ctor2 = builder.addConstructor("bar(QString)");
-+ QCOMPARE(ctor2.signature(), QByteArray("bar(QString)"));
-+ QVERIFY(ctor2.methodType() == QMetaMethod::Constructor);
-+ QVERIFY(ctor2.returnType().isEmpty());
-+ QVERIFY(ctor2.parameterNames().isEmpty());
-+ QVERIFY(ctor2.tag().isEmpty());
-+ QVERIFY(ctor2.access() == QMetaMethod::Public);
-+ QCOMPARE(ctor2.attributes(), 0);
-+ QCOMPARE(ctor2.index(), 1);
-+ QCOMPARE(builder.constructorCount(), 2);
-+
-+ // Perform index-based lookup.
-+ QCOMPARE(builder.indexOfConstructor("foo(const QString&, int)"), 0);
-+ QCOMPARE(builder.indexOfConstructor("bar(QString)"), 1);
-+ QCOMPARE(builder.indexOfConstructor("baz()"), -1);
-+ QCOMPARE(builder.constructor(1).signature(), QByteArray("bar(QString)"));
-+ QCOMPARE(builder.constructor(9).signature(), QByteArray());
-+
-+ // Modify the attributes on ctor1.
-+ ctor1.setReturnType("int");
-+ ctor1.setParameterNames(QList<QByteArray>() << "a" << "b");
-+ ctor1.setTag("tag");
-+ ctor1.setAccess(QMetaMethod::Private);
-+ ctor1.setAttributes(42);
-+
-+ // Check that ctor1 is changed, but ctor2 is not.
-+ QCOMPARE(ctor1.signature(), QByteArray("foo(QString,int)"));
-+ QVERIFY(ctor1.methodType() == QMetaMethod::Constructor);
-+ QCOMPARE(ctor1.returnType(), QByteArray("int"));
-+ QCOMPARE(ctor1.parameterNames(), QList<QByteArray>() << "a" << "b");
-+ QCOMPARE(ctor1.tag(), QByteArray("tag"));
-+ QVERIFY(ctor1.access() == QMetaMethod::Private);
-+ QCOMPARE(ctor1.attributes(), 42);
-+ QCOMPARE(ctor1.index(), 0);
-+ QCOMPARE(ctor2.signature(), QByteArray("bar(QString)"));
-+ QVERIFY(ctor2.methodType() == QMetaMethod::Constructor);
-+ QVERIFY(ctor2.returnType().isEmpty());
-+ QVERIFY(ctor2.parameterNames().isEmpty());
-+ QVERIFY(ctor2.tag().isEmpty());
-+ QVERIFY(ctor2.access() == QMetaMethod::Public);
-+ QCOMPARE(ctor2.attributes(), 0);
-+ QCOMPARE(ctor2.index(), 1);
-+ QCOMPARE(builder.constructorCount(), 2);
-+
-+ // Modify the attributes on ctor2.
-+ ctor2.setReturnType("QString");
-+ ctor2.setParameterNames(QList<QByteArray>() << "c");
-+ ctor2.setTag("Q_FOO");
-+ ctor2.setAccess(QMetaMethod::Protected);
-+ ctor2.setAttributes(24);
-+
-+ // This time check that only ctor2 changed.
-+ QCOMPARE(ctor1.signature(), QByteArray("foo(QString,int)"));
-+ QVERIFY(ctor1.methodType() == QMetaMethod::Constructor);
-+ QCOMPARE(ctor1.returnType(), QByteArray("int"));
-+ QCOMPARE(ctor1.parameterNames(), QList<QByteArray>() << "a" << "b");
-+ QCOMPARE(ctor1.tag(), QByteArray("tag"));
-+ QVERIFY(ctor1.access() == QMetaMethod::Private);
-+ QCOMPARE(ctor1.attributes(), 42);
-+ QCOMPARE(ctor1.index(), 0);
-+ QCOMPARE(ctor2.signature(), QByteArray("bar(QString)"));
-+ QVERIFY(ctor2.methodType() == QMetaMethod::Constructor);
-+ QCOMPARE(ctor2.returnType(), QByteArray("QString"));
-+ QCOMPARE(ctor2.parameterNames(), QList<QByteArray>() << "c");
-+ QCOMPARE(ctor2.tag(), QByteArray("Q_FOO"));
-+ QVERIFY(ctor2.access() == QMetaMethod::Protected);
-+ QCOMPARE(ctor2.attributes(), 24);
-+ QCOMPARE(ctor2.index(), 1);
-+ QCOMPARE(builder.constructorCount(), 2);
-+
-+ // Remove ctor1 and check that ctor2 becomes index 0.
-+ builder.removeConstructor(0);
-+ QCOMPARE(builder.constructorCount(), 1);
-+ ctor2 = builder.constructor(0);
-+ QCOMPARE(ctor2.signature(), QByteArray("bar(QString)"));
-+ QVERIFY(ctor2.methodType() == QMetaMethod::Constructor);
-+ QCOMPARE(ctor2.returnType(), QByteArray("QString"));
-+ QCOMPARE(ctor2.parameterNames(), QList<QByteArray>() << "c");
-+ QCOMPARE(ctor2.tag(), QByteArray("Q_FOO"));
-+ QVERIFY(ctor2.access() == QMetaMethod::Protected);
-+ QCOMPARE(ctor2.attributes(), 24);
-+ QCOMPARE(ctor2.index(), 0);
-+
-+ // Perform index-based lookup again.
-+ QCOMPARE(builder.indexOfConstructor("foo(const QString&, int)"), -1);
-+ QCOMPARE(builder.indexOfConstructor("bar(QString)"), 0);
-+ QCOMPARE(builder.indexOfConstructor("baz()"), -1);
-+
-+ // Add constructor from prototype
-+ QMetaMethod prototype = SomethingOfEverything::staticMetaObject.constructor(0);
-+ QMetaMethodBuilder prototypeConstructor = builder.addMethod(prototype);
-+ QCOMPARE(builder.constructorCount(), 2);
-+
-+ QCOMPARE(prototypeConstructor.signature(), QByteArray("SomethingOfEverything()"));
-+ QVERIFY(prototypeConstructor.methodType() == QMetaMethod::Constructor);
-+ QCOMPARE(prototypeConstructor.returnType(), QByteArray());
-+ QVERIFY(prototypeConstructor.access() == QMetaMethod::Public);
-+ QCOMPARE(prototypeConstructor.index(), 1);
-+
-+ // Check that nothing else changed.
-+ QVERIFY(checkForSideEffects(builder, QMetaObjectBuilder::Constructors));
-+}
-+
-+void tst_QMetaObjectBuilder::property()
-+{
-+ QMetaObjectBuilder builder;
-+
-+ // Null property builder
-+ QMetaPropertyBuilder nullProp;
-+ QCOMPARE(nullProp.name(), QByteArray());
-+ QCOMPARE(nullProp.type(), QByteArray());
-+ QVERIFY(!nullProp.hasNotifySignal());
-+ QVERIFY(!nullProp.isReadable());
-+ QVERIFY(!nullProp.isWritable());
-+ QVERIFY(!nullProp.isResettable());
-+ QVERIFY(!nullProp.isDesignable());
-+ QVERIFY(!nullProp.isScriptable());
-+ QVERIFY(!nullProp.isStored());
-+ QVERIFY(!nullProp.isEditable());
-+ QVERIFY(!nullProp.isUser());
-+ QVERIFY(!nullProp.hasStdCppSet());
-+ QVERIFY(!nullProp.isEnumOrFlag());
-+ QCOMPARE(nullProp.index(), 0);
-+
-+ // Add a property and check its attributes.
-+ QMetaPropertyBuilder prop1 = builder.addProperty("foo", "const QString &");
-+ QCOMPARE(prop1.name(), QByteArray("foo"));
-+ QCOMPARE(prop1.type(), QByteArray("QString"));
-+ QVERIFY(!prop1.hasNotifySignal());
-+ QVERIFY(prop1.isReadable());
-+ QVERIFY(prop1.isWritable());
-+ QVERIFY(!prop1.isResettable());
-+ QVERIFY(!prop1.isDesignable());
-+ QVERIFY(prop1.isScriptable());
-+ QVERIFY(!prop1.isStored());
-+ QVERIFY(!prop1.isEditable());
-+ QVERIFY(!prop1.isUser());
-+ QVERIFY(!prop1.hasStdCppSet());
-+ QVERIFY(!prop1.isEnumOrFlag());
-+
-+ QCOMPARE(prop1.index(), 0);
-+ QCOMPARE(builder.propertyCount(), 1);
-+
-+ // Add another property and check again.
-+ QMetaPropertyBuilder prop2 = builder.addProperty("bar", "int");
-+ QCOMPARE(prop2.name(), QByteArray("bar"));
-+ QCOMPARE(prop2.type(), QByteArray("int"));
-+ QVERIFY(!prop2.hasNotifySignal());
-+ QVERIFY(prop2.isReadable());
-+ QVERIFY(prop2.isWritable());
-+ QVERIFY(!prop2.isResettable());
-+ QVERIFY(!prop2.isDesignable());
-+ QVERIFY(prop2.isScriptable());
-+ QVERIFY(!prop2.isStored());
-+ QVERIFY(!prop2.isEditable());
-+ QVERIFY(!prop2.isUser());
-+ QVERIFY(!prop2.hasStdCppSet());
-+ QVERIFY(!prop2.isEnumOrFlag());
-+
-+ QCOMPARE(prop2.index(), 1);
-+ QCOMPARE(builder.propertyCount(), 2);
-+
-+ // Perform index-based lookup.
-+ QCOMPARE(builder.indexOfProperty("foo"), 0);
-+ QCOMPARE(builder.indexOfProperty("bar"), 1);
-+ QCOMPARE(builder.indexOfProperty("baz"), -1);
-+ QCOMPARE(builder.property(1).name(), QByteArray("bar"));
-+ QCOMPARE(builder.property(9).name(), QByteArray());
-+
-+ // Modify the attributes on prop1.
-+ prop1.setReadable(false);
-+ prop1.setWritable(false);
-+ prop1.setResettable(true);
-+ prop1.setDesignable(true);
-+ prop1.setScriptable(false);
-+ prop1.setStored(true);
-+ prop1.setEditable(true);
-+ prop1.setUser(true);
-+ prop1.setStdCppSet(true);
-+ prop1.setEnumOrFlag(true);
-+
-+ // Check that prop1 is changed, but prop2 is not.
-+ QCOMPARE(prop1.name(), QByteArray("foo"));
-+ QCOMPARE(prop1.type(), QByteArray("QString"));
-+ QVERIFY(!prop1.isReadable());
-+ QVERIFY(!prop1.isWritable());
-+ QVERIFY(prop1.isResettable());
-+ QVERIFY(prop1.isDesignable());
-+ QVERIFY(!prop1.isScriptable());
-+ QVERIFY(prop1.isStored());
-+ QVERIFY(prop1.isEditable());
-+ QVERIFY(prop1.isUser());
-+ QVERIFY(prop1.hasStdCppSet());
-+ QVERIFY(prop1.isEnumOrFlag());
-+ QVERIFY(prop2.isReadable());
-+ QVERIFY(prop2.isWritable());
-+ QCOMPARE(prop2.name(), QByteArray("bar"));
-+ QCOMPARE(prop2.type(), QByteArray("int"));
-+ QVERIFY(!prop2.isResettable());
-+ QVERIFY(!prop2.isDesignable());
-+ QVERIFY(prop2.isScriptable());
-+ QVERIFY(!prop2.isStored());
-+ QVERIFY(!prop2.isEditable());
-+ QVERIFY(!prop2.isUser());
-+ QVERIFY(!prop2.hasStdCppSet());
-+ QVERIFY(!prop2.isEnumOrFlag());
-+
-+ // Remove prop1 and check that prop2 becomes index 0.
-+ builder.removeProperty(0);
-+ QCOMPARE(builder.propertyCount(), 1);
-+ prop2 = builder.property(0);
-+ QCOMPARE(prop2.name(), QByteArray("bar"));
-+ QCOMPARE(prop2.type(), QByteArray("int"));
-+ QVERIFY(!prop2.isResettable());
-+ QVERIFY(!prop2.isDesignable());
-+ QVERIFY(prop2.isScriptable());
-+ QVERIFY(!prop2.isStored());
-+ QVERIFY(!prop2.isEditable());
-+ QVERIFY(!prop2.isUser());
-+ QVERIFY(!prop2.hasStdCppSet());
-+ QVERIFY(!prop2.isEnumOrFlag());
-+ QCOMPARE(prop2.index(), 0);
-+
-+ // Perform index-based lookup again.
-+ QCOMPARE(builder.indexOfProperty("foo"), -1);
-+ QCOMPARE(builder.indexOfProperty("bar"), 0);
-+ QCOMPARE(builder.indexOfProperty("baz"), -1);
-+
-+ // Check for side-effects between the flags on prop2.
-+ // Setting a flag to true shouldn't set any of the others to true.
-+ // This checks for cut-and-paste bugs in the implementation where
-+ // the flag code was pasted but the flag name was not changed.
-+#define CLEAR_FLAGS() \
-+ do { \
-+ prop2.setReadable(false); \
-+ prop2.setWritable(false); \
-+ prop2.setResettable(false); \
-+ prop2.setDesignable(false); \
-+ prop2.setScriptable(false); \
-+ prop2.setStored(false); \
-+ prop2.setEditable(false); \
-+ prop2.setUser(false); \
-+ prop2.setStdCppSet(false); \
-+ prop2.setEnumOrFlag(false); \
-+ } while (0)
-+#define COUNT_FLAGS() \
-+ ((prop2.isReadable() ? 1 : 0) + \
-+ (prop2.isWritable() ? 1 : 0) + \
-+ (prop2.isResettable() ? 1 : 0) + \
-+ (prop2.isDesignable() ? 1 : 0) + \
-+ (prop2.isScriptable() ? 1 : 0) + \
-+ (prop2.isStored() ? 1 : 0) + \
-+ (prop2.isEditable() ? 1 : 0) + \
-+ (prop2.isUser() ? 1 : 0) + \
-+ (prop2.hasStdCppSet() ? 1 : 0) + \
-+ (prop2.isEnumOrFlag() ? 1 : 0))
-+#define CHECK_FLAG(setFunc,isFunc) \
-+ do { \
-+ CLEAR_FLAGS(); \
-+ QCOMPARE(COUNT_FLAGS(), 0); \
-+ prop2.setFunc(true); \
-+ QVERIFY(prop2.isFunc()); \
-+ QCOMPARE(COUNT_FLAGS(), 1); \
-+ } while (0)
-+ CHECK_FLAG(setReadable, isReadable);
-+ CHECK_FLAG(setWritable, isWritable);
-+ CHECK_FLAG(setResettable, isResettable);
-+ CHECK_FLAG(setDesignable, isDesignable);
-+ CHECK_FLAG(setScriptable, isScriptable);
-+ CHECK_FLAG(setStored, isStored);
-+ CHECK_FLAG(setEditable, isEditable);
-+ CHECK_FLAG(setUser, isUser);
-+ CHECK_FLAG(setStdCppSet, hasStdCppSet);
-+ CHECK_FLAG(setEnumOrFlag, isEnumOrFlag);
-+
-+ // Check that nothing else changed.
-+ QVERIFY(checkForSideEffects(builder, QMetaObjectBuilder::Properties));
-+
-+ // Add property from prototype
-+ QMetaProperty prototype = SomethingOfEverything::staticMetaObject.property(1);
-+ QVERIFY(prototype.name() == QByteArray("prop"));
-+ QMetaPropertyBuilder prototypeProp = builder.addProperty(prototype);
-+ QCOMPARE(prototypeProp.name(), QByteArray("prop"));
-+ QVERIFY(prototypeProp.hasNotifySignal());
-+ QCOMPARE(prototypeProp.notifySignal().signature(), QByteArray("propChanged(QString)"));
-+ QCOMPARE(builder.methodCount(), 1);
-+ QCOMPARE(builder.method(0).signature(), QByteArray("propChanged(QString)"));
-+}
-+
-+void tst_QMetaObjectBuilder::notifySignal()
-+{
-+ QMetaObjectBuilder builder;
-+
-+ QMetaPropertyBuilder prop = builder.addProperty("foo", "const QString &");
-+ builder.addSlot("setFoo(QString)");
-+ QMetaMethodBuilder notify = builder.addSignal("fooChanged(QString)");
-+
-+ QVERIFY(!prop.hasNotifySignal());
-+ QCOMPARE(prop.notifySignal().index(), 0);
-+
-+ prop.setNotifySignal(notify);
-+ QVERIFY(prop.hasNotifySignal());
-+ QCOMPARE(prop.notifySignal().index(), 1);
-+
-+ prop.setNotifySignal(QMetaMethodBuilder());
-+ QVERIFY(!prop.hasNotifySignal());
-+ QCOMPARE(prop.notifySignal().index(), 0);
-+
-+ prop.setNotifySignal(notify);
-+ prop.removeNotifySignal();
-+ QVERIFY(!prop.hasNotifySignal());
-+ QCOMPARE(prop.notifySignal().index(), 0);
-+
-+ QCOMPARE(builder.methodCount(), 2);
-+ QCOMPARE(builder.propertyCount(), 1);
-+
-+ // Check that nothing else changed except methods and properties.
-+ QVERIFY(checkForSideEffects
-+ (builder, QMetaObjectBuilder::Methods | QMetaObjectBuilder::Properties));
-+}
-+
-+void tst_QMetaObjectBuilder::enumerator()
-+{
-+ QMetaObjectBuilder builder;
-+
-+ // Add an enumerator and check its attributes.
-+ QMetaEnumBuilder enum1 = builder.addEnumerator("foo");
-+ QCOMPARE(enum1.name(), QByteArray("foo"));
-+ QVERIFY(!enum1.isFlag());
-+ QCOMPARE(enum1.keyCount(), 0);
-+ QCOMPARE(enum1.index(), 0);
-+ QCOMPARE(builder.enumeratorCount(), 1);
-+
-+ // Add another enumerator and check again.
-+ QMetaEnumBuilder enum2 = builder.addEnumerator("bar");
-+ QCOMPARE(enum2.name(), QByteArray("bar"));
-+ QVERIFY(!enum2.isFlag());
-+ QCOMPARE(enum2.keyCount(), 0);
-+ QCOMPARE(enum2.index(), 1);
-+ QCOMPARE(builder.enumeratorCount(), 2);
-+
-+ // Perform index-based lookup.
-+ QCOMPARE(builder.indexOfEnumerator("foo"), 0);
-+ QCOMPARE(builder.indexOfEnumerator("bar"), 1);
-+ QCOMPARE(builder.indexOfEnumerator("baz"), -1);
-+ QCOMPARE(builder.enumerator(1).name(), QByteArray("bar"));
-+ QCOMPARE(builder.enumerator(9).name(), QByteArray());
-+
-+ // Modify the attributes on enum1.
-+ enum1.setIsFlag(true);
-+ QCOMPARE(enum1.addKey("ABC", 0), 0);
-+ QCOMPARE(enum1.addKey("DEF", 1), 1);
-+ QCOMPARE(enum1.addKey("GHI", -1), 2);
-+
-+ // Check that enum1 is changed, but enum2 is not.
-+ QCOMPARE(enum1.name(), QByteArray("foo"));
-+ QVERIFY(enum1.isFlag());
-+ QCOMPARE(enum1.keyCount(), 3);
-+ QCOMPARE(enum1.index(), 0);
-+ QCOMPARE(enum1.key(0), QByteArray("ABC"));
-+ QCOMPARE(enum1.key(1), QByteArray("DEF"));
-+ QCOMPARE(enum1.key(2), QByteArray("GHI"));
-+ QCOMPARE(enum1.key(3), QByteArray());
-+ QCOMPARE(enum1.value(0), 0);
-+ QCOMPARE(enum1.value(1), 1);
-+ QCOMPARE(enum1.value(2), -1);
-+ QCOMPARE(enum2.name(), QByteArray("bar"));
-+ QVERIFY(!enum2.isFlag());
-+ QCOMPARE(enum2.keyCount(), 0);
-+ QCOMPARE(enum2.index(), 1);
-+
-+ // Modify the attributes on enum2.
-+ enum2.setIsFlag(true);
-+ QCOMPARE(enum2.addKey("XYZ", 10), 0);
-+ QCOMPARE(enum2.addKey("UVW", 19), 1);
-+
-+ // This time check that only method2 changed.
-+ QCOMPARE(enum1.name(), QByteArray("foo"));
-+ QVERIFY(enum1.isFlag());
-+ QCOMPARE(enum1.keyCount(), 3);
-+ QCOMPARE(enum1.index(), 0);
-+ QCOMPARE(enum1.key(0), QByteArray("ABC"));
-+ QCOMPARE(enum1.key(1), QByteArray("DEF"));
-+ QCOMPARE(enum1.key(2), QByteArray("GHI"));
-+ QCOMPARE(enum1.key(3), QByteArray());
-+ QCOMPARE(enum1.value(0), 0);
-+ QCOMPARE(enum1.value(1), 1);
-+ QCOMPARE(enum1.value(2), -1);
-+ QCOMPARE(enum2.name(), QByteArray("bar"));
-+ QVERIFY(enum2.isFlag());
-+ QCOMPARE(enum2.keyCount(), 2);
-+ QCOMPARE(enum2.index(), 1);
-+ QCOMPARE(enum2.key(0), QByteArray("XYZ"));
-+ QCOMPARE(enum2.key(1), QByteArray("UVW"));
-+ QCOMPARE(enum2.key(2), QByteArray());
-+ QCOMPARE(enum2.value(0), 10);
-+ QCOMPARE(enum2.value(1), 19);
-+
-+ // Remove enum1 key
-+ enum1.removeKey(2);
-+ QCOMPARE(enum1.name(), QByteArray("foo"));
-+ QVERIFY(enum1.isFlag());
-+ QCOMPARE(enum1.keyCount(), 2);
-+ QCOMPARE(enum1.index(), 0);
-+ QCOMPARE(enum1.key(0), QByteArray("ABC"));
-+ QCOMPARE(enum1.key(1), QByteArray("DEF"));
-+ QCOMPARE(enum1.key(2), QByteArray());
-+ QCOMPARE(enum1.value(0), 0);
-+ QCOMPARE(enum1.value(1), 1);
-+ QCOMPARE(enum1.value(2), -1);
-+ QCOMPARE(enum2.name(), QByteArray("bar"));
-+ QVERIFY(enum2.isFlag());
-+ QCOMPARE(enum2.keyCount(), 2);
-+ QCOMPARE(enum2.index(), 1);
-+ QCOMPARE(enum2.key(0), QByteArray("XYZ"));
-+ QCOMPARE(enum2.key(1), QByteArray("UVW"));
-+ QCOMPARE(enum2.key(2), QByteArray());
-+ QCOMPARE(enum2.value(0), 10);
-+ QCOMPARE(enum2.value(1), 19);
-+
-+ // Remove enum1 and check that enum2 becomes index 0.
-+ builder.removeEnumerator(0);
-+ QCOMPARE(builder.enumeratorCount(), 1);
-+ enum2 = builder.enumerator(0);
-+ QCOMPARE(enum2.name(), QByteArray("bar"));
-+ QVERIFY(enum2.isFlag());
-+ QCOMPARE(enum2.keyCount(), 2);
-+ QCOMPARE(enum2.index(), 0);
-+ QCOMPARE(enum2.key(0), QByteArray("XYZ"));
-+ QCOMPARE(enum2.key(1), QByteArray("UVW"));
-+ QCOMPARE(enum2.key(2), QByteArray());
-+ QCOMPARE(enum2.value(0), 10);
-+ QCOMPARE(enum2.value(1), 19);
-+
-+ // Perform index-based lookup again.
-+ QCOMPARE(builder.indexOfEnumerator("foo"), -1);
-+ QCOMPARE(builder.indexOfEnumerator("bar"), 0);
-+ QCOMPARE(builder.indexOfEnumerator("baz"), -1);
-+
-+ // Check that nothing else changed.
-+ QVERIFY(checkForSideEffects(builder, QMetaObjectBuilder::Enumerators));
-+}
-+
-+void tst_QMetaObjectBuilder::classInfo()
-+{
-+ QMetaObjectBuilder builder;
-+
-+ // Add two items of class information and check their attributes.
-+ QCOMPARE(builder.addClassInfo("foo", "value1"), 0);
-+ QCOMPARE(builder.addClassInfo("bar", "value2"), 1);
-+ QCOMPARE(builder.classInfoName(0), QByteArray("foo"));
-+ QCOMPARE(builder.classInfoValue(0), QByteArray("value1"));
-+ QCOMPARE(builder.classInfoName(1), QByteArray("bar"));
-+ QCOMPARE(builder.classInfoValue(1), QByteArray("value2"));
-+ QCOMPARE(builder.classInfoName(9), QByteArray());
-+ QCOMPARE(builder.classInfoValue(9), QByteArray());
-+ QCOMPARE(builder.classInfoCount(), 2);
-+
-+ // Perform index-based lookup.
-+ QCOMPARE(builder.indexOfClassInfo("foo"), 0);
-+ QCOMPARE(builder.indexOfClassInfo("bar"), 1);
-+ QCOMPARE(builder.indexOfClassInfo("baz"), -1);
-+
-+ // Remove the first one and check again.
-+ builder.removeClassInfo(0);
-+ QCOMPARE(builder.classInfoName(0), QByteArray("bar"));
-+ QCOMPARE(builder.classInfoValue(0), QByteArray("value2"));
-+ QCOMPARE(builder.classInfoCount(), 1);
-+
-+ // Perform index-based lookup again.
-+ QCOMPARE(builder.indexOfClassInfo("foo"), -1);
-+ QCOMPARE(builder.indexOfClassInfo("bar"), 0);
-+ QCOMPARE(builder.indexOfClassInfo("baz"), -1);
-+
-+ // Check that nothing else changed.
-+ QVERIFY(checkForSideEffects(builder, QMetaObjectBuilder::ClassInfos));
-+}
-+
-+#ifdef Q_NO_DATA_RELOCATION
-+const QMetaObject& staticMetaObjectGlobal()
-+{
-+ return QObject::staticMetaObject;
-+}
-+
-+const QMetaObject& staticMetaObjectLocal()
-+{
-+ return *meta;
-+}
-+#endif
-+
-+
-+void tst_QMetaObjectBuilder::relatedMetaObject()
-+{
-+ QMetaObjectBuilder builder;
-+
-+ // Add two related meta objects and check their attributes.
-+#ifdef Q_NO_DATA_RELOCATION
-+ meta = &staticMetaObject;
-+ QCOMPARE(builder.addRelatedMetaObject(&staticMetaObjectGlobal), 0);
-+ QCOMPARE(builder.addRelatedMetaObject(&staticMetaObjectLocal), 1);
-+#else
-+ QCOMPARE(builder.addRelatedMetaObject(&QObject::staticMetaObject), 0);
-+ QCOMPARE(builder.addRelatedMetaObject(&staticMetaObject), 1);
-+#endif
-+ QVERIFY(builder.relatedMetaObject(0) == &QObject::staticMetaObject);
-+ QVERIFY(builder.relatedMetaObject(1) == &staticMetaObject);
-+ QCOMPARE(builder.relatedMetaObjectCount(), 2);
-+
-+ // Remove the first one and check again.
-+ builder.removeRelatedMetaObject(0);
-+ QVERIFY(builder.relatedMetaObject(0) == &staticMetaObject);
-+ QCOMPARE(builder.relatedMetaObjectCount(), 1);
-+
-+ // Check that nothing else changed.
-+ QVERIFY(checkForSideEffects(builder, QMetaObjectBuilder::RelatedMetaObjects));
-+}
-+
-+static int smetacall(QMetaObject::Call, int, void **)
-+{
-+ return 0;
-+}
-+
-+void tst_QMetaObjectBuilder::staticMetacall()
-+{
-+ QMetaObjectBuilder builder;
-+ QVERIFY(!builder.staticMetacallFunction());
-+ builder.setStaticMetacallFunction(smetacall);
-+ QVERIFY(builder.staticMetacallFunction() == smetacall);
-+ QVERIFY(checkForSideEffects(builder, QMetaObjectBuilder::StaticMetacall));
-+}
-+
-+// Copy the entire contents of a static QMetaObject and then check
-+// that QMetaObjectBuilder will produce an exact copy as output.
-+void tst_QMetaObjectBuilder::copyMetaObject()
-+{
-+ QMetaObjectBuilder builder(&QObject::staticMetaObject);
-+ QMetaObject *meta = builder.toMetaObject();
-+ QVERIFY(sameMetaObject(meta, &QObject::staticMetaObject));
-+ qFree(meta);
-+
-+ QMetaObjectBuilder builder2(&staticMetaObject);
-+ meta = builder2.toMetaObject();
-+ QVERIFY(sameMetaObject(meta, &staticMetaObject));
-+ qFree(meta);
-+
-+ QMetaObjectBuilder builder3(&SomethingOfEverything::staticMetaObject);
-+ meta = builder3.toMetaObject();
-+ QVERIFY(sameMetaObject(meta, &SomethingOfEverything::staticMetaObject));
-+ qFree(meta);
-+}
-+
-+// Serialize and deserialize a meta object and check that
-+// it round-trips to the exact same value.
-+void tst_QMetaObjectBuilder::serialize()
-+{
-+ // Full QMetaObjectBuilder
-+ {
-+ QMetaObjectBuilder builder(&SomethingOfEverything::staticMetaObject);
-+ QMetaObject *meta = builder.toMetaObject();
-+
-+ QByteArray data;
-+ QDataStream stream(&data, QIODevice::WriteOnly | QIODevice::Append);
-+ builder.serialize(stream);
-+
-+ QMetaObjectBuilder builder2;
-+ QDataStream stream2(data);
-+ QMap<QByteArray, const QMetaObject *> references;
-+ references.insert(QByteArray("QLocale"), &QLocale::staticMetaObject);
-+ builder2.deserialize(stream2, references);
-+#ifdef Q_NO_DATA_RELOCATION
-+ //the related meta objects will be function pointers
-+ //which you have to add to the builder manually.
-+ builder2.addRelatedMetaObject(QLocale::getStaticMetaObject);
-+#endif
-+ builder2.setStaticMetacallFunction(builder.staticMetacallFunction());
-+ QMetaObject *meta2 = builder2.toMetaObject();
-+
-+ QVERIFY(sameMetaObject(meta, meta2));
-+ qFree(meta);
-+ qFree(meta2);
-+ }
-+
-+ // Partial QMetaObjectBuilder
-+ {
-+ QMetaObjectBuilder builder;
-+ builder.setClassName("Test");
-+ builder.addProperty("foo", "int");
-+
-+ QByteArray data;
-+ QDataStream stream(&data, QIODevice::WriteOnly | QIODevice::Append);
-+ builder.serialize(stream);
-+
-+ QMetaObjectBuilder builder2;
-+ QDataStream stream2(data);
-+ builder2.deserialize(stream2, QMap<QByteArray, const QMetaObject *>());
-+
-+ QCOMPARE(builder.superClass(), builder2.superClass());
-+ QCOMPARE(builder.className(), builder2.className());
-+ QCOMPARE(builder.propertyCount(), builder2.propertyCount());
-+ QCOMPARE(builder.property(0).name(), builder2.property(0).name());
-+ QCOMPARE(builder.property(0).type(), builder2.property(0).type());
-+ }
-+}
-+
-+// Check that removing a method updates notify signals appropriately
-+void tst_QMetaObjectBuilder::removeNotifySignal()
-+{
-+ QMetaObjectBuilder builder;
-+
-+ QMetaMethodBuilder method1 = builder.addSignal("foo(const QString&, int)");
-+ QMetaMethodBuilder method2 = builder.addSignal("bar(QString)");
-+
-+ // Setup property
-+ QMetaPropertyBuilder prop = builder.addProperty("prop", "const QString &");
-+ prop.setNotifySignal(method2);
-+ QVERIFY(prop.hasNotifySignal());
-+ QCOMPARE(prop.notifySignal().index(), 1);
-+
-+ // Remove non-notify signal
-+ builder.removeMethod(0);
-+ QVERIFY(prop.hasNotifySignal());
-+ QCOMPARE(prop.notifySignal().index(), 0);
-+
-+ // Remove notify signal
-+ builder.removeMethod(0);
-+ QVERIFY(!prop.hasNotifySignal());
-+}
-+
-+// Check that the only changes to a "builder" relative to the default
-+// state is specified by "members".
-+bool tst_QMetaObjectBuilder::checkForSideEffects
-+ (const QMetaObjectBuilder& builder,
-+ QMetaObjectBuilder::AddMembers members)
-+{
-+ if ((members & QMetaObjectBuilder::ClassName) == 0) {
-+ if (!builder.className().isEmpty())
-+ return false;
-+ }
-+
-+ if ((members & QMetaObjectBuilder::SuperClass) == 0) {
-+ if (builder.superClass() != &QObject::staticMetaObject)
-+ return false;
-+ }
-+
-+ if ((members & QMetaObjectBuilder::Methods) == 0) {
-+ if (builder.methodCount() != 0)
-+ return false;
-+ }
-+
-+ if ((members & QMetaObjectBuilder::Constructors) == 0) {
-+ if (builder.constructorCount() != 0)
-+ return false;
-+ }
-+
-+ if ((members & QMetaObjectBuilder::Properties) == 0) {
-+ if (builder.propertyCount() != 0)
-+ return false;
-+ }
-+
-+ if ((members & QMetaObjectBuilder::Enumerators) == 0) {
-+ if (builder.enumeratorCount() != 0)
-+ return false;
-+ }
-+
-+ if ((members & QMetaObjectBuilder::ClassInfos) == 0) {
-+ if (builder.classInfoCount() != 0)
-+ return false;
-+ }
-+
-+ if ((members & QMetaObjectBuilder::RelatedMetaObjects) == 0) {
-+ if (builder.relatedMetaObjectCount() != 0)
-+ return false;
-+ }
-+
-+ if ((members & QMetaObjectBuilder::StaticMetacall) == 0) {
-+ if (builder.staticMetacallFunction() != 0)
-+ return false;
-+ }
-+
-+ return true;
-+}
-+
-+static bool sameMethod(const QMetaMethod& method1, const QMetaMethod& method2)
-+{
-+ if (QByteArray(method1.signature()) != QByteArray(method2.signature()))
-+ return false;
-+
-+ if (QByteArray(method1.typeName()) != QByteArray(method2.typeName()))
-+ return false;
-+
-+ if (method1.parameterNames() != method2.parameterNames())
-+ return false;
-+
-+ if (QByteArray(method1.tag()) != QByteArray(method2.tag()))
-+ return false;
-+
-+ if (method1.access() != method2.access())
-+ return false;
-+
-+ if (method1.methodType() != method2.methodType())
-+ return false;
-+
-+ if (method1.attributes() != method2.attributes())
-+ return false;
-+
-+ return true;
-+}
-+
-+static bool sameProperty(const QMetaProperty& prop1, const QMetaProperty& prop2)
-+{
-+ if (QByteArray(prop1.name()) != QByteArray(prop2.name()))
-+ return false;
-+
-+ if (QByteArray(prop1.typeName()) != QByteArray(prop2.typeName()))
-+ return false;
-+
-+ if (prop1.isReadable() != prop2.isReadable() ||
-+ prop1.isWritable() != prop2.isWritable() ||
-+ prop1.isResettable() != prop2.isResettable() ||
-+ prop1.isDesignable() != prop2.isDesignable() ||
-+ prop1.isScriptable() != prop2.isScriptable() ||
-+ prop1.isStored() != prop2.isStored() ||
-+ prop1.isEditable() != prop2.isEditable() ||
-+ prop1.isUser() != prop2.isUser() ||
-+ prop1.isFlagType() != prop2.isFlagType() ||
-+ prop1.isEnumType() != prop2.isEnumType() ||
-+ prop1.hasNotifySignal() != prop2.hasNotifySignal() ||
-+ prop1.hasStdCppSet() != prop2.hasStdCppSet())
-+ return false;
-+
-+ if (prop1.hasNotifySignal()) {
-+ if (prop1.notifySignalIndex() != prop2.notifySignalIndex())
-+ return false;
-+ }
-+
-+ return true;
-+}
-+
-+static bool sameEnumerator(const QMetaEnum& enum1, const QMetaEnum& enum2)
-+{
-+ if (QByteArray(enum1.name()) != QByteArray(enum2.name()))
-+ return false;
-+
-+ if (enum1.isFlag() != enum2.isFlag())
-+ return false;
-+
-+ if (enum1.keyCount() != enum2.keyCount())
-+ return false;
-+
-+ for (int index = 0; index < enum1.keyCount(); ++index) {
-+ if (QByteArray(enum1.key(index)) != QByteArray(enum2.key(index)))
-+ return false;
-+ if (enum1.value(index) != enum2.value(index))
-+ return false;
-+ }
-+
-+ if (QByteArray(enum1.scope()) != QByteArray(enum2.scope()))
-+ return false;
-+
-+ return true;
-+}
-+
-+// Determine if two meta objects are identical.
-+bool tst_QMetaObjectBuilder::sameMetaObject
-+ (const QMetaObject *meta1, const QMetaObject *meta2)
-+{
-+ int index;
-+
-+ if (strcmp(meta1->className(), meta2->className()) != 0)
-+ return false;
-+
-+ if (meta1->superClass() != meta2->superClass())
-+ return false;
-+
-+ if (meta1->constructorCount() != meta2->constructorCount() ||
-+ meta1->methodCount() != meta2->methodCount() ||
-+ meta1->enumeratorCount() != meta2->enumeratorCount() ||
-+ meta1->propertyCount() != meta2->propertyCount() ||
-+ meta1->classInfoCount() != meta2->classInfoCount())
-+ return false;
-+
-+ for (index = 0; index < meta1->constructorCount(); ++index) {
-+ if (!sameMethod(meta1->constructor(index), meta2->constructor(index)))
-+ return false;
-+ }
-+
-+ for (index = 0; index < meta1->methodCount(); ++index) {
-+ if (!sameMethod(meta1->method(index), meta2->method(index)))
-+ return false;
-+ }
-+
-+ for (index = 0; index < meta1->propertyCount(); ++index) {
-+ if (!sameProperty(meta1->property(index), meta2->property(index)))
-+ return false;
-+ }
-+
-+ for (index = 0; index < meta1->enumeratorCount(); ++index) {
-+ if (!sameEnumerator(meta1->enumerator(index), meta2->enumerator(index)))
-+ return false;
-+ }
-+
-+ for (index = 0; index < meta1->classInfoCount(); ++index) {
-+ if (QByteArray(meta1->classInfo(index).name()) !=
-+ QByteArray(meta2->classInfo(index).name()))
-+ return false;
-+ if (QByteArray(meta1->classInfo(index).value()) !=
-+ QByteArray(meta2->classInfo(index).value()))
-+ return false;
-+ }
-+
-+ const QMetaObject **objects1 = 0;
-+ const QMetaObject **objects2 = 0;
-+ if (meta1->d.data[0] == meta2->d.data[0] && meta1->d.data[0] >= 2) {
-+ QMetaObjectExtraData *extra1 = (QMetaObjectExtraData *)(meta1->d.extradata);
-+ QMetaObjectExtraData *extra2 = (QMetaObjectExtraData *)(meta2->d.extradata);
-+ if (extra1 && !extra2)
-+ return false;
-+ if (extra2 && !extra1)
-+ return false;
-+ if (extra1 && extra2) {
-+ if (extra1->static_metacall != extra2->static_metacall)
-+ return false;
-+ //objects1 = extra1->objects;
-+ //objects2 = extra1->objects;
-+ }
-+ } else if (meta1->d.data[0] == meta2->d.data[0] && meta1->d.data[0] == 1) {
-+ objects1 = (const QMetaObject **)(meta1->d.extradata);
-+ objects2 = (const QMetaObject **)(meta2->d.extradata);
-+ }
-+ if (objects1 && !objects2)
-+ return false;
-+ if (objects2 && !objects1)
-+ return false;
-+ if (objects1 && objects2) {
-+ while (*objects1 != 0 && *objects2 != 0) {
-+ if (*objects1 != *objects2)
-+ return false;
-+ ++objects1;
-+ ++objects2;
-+ }
-+ }
-+
-+ return true;
-+}
-+
-+QTEST_MAIN(tst_QMetaObjectBuilder)
-+
-+#include "tst_qmetaobjectbuilder_47.moc"
+++ /dev/null
-
-Fixes issues like below
-
-| qaudiooutput_pulse.cpp: In member function 'bool QPulseAudioOutput::open()':
-| qaudiooutput_pulse.cpp:255:75: error: '::getpid' has not been declared
-| make[3]: *** [../../../build/Debug/qtmedia_pulse/qaudiooutput_pulse.o] Error 1
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
-
-Upstream-Status: Pending
-
-Index: qt-mobility-opensource-src-1.2.0/plugins/multimedia/pulseaudio/qaudiooutput_pulse.cpp
-===================================================================
---- qt-mobility-opensource-src-1.2.0.orig/plugins/multimedia/pulseaudio/qaudiooutput_pulse.cpp 2012-03-31 07:26:24.457018348 -0700
-+++ qt-mobility-opensource-src-1.2.0/plugins/multimedia/pulseaudio/qaudiooutput_pulse.cpp 2012-03-31 07:27:53.309022654 -0700
-@@ -46,7 +46,7 @@
- #include "qaudiodeviceinfo_pulse.h"
- #include "qpulseaudioengine.h"
- #include "qpulsehelpers.h"
--
-+#include <unistd.h>
- QT_BEGIN_NAMESPACE
-
- const int PeriodTimeMs = 20;
-Index: qt-mobility-opensource-src-1.2.0/plugins/multimedia/pulseaudio/qaudioinput_pulse.cpp
-===================================================================
---- qt-mobility-opensource-src-1.2.0.orig/plugins/multimedia/pulseaudio/qaudioinput_pulse.cpp 2012-03-31 07:29:19.997026831 -0700
-+++ qt-mobility-opensource-src-1.2.0/plugins/multimedia/pulseaudio/qaudioinput_pulse.cpp 2012-03-31 07:29:39.541027625 -0700
-@@ -46,6 +46,7 @@
- #include "qaudiodeviceinfo_pulse.h"
- #include "qpulseaudioengine.h"
- #include "qpulsehelpers.h"
-+#include <unistd.h>
-
- QT_BEGIN_NAMESPACE
-
-Index: qt-mobility-opensource-src-1.2.0/plugins/multimedia/pulseaudio/qpulseaudioengine.cpp
-===================================================================
---- qt-mobility-opensource-src-1.2.0.orig/plugins/multimedia/pulseaudio/qpulseaudioengine.cpp 2012-03-31 07:33:24.805038719 -0700
-+++ qt-mobility-opensource-src-1.2.0/plugins/multimedia/pulseaudio/qpulseaudioengine.cpp 2012-03-31 07:33:46.889039783 -0700
-@@ -46,6 +46,7 @@
- #include "qaudiodeviceinfo_pulse.h"
- #include "qaudiooutput_pulse.h"
- #include "qpulsehelpers.h"
-+#include <unistd.h>
-
- QT_BEGIN_NAMESPACE
-
+++ /dev/null
-When building qt-mobility, the qa_configure stage failed because the catalogue /usr/lib
-is used in some Makefiles within configure tests. We manually removed this catalogue.
-
-Upstream-Status: Inappropriate [embedded]
-Signed-off-by: Dmitry Cherukhin <dima_ch@emcraft.com>
-
---- qt-mobility-opensource-src-1.2.0/configure.orig 2011-05-10 10:06:01.000000000 +0200
-+++ qt-mobility-opensource-src-1.2.0/configure 2011-11-08 12:34:56.347645968 +0100
-@@ -583,6 +583,8 @@
- fi
-
- $QMAKE_EXEC $QMKSPEC "$relpath/config.tests/$2/$2.pro" 2>> "$CONFIG_LOG" >> "$CONFIG_LOG"
-+ cp Makefile Makefile.old
-+ sed -e 's@-L/usr/lib@@' <Makefile.old >Makefile
- printf " ."
- "$MAKE" clean >> "$CONFIG_LOG"
- printf "."
+++ /dev/null
-Upstream-Status: Inappropriate [configuration]
-
-diff --git a/examples/declarative-camera/declarative-camera.pro b/examples/declarative-camera/declarative-camera.pro
-index 8164fbc..54fd8ad 100644
---- a/examples/declarative-camera/declarative-camera.pro
-+++ b/examples/declarative-camera/declarative-camera.pro
-@@ -5,10 +5,10 @@ TEMPLATE=app
-
- QT += declarative network
-
--!maemo5 {
-- contains(QT_CONFIG, opengl) {
-- QT += opengl
-- }
-+contains(QT_CONFIG, opengl): !maemo5 {
-+ QT += opengl
-+} else {
-+ DEFINES += QT_NO_OPENGL
- }
-
- win32 {
-diff --git a/examples/videographicsitem/videographicsitem.pro b/examples/videographicsitem/videographicsitem.pro
-index 8461beb..eedee2f 100644
---- a/examples/videographicsitem/videographicsitem.pro
-+++ b/examples/videographicsitem/videographicsitem.pro
-@@ -9,7 +9,11 @@ MOBILITY = multimedia
-
- QMAKE_RPATHDIR += $$DESTDIR
-
--!symbian:contains(QT_CONFIG, opengl): QT += opengl
-+contains(QT_CONFIG, opengl): !symbian {
-+ QT += opengl
-+} else {
-+ DEFINES += QT_NO_OPENGL
-+}
-
- HEADERS += videoplayer.h \
- videoitem.h
+++ /dev/null
-QMake pro files don't explicitly define QT_NO_XVIDEO if the
-configuration lacks xvideo, but plugins code relies on this define.
-
-Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
-Upstream-Status: Inappropriate [configuration]
----
- plugins/multimedia/gstreamer/gstreamer.pro | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/plugins/multimedia/gstreamer/gstreamer.pro b/plugins/multimedia/gstreamer/gstreamer.pro
---- a/plugins/multimedia/gstreamer/gstreamer.pro
-+++ b/plugins/multimedia/gstreamer/gstreamer.pro
-@@ -19,6 +19,10 @@ LIBS += \
- -lasound
- }
-
-+unix:!contains(QT_CONFIG, xvideo) {
-+ DEFINES += QT_NO_XVIDEO
-+}
-+
- CONFIG += link_pkgconfig
-
- PKGCONFIG += \
---
-1.8.1.2
-
+++ /dev/null
-SUMMARY = "Mobile device API extensions for Qt/Embedded 4.x"
-DEPENDS = "qt4-embedded"
-SECTION = "libs"
-qtm_embedded := "embedded"
-qtm_dir = "qtopia"
-qtm_glflags := "-=opengl"
-qtm_extra_config := "gstreamer-photography_enabled = no"
-
-inherit qt4e
-require qt-mobility_${PV}.inc
-
+++ /dev/null
-SUMMARY = "Mobile device API extensions for Qt/X11 4.x"
-DEPENDS = "qt4-x11-free"
-SECTION = "x11/libs"
-qtm_embedded := ""
-qtm_dir = "qt4"
-qtm_glflags := "${@base_contains('DISTRO_FEATURES', 'opengl', '+=opengl', '-=opengl', d)} "
-qtm_extra_config := ""
-
-inherit qt4x11
-require qt-mobility_${PV}.inc
+++ /dev/null
-HOMEPAGE = "http://qt-project.org/"
-DEPENDS = "gstreamer util-linux"
-
-PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'pulseaudio', 'pulseaudio', '', d)} \
- ${@base_contains('DISTRO_FEATURES', 'bluetooth', 'bluetooth', '', d)}"
-PACKAGECONFIG[bluetooth] = ",,bluez4"
-PACKAGECONFIG[pulseaudio] = ",,pulseaudio"
-
-LICENSE = "LGPLv2.1"
-LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=fbc093901857fcd118f065f900982c24 \
- file://LGPL_EXCEPTION.txt;md5=411080a56ff917a5a1aa08c98acae354"
-
-FILESEXTRAPATHS =. "${FILE_DIRNAME}/qt-mobility-${PV}:"
-SRC_URI = "http://get.qt.nokia.com/qt/add-ons/qt-mobility-opensource-src-${PV}.tar.gz \
- file://qt-mobility-configure.patch \
- file://0001-gstvideoconnector-fixed-buffers-allocation.patch \
- file://0002-Remove-unnecessary-rpaths-from-qml_device-example.patch \
- file://qt-mobility-no-opengl.patch \
- file://gcc-scope.patch \
- file://qt-mobility-no-xvideo.patch \
- file://fix_metaobjectbuilder_build_err.patch \
- file://0001-fix-embedded-usage-doesn-t-work-outside-of-Qt.patch \
- "
-
-SRC_URI[md5sum]="ea5db5a8d3dd4709c2926dceda646bd8"
-SRC_URI[sha256sum]="ee3c88975e04139ac9589f76d4be646d44fcbc4c8c1cf2db621abc154cf0ba44"
-
-PR = "r8"
-
-S = "${WORKDIR}/qt-mobility-opensource-src-${PV}"
-
-qtm_bin := "/usr/bin/${qtm_dir}"
-qtm_lib := "/usr/lib"
-qtm_include := "/usr/include/${qtm_dir}"
-qtm_examples := "/usr/bin/${qtm_dir}/examples/QtMobility"
-qtm_demos := "/usr/bin/${qtm_dir}/demos/QtMobility"
-qtm_plugins := "/usr/lib/${qtm_dir}/plugins/QtMobility"
-qtm_data := "/usr/share/${qtm_dir}"
-qtm_imports := "/usr/lib/${qtm_dir}/imports"
-
-QTM_MODULES_LIST ?= "bearer contacts gallery location publishsubscribe messaging multimedia \
-systeminfo serviceframework sensors versit organizer feedback connectivity"
-
-do_configure_prepend() {
- cp qtmobility.pro qtmobility.pro.old
- sed -e 's@...QT_INSTALL_DATA.@${qtm_data}@' <qtmobility.pro.old >qtmobility.pro
- for NAME in plugins/declarative/*/*.pro
- do
- cp $NAME $NAME.old
- sed -e 's@...QT_INSTALL_IMPORTS.@${qtm_imports}@' <$NAME.old >$NAME
- done
- cp staticconfig.pri staticconfig.pri.old
- echo "include(${STAGING_DATADIR}/${qtm_dir}/mkspecs/qconfig.pri)" >staticconfig.pri
- cat staticconfig.pri.old >>staticconfig.pri
-
- cat > features/platformconfig/oe.pri <<EOF
-qmf_enabled = no
-networkmanager_enabled = no
-corewlan_enabled = no
-immersion_enabled = no
-meegotouchfeedback_enabled = no
-maemo-icd_enabled = no
-maemo-icd-network-wlan_enabled = no
-maemo5-contacts_enabled = no
-maemo5-calendar_enabled = no
-maemo6-landmarks_enabled = no
-bme_enabled = no
-bluez_enabled = ${@base_contains('PACKAGECONFIG', 'bluetooth', 'yes', 'no', d)}
-proj_enabled = no
-gstreamer-photography_enabled = no
-gstreamer-appsrc_enabled = yes
-blkid_enabled = yes
-pulseaudio_enabled = ${@base_contains('PACKAGECONFIG', 'pulseaudio', 'yes', 'no', d)}
-udev_enabled = yes
-iphb_enabled = no
-nfc_symbian_enabled = no
-sensord_enabled = no
-geoclue-master_enabled = no
-gypsy_enabled = no
-${qtm_extra_config}
-EOF
-
- ./configure -qmake-exec qmake2 -prefix /usr -staticconfig oe -examples -demos -modules "${QTM_MODULES_LIST}"
- echo QT_MOBILITY_BIN = ${qtm_bin} >>./config.pri
- echo QT_MOBILITY_LIB = ${qtm_lib} >>./config.pri
- echo QT_MOBILITY_INCLUDE = ${qtm_include} >>./config.pri
- echo QT_MOBILITY_PLUGINS = ${qtm_plugins} >>./config.pri
- echo QT_MOBILITY_EXAMPLES = ${qtm_examples} >>./config.pri
- echo QT_MOBILITY_DEMOS = ${qtm_demos} >>./config.pri
- echo QT_CONFIG ${qtm_glflags} >>./config.pri
- echo CONFIG += ${qtm_embedded} >>./config.pri
-}
-
-do_compile_prepend() {
- for NAME in `find ./ -name Makefile` ; do
- sed -e 's:-Wl,-rpath-link,${libdir}::g' -i $NAME
- done
-}
-
-do_install() {
- for NAME in */*.prf
- do
- cp $NAME $NAME.old
- sed -e 's@/usr@${STAGING_BINDIR}/..@' <$NAME.old >$NAME
- done
- oe_runmake install INSTALL_ROOT=${D}
-}
-
-PACKAGES = "${PN}-dbg ${PN} ${PN}-dev"
-
-FILES_${PN}-dbg = "${qtm_bin}/.debug ${qtm_examples}/.debug ${qtm_demos}/.debug \
- ${qtm_lib}/.debug ${qtm_plugins}/*/.debug ${qtm_imports}/*/.debug \
- ${qtm_imports}/*/*/.debug ${bindir}/.debug /usr/src/debug"
-FILES_${PN} = "${qtm_bin} ${qtm_examples} ${qtm_demos} ${qtm_lib}/*.so.1* ${qtm_plugins} ${qtm_imports}"
-FILES_${PN}-dev = "${exec_prefix}"
+++ /dev/null
-LICENSE = "LGPLv2.1 | GPLv3"
-LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=fbc093901857fcd118f065f900982c24 \
- file://LICENSE.GPL3;md5=6e1694ee338db410417517884918d4d2 \
- file://LGPL_EXCEPTION.txt;md5=0145c4d1b6f96a661c2c139dfb268fb6"
-
-FILESEXTRAPATHS =. "${FILE_DIRNAME}/qt4-${PV}:"
-
-SRC_URI = "http://download.qt-project.org/official_releases/qt/4.8/${PV}/qt-everywhere-opensource-src-${PV}.tar.gz \
- file://0003-webkit2-set-OUTPUT_DIR-value-if-empty.patch \
- file://0004-configure-qmake-is-already-built-in-qt4-tools-native.patch \
- file://0008-qmake.pro-Allow-building-a-separate-qmake-for-the-ta.patch \
- file://0009-qmake-fix-source-file-references-in-qmake.pri.patch \
- file://0010-configure-Hack-to-not-use-the-pg_config-of-the-host-.patch \
- file://0011-freetype-host-includes.patch \
- file://0012-Add-2bpp-support.patch \
- file://0013-configure-add-crossarch-option.patch \
- file://0014-translations-fix-phony-translation-linking-error.patch \
- file://0015-configure-add-nostrip-for-debug-packages.patch \
- file://0016-configure-eval-QMAKE_CXX.patch \
- file://0017-configure-ensure-we-identify-the-compiler-as-g-in-co.patch \
- file://0018-configure-make-pulseaudio-a-configurable-option.patch \
- file://0019-Fixes-for-gcc-4.7.0-particularly-on-qemux86.patch \
- file://0020-webkit-disable-the-fuse-ld-gold-flag.patch \
- file://0022-Fix-drawing-of-0-width-polylines-from-outside-the-de.patch \
- file://0023-QHttpMultiPart-fix-data-corruption-in-readData-metho.patch \
- file://0024-Ensure-lastPixel.y-is-also-initalized-to-1-when-nece.patch \
- file://0025-Fix-misaligned-selection-region-with-text-when-cente.patch \
- file://0027-tools.pro-disable-qmeegographicssystemhelper.patch \
- file://g++.conf \
- file://linux.conf \
- "
-
-SRC_URI[md5sum] = "1864987bdbb2f58f8ae8b350dfdbe133"
-SRC_URI[sha256sum] = "eb728f8268831dc4373be6403b7dd5d5dde03c169ad6882f9a8cb560df6aa138"
-
-S = "${WORKDIR}/qt-everywhere-opensource-src-${PV}"
-
-FILES_${QT_BASE_NAME}-tools_append = " ${bindir}/qml ${bindir}/qmlplugindump"
-FILES_${QT_BASE_NAME}-tools-dbg_append = " ${bindir}/.debug/qml ${bindir}/.debug/qmlplugindump"
-
-PACKAGES_append = " ${QT_BASE_NAME}-tests-dbg ${QT_BASE_NAME}-tests"
-FILES_${QT_BASE_NAME}-tests-dbg = "${prefix}/tests/qt4/*/.debug"
-FILES_${QT_BASE_NAME}-tests = "${prefix}/tests/qt4/*"
-
-do_configure_prepend() {
- for pro in $(find ${S} -name "*.pro") ; do
- sed -i \
- -e 's:$$QT_BUILD_TREE/bin/lrelease:${OE_QMAKE_LRELEASE}:g' \
- -e 's:qtPrepareTool(LRELEASE, lrelease):LRELEASE = ${OE_QMAKE_LRELEASE}:g' $pro
- done
-
- sed -i s:SEDME:${S}: ${WORKDIR}/linux.conf
- sed -i \
- -e /QMAKE_MOC\ /d \
- -e /QMAKE_UIC\ /d \
- -e /QMAKE_UIC3\ /d \
- -e /QMAKE_RCC\ /d \
- ${S}/configure
-
- # Avoid problems with Qt 4.8.0 configure setting QMAKE_LINK from LD (since we want the linker to be g++)
- unset LD
-}
-
+++ /dev/null
-From 55097d27e8b746b3d5ff437939caf1fa43c0d62b Mon Sep 17 00:00:00 2001
-From: Holger Freyther <zecke@selfish.org>
-Date: Wed, 26 Sep 2012 17:22:30 +0200
-Subject: [PATCH 01/21] qlibraryinfo: allow to set qt.conf from the outside
- using the environment
-
-Allow to set a qt.conf from the outside using the environment. This allows
-to inject new prefixes and other paths into qmake. This is needed when using
-the same qmake binary to build qt/x11 and qt/embedded
-
-Upstream-Status: Pending
-
-Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
----
- src/corelib/global/qlibraryinfo.cpp | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/src/corelib/global/qlibraryinfo.cpp b/src/corelib/global/qlibraryinfo.cpp
-index 180dc39..4adad35 100644
---- a/src/corelib/global/qlibraryinfo.cpp
-+++ b/src/corelib/global/qlibraryinfo.cpp
-@@ -54,6 +54,7 @@
- QT_BEGIN_NAMESPACE
- extern QString qmake_libraryInfoFile();
- QT_END_NAMESPACE
-+#include <stdlib.h>
- #else
- # include "qcoreapplication.h"
- #endif
-@@ -112,6 +113,10 @@ QSettings *QLibraryInfoPrivate::findConfiguration()
- #ifdef BOOTSTRAPPING
- if(!QFile::exists(qtconfig))
- qtconfig = qmake_libraryInfoFile();
-+ if (!QFile::exists(qtconfig)) {
-+ QByteArray config = getenv("QT_CONF_PATH");
-+ qtconfig = QFile::decodeName(config);
-+ }
- #else
- if (!QFile::exists(qtconfig) && QCoreApplication::instance()) {
- #ifdef Q_OS_MAC
---
-1.8.0
-
+++ /dev/null
-From 5e6b1051afa3099a02a758b0596236759d70670e Mon Sep 17 00:00:00 2001
-From: Wenzong Fan <wenzong.fan@windriver.com>
-Date: Wed, 26 Sep 2012 20:18:08 +0200
-Subject: [PATCH 02/21] qkbdtty_qws: fix build with old kernel headers
-
-This issue is that with C++ compiler process an old version of kernel
-header file, coincidently that file has a variable named 'new':
-
-* 'embedded/qkbdtty_qws.cpp' include 'linux/vt.h';
-* '/usr/include/linux/vt.h' has below code on SLED-11.x:
- + unsigned int new;
-
-On mostly hosts it has been changed to: new -> newev.
-
-Upstream-Status: Pending
-
-Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com>
-Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
----
- src/gui/embedded/qkbdtty_qws.cpp | 12 ++++++++++++
- 1 file changed, 12 insertions(+)
-
-diff --git a/src/gui/embedded/qkbdtty_qws.cpp b/src/gui/embedded/qkbdtty_qws.cpp
-index a46811b..762138f 100644
---- a/src/gui/embedded/qkbdtty_qws.cpp
-+++ b/src/gui/embedded/qkbdtty_qws.cpp
-@@ -54,8 +54,20 @@
-
- #if defined Q_OS_LINUX
- # include <linux/kd.h>
-+
-+/* Workaround kernel headers using "new" as variable name. The problem
-+ is specific to SLED-11, other distros use "newev" rather than "new" */
-+#ifdef __cplusplus
-+#warning "workaround kernel headers using new as variable name on SLED 11"
-+#define new newev
-+#endif
-+
- # include <linux/vt.h> //TODO: move vt handling somewhere else (QLinuxFbScreen?)
-
-+#ifdef __cplusplus
-+#undef new
-+#endif
-+
- # include "qscreen_qws.h"
- # include "qwindowsystem_qws.h"
- # include "qapplication.h"
---
-1.8.0
-
+++ /dev/null
-From b6805e883c078f7647d9234aca4e3513ebd1c9bf Mon Sep 17 00:00:00 2001
-From: Martin Jansa <Martin.Jansa@gmail.com>
-Date: Tue, 1 May 2012 07:48:15 +0200
-Subject: [PATCH 03/21] webkit2: set OUTPUT_DIR value if empty
-
-Without this do_configure was trying to create /include/WebCore/libdummy.prl in root of build host filesystem
-now it's in proper place ${WORKDIR}/qt-everywhere-opensource-src-4.8.1/src/3rdparty/webkit/include/WebCore/libdummy.prl
-
-First reported here:
-http://www.mail-archive.com/openembedded-devel@lists.openembedded.org/msg24436.html
-
-Upstream-Status: Pending
-
-Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
----
- src/3rdparty/webkit/Source/WebKit2/DerivedSources.pro | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/src/3rdparty/webkit/Source/WebKit2/DerivedSources.pro b/src/3rdparty/webkit/Source/WebKit2/DerivedSources.pro
-index 006a88c..5e17193 100644
---- a/src/3rdparty/webkit/Source/WebKit2/DerivedSources.pro
-+++ b/src/3rdparty/webkit/Source/WebKit2/DerivedSources.pro
-@@ -3,6 +3,8 @@ TARGET = dummy
-
- CONFIG -= debug_and_release
-
-+isEmpty(OUTPUT_DIR): OUTPUT_DIR = ../..
-+
- CONFIG(standalone_package) {
- isEmpty(WEBKIT2_GENERATED_SOURCES_DIR):WEBKIT2_GENERATED_SOURCES_DIR = $$PWD/generated
- isEmpty(WC_GENERATED_SOURCES_DIR):WC_GENERATED_SOURCES_DIR = $$PWD/../WebCore/generated
---
-1.8.0
-
+++ /dev/null
-From af699c6e8cf9fb28d6f8b789bf33d53b47edaec7 Mon Sep 17 00:00:00 2001
-From: Michael Krelin <hacker@klever.net>
-Date: Wed, 26 Sep 2012 20:24:20 +0200
-Subject: [PATCH 04/21] configure: qmake is already built in qt4-tools-native,
- so disable it
-
-Upstream-Status: Inappropriate [configuration]
-
-Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
----
- configure | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/configure b/configure
-index e3d464b..cc04b27 100755
---- a/configure
-+++ b/configure
-@@ -4899,7 +4899,7 @@ setBootstrapVariable()
- }
-
- # build qmake
--if true; then ###[ '!' -f "$outpath/bin/qmake" ];
-+if false; then ###[ '!' -f "$outpath/bin/qmake" ];
- echo "Creating qmake. Please wait..."
-
- OLD_QCONFIG_H=
---
-1.8.0
-
+++ /dev/null
-From ac93237bc90ea7773c0ef5275962baba01d4a9c7 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Jeremy=20Lain=C3=A9?= <jeremy.laine@m4x.org>
-Date: Wed, 26 Sep 2012 20:27:44 +0200
-Subject: [PATCH 05/21] configure: set LFLAGS to pick up zlib from staging
-
-Upstream-Status: Pending
-
-Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
----
- configure | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/configure b/configure
-index cc04b27..5a7c4ee 100755
---- a/configure
-+++ b/configure
-@@ -690,7 +690,7 @@ fi
- # initalize variables
- #-------------------------------------------------------------------------------
-
--SYSTEM_VARIABLES="RANLIB STRIP OBJDUMP LD CC CXX CFLAGS CXXFLAGS LDFLAGS"
-+SYSTEM_VARIABLES="RANLIB STRIP OBJDUMP LD CC CXX CFLAGS CXXFLAGS LDFLAGS LFLAGS"
- for varname in $SYSTEM_VARIABLES; do
- qmakevarname="${varname}"
- # use LDFLAGS for autoconf compat, but qmake uses QMAKE_LFLAGS
---
-1.8.0
-
+++ /dev/null
-From 0bc0db83812b5900dc4e6ffa96bdeab46b6adcae Mon Sep 17 00:00:00 2001
-From: Paul Eggleton <paul.eggleton@linux.intel.com>
-Date: Wed, 26 Sep 2012 20:29:09 +0200
-Subject: [PATCH 06/21] configure: Use OE_QMAKE_* values to specify Qt utility
- paths
-
-Upstream-Status: Inappropriate [configuration]
-
-Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
-Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
----
- configure | 10 +++++-----
- 1 file changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/configure b/configure
-index 5a7c4ee..db4d044 100755
---- a/configure
-+++ b/configure
-@@ -8683,11 +8683,11 @@ QMAKE_ABSOLUTE_SOURCE_ROOT = \$\$QT_SOURCE_TREE
- QMAKE_MOC_SRC = \$\$QT_BUILD_TREE/src/moc
-
- #local paths that cannot be queried from the QT_INSTALL_* properties while building QTDIR
--QMAKE_MOC = \$\$QT_BUILD_TREE/bin/moc
--QMAKE_UIC = \$\$QT_BUILD_TREE/bin/uic
--QMAKE_UIC3 = \$\$QT_BUILD_TREE/bin/uic3
--QMAKE_RCC = \$\$QT_BUILD_TREE/bin/rcc
--QMAKE_QDBUSXML2CPP = \$\$QT_BUILD_TREE/bin/qdbusxml2cpp
-+QMAKE_MOC = \${OE_QMAKE_MOC}
-+QMAKE_UIC = \${OE_QMAKE_UIC}
-+QMAKE_UIC3 = \${OE_QMAKE_UIC3}
-+QMAKE_RCC = \${OE_QMAKE_RCC}
-+QMAKE_QDBUSXML2CPP = \${OE_QMAKE_QDBUSXML2CPP}
- QMAKE_INCDIR_QT = \$\$QT_BUILD_TREE/include
- QMAKE_LIBDIR_QT = \$\$QT_BUILD_TREE/lib
-
---
-1.8.0
-
+++ /dev/null
-From 2011bb8029480af1d1266f258e5a5f5cef7392d3 Mon Sep 17 00:00:00 2001
-From: Pavel Heimlich <tropikhajma@gmail.com>
-Date: Wed, 26 Sep 2012 20:31:10 +0200
-Subject: [PATCH 07/21] dbus: Remove "const" usage that causes compile failure
- building nativesdk-qt4-tools
-
-Patch has apparently been rejected upstream, not because it is invalid
-but because the submitter did not submit a merge request for it, so the
-validity of the patch upstream is uncertain. For further details see:
-http://bugreports.qt.nokia.com/browse/QTBUG-17962
-
-Upstream-Status: Denied [possible retry]
-
-Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
----
- src/dbus/qdbusintegrator.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/dbus/qdbusintegrator.cpp b/src/dbus/qdbusintegrator.cpp
-index 0f0b647..aa4cbab 100644
---- a/src/dbus/qdbusintegrator.cpp
-+++ b/src/dbus/qdbusintegrator.cpp
-@@ -73,7 +73,7 @@ QT_BEGIN_NAMESPACE
- static bool isDebugging;
- #define qDBusDebug if (!::isDebugging); else qDebug
-
--Q_GLOBAL_STATIC_WITH_ARGS(const QString, orgFreedesktopDBusString, (QLatin1String(DBUS_SERVICE_DBUS)))
-+Q_GLOBAL_STATIC_WITH_ARGS(QString, orgFreedesktopDBusString, (QLatin1String(DBUS_SERVICE_DBUS)))
-
- static inline QString dbusServiceString()
- { return *orgFreedesktopDBusString(); }
---
-1.8.0
-
+++ /dev/null
-From 64ce5d0e7c19436b928a2a0d9d192f56be3c9bb2 Mon Sep 17 00:00:00 2001
-From: Paul Eggleton <paul.eggleton@linux.intel.com>
-Date: Wed, 26 Sep 2012 20:32:41 +0200
-Subject: [PATCH 08/21] qmake.pro: Allow building a separate qmake for the
- target
-
-Upstream-Status: Inappropriate [config]
-
-Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
-Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
----
- qmake/qmake.pro | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/qmake/qmake.pro b/qmake/qmake.pro
-index 38e0fce..53b1ffb 100644
---- a/qmake/qmake.pro
-+++ b/qmake/qmake.pro
-@@ -7,6 +7,7 @@ CONFIG += console bootstrap
- CONFIG -= qt shared app_bundle uic
- DEFINES += QT_BUILD_QMAKE QT_BOOTSTRAPPED
- DESTDIR = ../bin/
-+TARGET = qmake2
-
- OBJECTS_DIR = .
- MOC_DIR = .
---
-1.8.0
-
+++ /dev/null
-From e129dc0d6cde69dd15d1836c4111e0526fc29161 Mon Sep 17 00:00:00 2001
-From: Paul Eggleton <paul.eggleton@linux.intel.com>
-Date: Wed, 26 Sep 2012 20:33:49 +0200
-Subject: [PATCH 09/21] qmake: fix source file references in qmake.pri
-
-Fix duplicate entries in SOURCES and HEADERS, and fix the source file
-list for the split of qlocale.cpp.
-
-Upstream-Status: Pending
-
-Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
-Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
----
- qmake/qmake.pri | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/qmake/qmake.pri b/qmake/qmake.pri
-index 31f67f4..9081669 100644
---- a/qmake/qmake.pri
-+++ b/qmake/qmake.pri
-@@ -22,8 +22,7 @@ SOURCES += project.cpp property.cpp main.cpp generators/makefile.cpp \
- generators/symbian/initprojectdeploy_symbian.cpp \
- generators/integrity/gbuild.cpp \
- windows/registry.cpp \
-- symbian/epocroot.cpp \
-- generators/integrity/gbuild.cpp
-+ symbian/epocroot.cpp
-
- HEADERS += project.h property.h generators/makefile.h \
- generators/unix/unixmake.h meta.h option.h cachekeys.h \
-@@ -40,8 +39,7 @@ HEADERS += project.h property.h generators/makefile.h \
- generators/symbian/initprojectdeploy_symbian.h \
- generators/integrity/gbuild.h \
- windows/registry_p.h \
-- symbian/epocroot_p.h \
-- generators/integrity/gbuild.h
-+ symbian/epocroot_p.h
-
- contains(QT_EDITION, OpenSource) {
- DEFINES += QMAKE_OPENSOURCE_EDITION
-@@ -72,6 +70,8 @@ bootstrap { #Qt code
- qlist.cpp \
- qlinkedlist.cpp \
- qlocale.cpp \
-+ qlocale_tools.cpp \
-+ qlocale_unix.cpp \
- qmalloc.cpp \
- qmap.cpp \
- qmetatype.cpp \
---
-1.8.0
-
+++ /dev/null
-From 4888791d1899f781af710dd8813887dea52fda59 Mon Sep 17 00:00:00 2001
-From: Holger Freyther <zecke@selfish.org>
-Date: Wed, 26 Sep 2012 20:36:38 +0200
-Subject: [PATCH 10/21] configure: Hack to not use the pg_config of the host
- system which will add /usr/include
-
-pg_config is a native binary so using that when cross compiling
-will always fail. The commented out fix would do, but for OE
-our -platform and -xplatform is the same so we are actually not
-really cross compiling. Just comment out the test, we are passing
-the location to the postgres headers and if they are okay we
-will pad.
-
-Upstream-Status: Inappropriate [configuration]
-
-Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
----
- configure | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/configure b/configure
-index db4d044..35a8fe7 100755
---- a/configure
-+++ b/configure
-@@ -5511,10 +5511,10 @@ for _SQLDR in $CFG_SQL_AVAILABLE; do
- psql)
- if [ "$CFG_SQL_psql" != "no" ]; then
- # Be careful not to use native pg_config when cross building.
-- if [ "$XPLATFORM_MINGW" != "yes" ] && "$WHICH" pg_config >/dev/null 2>&1; then
-- QT_CFLAGS_PSQL=`pg_config --includedir 2>/dev/null`
-- QT_LFLAGS_PSQL=`pg_config --libdir 2>/dev/null`
-- fi
-+# if [ "$XPLATFORM_MINGW" != "yes" ] && "$WHICH" pg_config >/dev/null 2>&1; then
-+# QT_CFLAGS_PSQL=`pg_config --includedir 2>/dev/null`
-+# QT_LFLAGS_PSQL=`pg_config --libdir 2>/dev/null`
-+# fi
- [ -z "$QT_CFLAGS_PSQL" ] || QT_CFLAGS_PSQL="-I$QT_CFLAGS_PSQL"
- [ -z "$QT_LFLAGS_PSQL" ] || QT_LFLAGS_PSQL="-L$QT_LFLAGS_PSQL"
- # But, respect PSQL_LIBS if set
---
-1.8.0
-
+++ /dev/null
-From 3fcffa79e6a5f0448cbfe2bb33fe1218f5dae61d Mon Sep 17 00:00:00 2001
-From: Michael Krelin <hacker@klever.net>
-Date: Mon, 4 Jun 2007 14:48:50 +0200
-Subject: [PATCH 11/21] freetype host includes
-
-Host include path should not be used in cross compiling case.
-
-Ported from OE by: Yu Ke <ke.yu@intel.com>
-Upstream-Status: Pending
-
-Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
----
- config.tests/unix/freetype/freetype.pri | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/config.tests/unix/freetype/freetype.pri b/config.tests/unix/freetype/freetype.pri
-index 7ef1cf9..b362fcd 100644
---- a/config.tests/unix/freetype/freetype.pri
-+++ b/config.tests/unix/freetype/freetype.pri
-@@ -1,5 +1,5 @@
- !cross_compile {
-- TRY_INCLUDEPATHS = /include /usr/include $$QMAKE_INCDIR $$QMAKE_INCDIR_X11 $$INCLUDEPATH
-+ TRY_INCLUDEPATHS = $$QMAKE_INCDIR $$QMAKE_INCDIR_X11 $$INCLUDEPATH
- # LSB doesn't allow using headers from /include or /usr/include
- linux-lsb-g++:TRY_INCLUDEPATHS = $$QMAKE_INCDIR $$QMAKE_INCDIR_X11 $$INCLUDEPATH
- for(p, TRY_INCLUDEPATHS) {
---
-1.8.0
-
+++ /dev/null
-From 8744273fc452eb54bbeeb7d15823009ce926c6fa Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Jeremy=20Lain=C3=A9?= <jeremy.laine@m4x.org>
-Date: Wed, 26 Sep 2012 20:39:21 +0200
-Subject: [PATCH 12/21] Add 2bpp support
-
-Submitted upstream but rejected as being "out of scope":
-http://bugreports.qt.nokia.com/browse/QTBUG-3468
-
-Upstream-Status: Denied
-
-Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
----
- configure | 5 +-
- src/gui/embedded/qscreen_qws.cpp | 211 ++++++++++++++++++++++++++++++++
- src/gui/embedded/qscreenlinuxfb_qws.cpp | 4 +-
- 3 files changed, 216 insertions(+), 4 deletions(-)
-
-diff --git a/configure b/configure
-index 35a8fe7..79c1c7b 100755
---- a/configure
-+++ b/configure
-@@ -7063,6 +7063,7 @@ if [ "$CFG_QWS_DEPTHS" = "prompted" -a "$PROMPT_FOR_DEPTHS" = "yes" ]; then
- echo "Choose pixel-depths to support:"
- echo
- echo " 1. 1bpp, black/white"
-+ echo " 2. 2bpp, grayscale"
- echo " 4. 4bpp, grayscale"
- echo " 8. 8bpp, paletted"
- echo " 12. 12bpp, rgb 4-4-4"
-@@ -7081,11 +7082,11 @@ if [ "$CFG_QWS_DEPTHS" = "prompted" -a "$PROMPT_FOR_DEPTHS" = "yes" ]; then
- fi
- if [ -n "$CFG_QWS_DEPTHS" -a "$PLATFORM_QWS" = "yes" ]; then
- if [ "$CFG_QWS_DEPTHS" = "all" ]; then
-- CFG_QWS_DEPTHS="1 4 8 12 15 16 18 24 32 generic"
-+ CFG_QWS_DEPTHS="1 2 4 8 12 15 16 18 24 32 generic"
- fi
- for D in `echo "$CFG_QWS_DEPTHS" | sed -e 's/,/ /g'`; do
- case $D in
-- 1|4|8|12|15|16|18|24|32) QCONFIG_FLAGS="$QCONFIG_FLAGS QT_QWS_DEPTH_$D";;
-+ 1|2|4|8|12|15|16|18|24|32) QCONFIG_FLAGS="$QCONFIG_FLAGS QT_QWS_DEPTH_$D";;
- generic) QCONFIG_FLAGS="$QCONFIG_FLAGS QT_QWS_DEPTH_GENERIC";;
- esac
- done
-diff --git a/src/gui/embedded/qscreen_qws.cpp b/src/gui/embedded/qscreen_qws.cpp
-index b307bf2..88950b3 100644
---- a/src/gui/embedded/qscreen_qws.cpp
-+++ b/src/gui/embedded/qscreen_qws.cpp
-@@ -469,6 +469,58 @@ static void solidFill_gray4(QScreen *screen, const QColor &color,
- }
- #endif // QT_QWS_DEPTH_4
-
-+#ifdef QT_QWS_DEPTH_2
-+static inline void qt_rectfill_gray2(quint8 *dest, quint8 value,
-+ int x, int y, int width, int height,
-+ int stride)
-+{
-+ const int pixelsPerByte = 4;
-+ const int alignWidth = qMin(width, (4 - (x & 3)) & 3);
-+ const int doAlign = (alignWidth > 0 ? 1 : 0);
-+ const int alignStart = pixelsPerByte - 1 - (x & 3);
-+ const int alignStop = alignStart - (alignWidth - 1);
-+ const quint8 alignMask = ((1 << (2 * alignWidth)) - 1) << (2 * alignStop);
-+ const int tailWidth = (width - alignWidth) & 3;
-+ const int doTail = (tailWidth > 0 ? 1 : 0);
-+ const quint8 tailMask = (1 << (2 * (pixelsPerByte - tailWidth))) - 1;
-+ const int width8 = (width - alignWidth) / pixelsPerByte;
-+
-+ dest += y * stride + x / pixelsPerByte;
-+ stride -= (doAlign + width8);
-+
-+ for (int j = 0; j < height; ++j) {
-+ if (doAlign) {
-+ *dest = (*dest & ~alignMask) | (value & alignMask);
-+ ++dest;
-+ }
-+ if (width8) {
-+ qt_memfill<quint8>(dest, value, width8);
-+ dest += width8;
-+ }
-+ if (doTail)
-+ *dest = (*dest & tailMask) | (value & ~tailMask);
-+ dest += stride;
-+ }
-+}
-+
-+static void solidFill_gray2(QScreen *screen, const QColor &color,
-+ const QRegion ®ion)
-+{
-+ quint8 *dest = reinterpret_cast<quint8*>(screen->base());
-+ const quint8 c = qGray(color.rgba()) >> 6;
-+ const quint8 c8 = (c << 6) | (c << 4) | (c << 2) | c;
-+
-+ const int stride = screen->linestep();
-+ const QVector<QRect> rects = region.rects();
-+
-+ for (int i = 0; i < rects.size(); ++i) {
-+ const QRect r = rects.at(i);
-+ qt_rectfill_gray2(dest, c8, r.x(), r.y(), r.width(), r.height(),
-+ stride);
-+ }
-+}
-+#endif // QT_QWS_DEPTH_2
-+
- #ifdef QT_QWS_DEPTH_1
- static inline void qt_rectfill_mono(quint8 *dest, quint8 value,
- int x, int y, int width, int height,
-@@ -576,6 +628,11 @@ void qt_solidFill_setup(QScreen *screen, const QColor &color,
- screen->d_ptr->solidFill = solidFill_gray4;
- break;
- #endif
-+#ifdef QT_QWS_DEPTH_2
-+ case 2:
-+ screen->d_ptr->solidFill = solidFill_gray2;
-+ break;
-+#endif
- #ifdef QT_QWS_DEPTH_1
- case 1:
- screen->d_ptr->solidFill = solidFill_mono;
-@@ -1006,6 +1063,149 @@ static void blit_4(QScreen *screen, const QImage &image,
- }
- #endif // QT_QWS_DEPTH_4
-
-+#ifdef QT_QWS_DEPTH_2
-+
-+struct qgray2 { quint8 dummy; } Q_PACKED;
-+
-+template <typename SRC>
-+static inline quint8 qt_convertToGray2(SRC color);
-+
-+template <>
-+inline quint8 qt_convertToGray2(quint32 color)
-+{
-+ return qGray(color) >> 6;
-+}
-+
-+template <>
-+inline quint8 qt_convertToGray2(quint16 color)
-+{
-+ const int r = (color & 0xf800) >> 11;
-+ const int g = (color & 0x07e0) >> 6; // only keep 5 bit
-+ const int b = (color & 0x001f);
-+ return (r * 11 + g * 16 + b * 5) >> 8;
-+}
-+
-+template <>
-+inline quint8 qt_convertToGray2(qrgb444 color)
-+{
-+ return qt_convertToGray2(quint32(color));
-+}
-+
-+template <>
-+inline quint8 qt_convertToGray2(qargb4444 color)
-+{
-+ return qt_convertToGray2(quint32(color));
-+}
-+
-+template <typename SRC>
-+static inline void qt_rectconvert_gray2(qgray2 *dest2, const SRC *src,
-+ int x, int y, int width, int height,
-+ int dstStride, int srcStride)
-+{
-+ const int pixelsPerByte = 4;
-+ quint8 *dest8 = reinterpret_cast<quint8*>(dest2)
-+ + y * dstStride + x / pixelsPerByte;
-+ const int alignWidth = qMin(width, (4 - (x & 3)) & 3);
-+ const int doAlign = (alignWidth > 0 ? 1 : 0);
-+ const int alignStart = pixelsPerByte - 1 - (x & 3);
-+ const int alignStop = alignStart - (alignWidth - 1);
-+ const quint8 alignMask = ((1 << (2 * alignWidth)) - 1) << (2 * alignStop);
-+ const int tailWidth = (width - alignWidth) & 3;
-+ const int doTail = (tailWidth > 0 ? 1 : 0);
-+ const quint8 tailMask = (1 << (2 * (pixelsPerByte - tailWidth))) - 1;
-+ const int width8 = (width - alignWidth) / pixelsPerByte;
-+
-+ srcStride = srcStride / sizeof(SRC) - (width8 * pixelsPerByte + alignWidth);
-+ dstStride -= (width8 + doAlign);
-+
-+ for (int j = 0; j < height; ++j) {
-+ if (doAlign) {
-+ quint8 d = *dest8 & ~alignMask;
-+ for (int i = alignStart; i >= alignStop; --i)
-+ d |= qt_convertToGray2<SRC>(*src++) << (2 * i);
-+ *dest8++ = d;
-+ }
-+ for (int i = 0; i < width8; ++i) {
-+ *dest8 = (qt_convertToGray2<SRC>(src[0]) << 6)
-+ | (qt_convertToGray2<SRC>(src[1]) << 4)
-+ | (qt_convertToGray2<SRC>(src[2]) << 2)
-+ | (qt_convertToGray2<SRC>(src[3]));
-+ src += 4;
-+ ++dest8;
-+ }
-+ if (doTail) {
-+ quint8 d = *dest8 & tailMask;
-+ switch (tailWidth) {
-+ case 3: d |= qt_convertToGray2<SRC>(src[2]) << 2;
-+ case 2: d |= qt_convertToGray2<SRC>(src[1]) << 4;
-+ case 1: d |= qt_convertToGray2<SRC>(src[0]) << 6;
-+ }
-+ *dest8 = d;
-+ }
-+
-+ dest8 += dstStride;
-+ src += srcStride;
-+ }
-+}
-+
-+template <>
-+void qt_rectconvert(qgray2 *dest, const quint32 *src,
-+ int x, int y, int width, int height,
-+ int dstStride, int srcStride)
-+{
-+ qt_rectconvert_gray2<quint32>(dest, src, x, y, width, height,
-+ dstStride, srcStride);
-+}
-+
-+template <>
-+void qt_rectconvert(qgray2 *dest, const quint16 *src,
-+ int x, int y, int width, int height,
-+ int dstStride, int srcStride)
-+{
-+ qt_rectconvert_gray2<quint16>(dest, src, x, y, width, height,
-+ dstStride, srcStride);
-+}
-+
-+template <>
-+void qt_rectconvert(qgray2 *dest, const qrgb444 *src,
-+ int x, int y, int width, int height,
-+ int dstStride, int srcStride)
-+{
-+ qt_rectconvert_gray2<qrgb444>(dest, src, x, y, width, height,
-+ dstStride, srcStride);
-+}
-+
-+template <>
-+void qt_rectconvert(qgray2 *dest, const qargb4444 *src,
-+ int x, int y, int width, int height,
-+ int dstStride, int srcStride)
-+{
-+ qt_rectconvert_gray2<qargb4444>(dest, src, x, y, width, height,
-+ dstStride, srcStride);
-+}
-+
-+static void blit_2(QScreen *screen, const QImage &image,
-+ const QPoint &topLeft, const QRegion ®ion)
-+{
-+ switch (image.format()) {
-+ case QImage::Format_ARGB32_Premultiplied:
-+ blit_template<qgray2, quint32>(screen, image, topLeft, region);
-+ return;
-+ case QImage::Format_RGB16:
-+ blit_template<qgray2, quint16>(screen, image, topLeft, region);
-+ return;
-+ case QImage::Format_RGB444:
-+ blit_template<qgray2, qrgb444>(screen, image, topLeft, region);
-+ return;
-+ case QImage::Format_ARGB4444_Premultiplied:
-+ blit_template<qgray2, qargb4444>(screen, image, topLeft, region);
-+ return;
-+ default:
-+ qCritical("blit_2(): Image format %d not supported!", image.format());
-+ }
-+}
-+#endif // QT_QWS_DEPTH_2
-+
- #ifdef QT_QWS_DEPTH_1
-
- struct qmono { quint8 dummy; } Q_PACKED;
-@@ -1259,6 +1459,11 @@ void qt_blit_setup(QScreen *screen, const QImage &image,
- screen->d_ptr->blit = blit_4;
- break;
- #endif
-+#ifdef QT_QWS_DEPTH_2
-+ case 2:
-+ screen->d_ptr->blit = blit_2;
-+ break;
-+#endif
- #ifdef QT_QWS_DEPTH_1
- case 1:
- screen->d_ptr->blit = blit_1;
-@@ -2146,6 +2351,8 @@ int QScreen::alloc(unsigned int r,unsigned int g,unsigned int b)
- }
- } else if (d == 4) {
- ret = qGray(r, g, b) >> 4;
-+ } else if (d == 2) {
-+ ret = qGray(r, g, b) >> 6;
- } else if (d == 1) {
- ret = qGray(r, g, b) >= 128;
- } else {
-@@ -2216,6 +2423,10 @@ bool QScreen::supportsDepth(int d) const
- } else if(d==1) {
- return true;
- #endif
-+#ifdef QT_QWS_DEPTH_2
-+ } else if(d==2) {
-+ return true;
-+#endif
- #ifdef QT_QWS_DEPTH_4
- } else if(d==4) {
- return true;
-diff --git a/src/gui/embedded/qscreenlinuxfb_qws.cpp b/src/gui/embedded/qscreenlinuxfb_qws.cpp
-index 6f3caad..14159ee 100644
---- a/src/gui/embedded/qscreenlinuxfb_qws.cpp
-+++ b/src/gui/embedded/qscreenlinuxfb_qws.cpp
-@@ -466,8 +466,8 @@ bool QLinuxFbScreen::connect(const QString &displaySpec)
- setupOffScreen();
-
- // Now read in palette
-- if((vinfo.bits_per_pixel==8) || (vinfo.bits_per_pixel==4)) {
-- screencols= (vinfo.bits_per_pixel==8) ? 256 : 16;
-+ if((vinfo.bits_per_pixel==8) || (vinfo.bits_per_pixel==4) || (vinfo.bits_per_pixel==2)) {
-+ screencols= 1 << vinfo.bits_per_pixel;
- int loopc;
- ::fb_cmap startcmap;
- startcmap.start=0;
---
-1.8.0
-
+++ /dev/null
-From 549342fa380ed2a9ad41be3d04ee2f0585f6a465 Mon Sep 17 00:00:00 2001
-From: Michael Lauer <mickey@vanille-media.de>
-Date: Wed, 26 Sep 2012 20:41:32 +0200
-Subject: [PATCH 13/21] configure: add "-crossarch" option
-
-Upstream-Status: Pending
-
-Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
----
- configure | 7 ++++++-
- 1 file changed, 6 insertions(+), 1 deletion(-)
-
-diff --git a/configure b/configure
-index 79c1c7b..7983c3d 100755
---- a/configure
-+++ b/configure
-@@ -1153,7 +1153,7 @@ while [ "$#" -gt 0 ]; do
- shift
- VAL=$1
- ;;
-- -prefix|-docdir|-headerdir|-plugindir|-importdir|-datadir|-libdir|-bindir|-translationdir|-sysconfdir|-examplesdir|-demosdir|-depths|-make|-nomake|-platform|-xplatform|-device-option|-buildkey|-sdk|-arch|-host-arch|-mysql_config|-sysroot)
-+ -prefix|-docdir|-headerdir|-plugindir|-importdir|-datadir|-libdir|-bindir|-translationdir|-sysconfdir|-examplesdir|-demosdir|-depths|-make|-nomake|-platform|-xplatform|-device-option|-buildkey|-sdk|-arch|-host-arch|-mysql_config|-sysroot|-crossarch)
- VAR=`echo $1 | sed "s,^-\(.*\),\1,"`
- shift
- VAL="$1"
-@@ -1709,6 +1709,9 @@ while [ "$#" -gt 0 ]; do
- DEV_VAL=`echo $VAL | sed "s,^.*=\(.*\),\1,"`
- DeviceVar set $DEV_VAR $DEV_VAL
- ;;
-+ crossarch)
-+ CROSSARCH="$VAL"
-+ ;;
- debug-and-release)
- if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then
- CFG_DEBUG_RELEASE="$VAL"
-@@ -3324,6 +3327,8 @@ arm*)
- ;;
- esac
-
-+CFG_ARCH="$CROSSARCH"
-+
- if [ -d "$relpath/src/corelib/arch/$CFG_ARCH" ]; then
- if [ "$OPT_VERBOSE" = "yes" ]; then
- echo " '$CFG_ARCH' is supported"
---
-1.8.0
-
+++ /dev/null
-From 21af8f6d21b28a53041affb11b58d6316023fa92 Mon Sep 17 00:00:00 2001
-From: Otavio Salvador <otavio@ossystems.com.br>
-Date: Wed, 26 Sep 2012 20:45:10 +0200
-Subject: [PATCH 14/21] translations: fix phony translation linking error
-
- | .../usr/lib/crt1.o: In function `_start':
- | .../../sysdeps/i386/elf/start.S:115: undefined reference to `main'
- | collect2: ld returned 1 exit status
-
-Upstream-Status: Pending
-
-Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
----
- translations/translations.pro | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/translations/translations.pro b/translations/translations.pro
-index dc99beb..0d98829 100644
---- a/translations/translations.pro
-+++ b/translations/translations.pro
-@@ -101,7 +101,7 @@ updateqm.name = LRELEASE ${QMAKE_FILE_IN}
- updateqm.CONFIG += no_link
- QMAKE_EXTRA_COMPILERS += updateqm
-
--isEmpty(vcproj) {
-+!isEmpty(vcproj) {
- QMAKE_LINK = @: IGNORE THIS LINE
- OBJECTS_DIR =
- win32:CONFIG -= embed_manifest_exe
-@@ -111,7 +111,7 @@ isEmpty(vcproj) {
- phony_src.input = PHONY_DEPS
- phony_src.output = phony.c
- phony_src.variable_out = GENERATED_SOURCES
-- phony_src.commands = echo int main() { return 0; } > phony.c
-+ phony_src.commands = echo \"int main() { return 0; }\" > phony.c
- phony_src.name = CREATE phony.c
- phony_src.CONFIG += combine
- QMAKE_EXTRA_COMPILERS += phony_src
---
-1.8.0
-
+++ /dev/null
-From 9250fed086a4a8a645a972764a9bf34e4566ec2e Mon Sep 17 00:00:00 2001
-From: Fathi Boudra <fabo@debian.org>
-Date: Wed, 26 Sep 2012 20:46:14 +0200
-Subject: [PATCH 15/21] configure: add nostrip for debug packages
-
-Qt is built in release mode and strip files by default.
-Set CONFIG+=nostrip to avoid the stripping and
-let dh_strip do it to generate debug packages.
-
-Upstream-Status: Inappropriate [Configuration]
-
-Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
----
- configure | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/configure b/configure
-index 7983c3d..d02824b 100755
---- a/configure
-+++ b/configure
-@@ -710,6 +710,8 @@ mkdir -p "$outpath/config.tests"
- rm -f "$outpath/config.tests/.qmake.cache"
- cp "$QMAKE_VARS_FILE" "$outpath/config.tests/.qmake.cache"
-
-+QMakeVar add CONFIG nostrip
-+
- QMakeVar add styles "cde mac motif plastique cleanlooks windows"
- QMakeVar add decorations "default windows styled"
- QMakeVar add mouse-drivers "pc"
---
-1.8.0
-
+++ /dev/null
-From 8403634a71f067eec514b6d2193cf41e281dff8e Mon Sep 17 00:00:00 2001
-From: Paul Eggleton <paul.eggleton@linux.intel.com>
-Date: Wed, 26 Sep 2012 20:47:08 +0200
-Subject: [PATCH 16/21] configure: eval QMAKE_CXX
-
-Allow expansion of $(...) references in QMAKE_CXX (currently its value
-is $(OE_QMAKE_CXX)) in order to allow compiler version check to succeed
-which allows WebKit to be enabled.
-
-Upstream-Status: Pending
-
-Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
-Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
-
-Conflicts:
- configure
----
- configure | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/configure b/configure
-index d02824b..891d6e7 100755
---- a/configure
-+++ b/configure
-@@ -3409,7 +3409,8 @@ else
- CFG_FRAMEWORK=no
- fi
-
--QMAKE_CONF_COMPILER=`getXQMakeConf QMAKE_CXX`
-+QMAKE_CONF_COMPILER=`getXQMakeConf QMAKE_CXX | sed -n 's/$[(]\([0-9a-zA-Z_]*\)[)]/$\1/pg'`
-+QMAKE_CONF_COMPILER=`eval "echo $QMAKE_CONF_COMPILER"`
- TEST_COMPILER="$CXX"
-
- [ -z "$TEST_COMPILER" ] && TEST_COMPILER=$QMAKE_CONF_COMPILER
---
-1.8.0
-
+++ /dev/null
-From d2bb701b551402f0befddd0e906423596bdc0df7 Mon Sep 17 00:00:00 2001
-From: Paul Eggleton <paul.eggleton@linux.intel.com>
-Date: Wed, 26 Sep 2012 20:48:37 +0200
-Subject: [PATCH 17/21] configure: ensure we identify the compiler as g++ in
- configure
-
-Our PLATFORM in OE is ${TARGET_OS}-oe-g++, and previously the configure
-script was interpreting from this that the compiler was "oe-g++" and
-thus
-g++ specific checks were not being run since this string did not match;
-among other things this resulted in a compiler version check in the
-QtWebKit build code not working, and hence the following error at build
-time:
-
-./wtf/NullPtr.h:48:1: error: identifier 'nullptr' will become a keyword
-in C++0x [-Werror=c++0x-compat]
-
-The easiest thing since our PLATFORM is entirely artificial is to just
-force COMPILER to "g++" in the configure script if it is detected as
-"oe-g++".
-
-Upstream-Status: Inappropriate [configuration]
-
-Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
-Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
----
- configure | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/configure b/configure
-index 891d6e7..7031898 100755
---- a/configure
-+++ b/configure
-@@ -7592,6 +7592,9 @@ elif [ "$XPLATFORM" != "$PLATFORM" ]; then
- else
- COMPILER=`echo $PLATFORM | cut -f 2- -d-`
- fi
-+case $COMPILER in
-+ *oe-g++) COMPILER="g++" ;;
-+esac
- if [ "$CFG_EXCEPTIONS" = "unspecified" -a "$PLATFORM_QWS" = "yes" ]; then
- CFG_EXCEPTIONS=no
- fi
---
-1.8.0
-
+++ /dev/null
-From d6dc1a7d6594d7e395347732a3e553fc82ccab3d Mon Sep 17 00:00:00 2001
-From: Paul Eggleton <paul.eggleton@linux.intel.com>
-Date: Tue, 28 Feb 2012 15:10:24 +0000
-Subject: [PATCH 18/21] configure: make pulseaudio a configurable option
-
-Allows disabling pulseaudio support within phonon at configure time.
-(This is the Qt 4.8.0 version.)
-
-Upstream-Status: Pending
-
-Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
-Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
----
- configure | 9 ++++++++-
- 1 file changed, 8 insertions(+), 1 deletion(-)
-
-diff --git a/configure b/configure
-index 7031898..a4a42f1 100755
---- a/configure
-+++ b/configure
-@@ -1139,7 +1139,7 @@ while [ "$#" -gt 0 ]; do
- VAL=no
- ;;
- #Qt style yes options
-- -incremental|-qvfb|-profile|-shared|-static|-sm|-xinerama|-xshape|-xsync|-xinput|-egl|-reduce-exports|-pch|-separate-debug-info|-stl|-freetype|-xcursor|-xfixes|-xrandr|-xrender|-mitshm|-fontconfig|-xkb|-nis|-qdbus|-dbus|-dbus-linked|-glib|-gstreamer|-gtkstyle|-cups|-iconv|-largefile|-h|-help|-v|-verbose|-debug|-release|-fast|-accessibility|-confirm-license|-gnumake|-framework|-qt3support|-debug-and-release|-exceptions|-cocoa|-carbon|-universal|-harfbuzz|-prefix-install|-silent|-armfpa|-optimized-qmake|-dwarf2|-reduce-relocations|-sse|-openssl|-openssl-linked|-ptmalloc|-xmlpatterns|-phonon|-phonon-backend|-multimedia|-audio-backend|-svg|-declarative|-declarative-debug|-javascript-jit|-script|-scripttools|-rpath|-force-pkg-config|-s60|-usedeffiles|-icu)
-+ -incremental|-qvfb|-profile|-shared|-static|-sm|-xinerama|-xshape|-xsync|-xinput|-egl|-reduce-exports|-pch|-separate-debug-info|-stl|-freetype|-xcursor|-xfixes|-xrandr|-xrender|-mitshm|-fontconfig|-xkb|-nis|-qdbus|-dbus|-dbus-linked|-glib|-gstreamer|-pulseaudio|-gtkstyle|-cups|-iconv|-largefile|-h|-help|-v|-verbose|-debug|-release|-fast|-accessibility|-confirm-license|-gnumake|-framework|-qt3support|-debug-and-release|-exceptions|-cocoa|-carbon|-universal|-harfbuzz|-prefix-install|-silent|-armfpa|-optimized-qmake|-dwarf2|-reduce-relocations|-sse|-openssl|-openssl-linked|-ptmalloc|-xmlpatterns|-phonon|-phonon-backend|-multimedia|-audio-backend|-svg|-declarative|-declarative-debug|-javascript-jit|-script|-scripttools|-rpath|-force-pkg-config|-s60|-usedeffiles|-icu)
- VAR=`echo $1 | sed "s,^-\(.*\),\1,"`
- VAL=yes
- ;;
-@@ -2120,6 +2120,13 @@ while [ "$#" -gt 0 ]; do
- UNKNOWN_OPT=yes
- fi
- ;;
-+ pulseaudio)
-+ if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then
-+ CFG_PULSEAUDIO="$VAL"
-+ else
-+ UNKNOWN_OPT=yes
-+ fi
-+ ;;
- gtkstyle)
- if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then
- CFG_QGTKSTYLE="$VAL"
---
-1.8.0
-
+++ /dev/null
-From 1f1da2f24d3028b250dbc2e98e2b7e37862b3771 Mon Sep 17 00:00:00 2001
-From: Richard Purdie <richard.purdie@linuxfoundation.org>
-Date: Wed, 26 Sep 2012 20:54:38 +0200
-Subject: [PATCH 19/21] Fixes for gcc 4.7.0, particularly on qemux86
-
-Origin: upstream, http://trac.webkit.org/changeset/93631
-Origin: upstream, http://trac.webkit.org/changeset/113848
-
-Bug: https://bugs.webkit.org/show_bug.cgi?id=62168
-Bug: https://bugs.webkit.org/show_bug.cgi?id=83584
-
-RP 2012/04/30
-
-Upstream-Status: Backport
-
-Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
----
- src/3rdparty/webkit/Source/WebCore/dom/Element.cpp | 2 +-
- src/3rdparty/webkit/Source/WebCore/html/HTMLImageElement.cpp | 2 +-
- .../webkit/Source/WebCore/platform/graphics/TiledBackingStoreClient.h | 1 +
- 3 files changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/src/3rdparty/webkit/Source/WebCore/dom/Element.cpp b/src/3rdparty/webkit/Source/WebCore/dom/Element.cpp
-index 32e47ca..b8e7389 100644
---- a/src/3rdparty/webkit/Source/WebCore/dom/Element.cpp
-+++ b/src/3rdparty/webkit/Source/WebCore/dom/Element.cpp
-@@ -1080,7 +1080,7 @@ void Element::recalcStyle(StyleChange change)
- {
- // Ref currentStyle in case it would otherwise be deleted when setRenderStyle() is called.
- RefPtr<RenderStyle> currentStyle(renderStyle());
-- bool hasParentStyle = parentNodeForRenderingAndStyle() ? parentNodeForRenderingAndStyle()->renderStyle() : false;
-+ bool hasParentStyle = parentNodeForRenderingAndStyle() ? static_cast<bool>(parentNodeForRenderingAndStyle()->renderStyle()) : false;
- bool hasDirectAdjacentRules = currentStyle && currentStyle->childrenAffectedByDirectAdjacentRules();
- bool hasIndirectAdjacentRules = currentStyle && currentStyle->childrenAffectedByForwardPositionalRules();
-
-diff --git a/src/3rdparty/webkit/Source/WebCore/html/HTMLImageElement.cpp b/src/3rdparty/webkit/Source/WebCore/html/HTMLImageElement.cpp
-index d66075e..ab8f111 100644
---- a/src/3rdparty/webkit/Source/WebCore/html/HTMLImageElement.cpp
-+++ b/src/3rdparty/webkit/Source/WebCore/html/HTMLImageElement.cpp
-@@ -74,7 +74,7 @@ PassRefPtr<HTMLImageElement> HTMLImageElement::createForJSConstructor(Document*
- RefPtr<HTMLImageElement> image = adoptRef(new HTMLImageElement(imgTag, document));
- if (optionalWidth)
- image->setWidth(*optionalWidth);
-- if (optionalHeight > 0)
-+ if (optionalHeight)
- image->setHeight(*optionalHeight);
- return image.release();
- }
-diff --git a/src/3rdparty/webkit/Source/WebCore/platform/graphics/TiledBackingStoreClient.h b/src/3rdparty/webkit/Source/WebCore/platform/graphics/TiledBackingStoreClient.h
-index 6087ec3..6d748f6 100644
---- a/src/3rdparty/webkit/Source/WebCore/platform/graphics/TiledBackingStoreClient.h
-+++ b/src/3rdparty/webkit/Source/WebCore/platform/graphics/TiledBackingStoreClient.h
-@@ -25,6 +25,7 @@ namespace WebCore {
- #if ENABLE(TILED_BACKING_STORE)
- class TiledBackingStoreClient {
- public:
-+ virtual ~TiledBackingStoreClient() { }
- virtual void tiledBackingStorePaintBegin() = 0;
- virtual void tiledBackingStorePaint(GraphicsContext*, const IntRect&) = 0;
- virtual void tiledBackingStorePaintEnd(const Vector<IntRect>& paintedArea) = 0;
---
-1.8.0
-
+++ /dev/null
-From d90b496f9ffdc828928ef84afad43260ea67ec1f Mon Sep 17 00:00:00 2001
-From: Ken Werner <ken.werner@linaro.org>
-Date: Wed, 26 Sep 2012 20:55:21 +0200
-Subject: [PATCH 20/21] webkit: disable the -fuse-ld=gold flag
-
-This option is a Debian/Ubuntu specific extension to the g++ and causes upstream GCC to throw an error.
-
-Upstream-Status: Pending
-
-Signed-off-by: Ken Werner <ken.werner@linaro.org>
-Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
----
- src/3rdparty/webkit/Source/common.pri | 12 ++++++------
- 1 file changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/src/3rdparty/webkit/Source/common.pri b/src/3rdparty/webkit/Source/common.pri
-index 0f62e14..d81a1f0 100644
---- a/src/3rdparty/webkit/Source/common.pri
-+++ b/src/3rdparty/webkit/Source/common.pri
-@@ -3,12 +3,12 @@
- contains(JAVASCRIPTCORE_JIT,yes): DEFINES+=ENABLE_JIT=1
- contains(JAVASCRIPTCORE_JIT,no): DEFINES+=ENABLE_JIT=0
-
--linux-g++ {
--isEmpty($$(SBOX_DPKG_INST_ARCH)):exists(/usr/bin/ld.gold) {
-- message(Using gold linker)
-- QMAKE_LFLAGS+=-fuse-ld=gold
--}
--}
-+#linux-g++ {
-+#isEmpty($$(SBOX_DPKG_INST_ARCH)):exists(/usr/bin/ld.gold) {
-+# message(Using gold linker)
-+# QMAKE_LFLAGS+=-fuse-ld=gold
-+#}
-+#}
-
- # We use this flag on production branches
- # See https://bugs.webkit.org/show_bug.cgi?id=60824
---
-1.8.0
-
+++ /dev/null
-From 6742ac7ea6fd1e9c82ecb5305f84e721242f857d Mon Sep 17 00:00:00 2001
-From: Chen Qi <Qi.Chen@windriver.com>
-Date: Wed, 5 Dec 2012 07:48:15 +0200
-Subject: [PATCH 21/21] configure: make qt4-native work with long building
- path.
-
-Upstream-Status: Submitted
-
-Reference: https://bugreports.qt-project.org/browse/QTBUG-28292
-
-Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
-Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
----
- configure | 52 ++++++++++++++++++++++++++--------------------------
- 1 file changed, 26 insertions(+), 26 deletions(-)
-
-diff --git a/configure b/configure
-index a4a42f1..2358563 100755
---- a/configure
-+++ b/configure
-@@ -4779,8 +4779,8 @@ DEMOS_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_demopath=$QT_INST
- TODAY=`date +%Y-%m-%d`
- cat > "$outpath/src/corelib/global/qconfig.cpp.new" <<EOF
- /* License Info */
--static const char qt_configure_licensee_str [256 + 12] = "$LICENSE_USER_STR";
--static const char qt_configure_licensed_products_str [256 + 12] = "$LICENSE_PRODUCTS_STR";
-+static const char qt_configure_licensee_str [512 + 12] = "$LICENSE_USER_STR";
-+static const char qt_configure_licensed_products_str [512 + 12] = "$LICENSE_PRODUCTS_STR";
-
- /* Installation date */
- static const char qt_configure_installation [12+11] = "qt_instdate=$TODAY";
-@@ -4805,36 +4805,36 @@ if [ ! -z "$QT_HOST_PREFIX" ]; then
-
- #if defined(QT_BOOTSTRAPPED) || defined(QT_BUILD_QMAKE)
- /* Installation Info */
--static const char qt_configure_prefix_path_str [256 + 12] = "$HOSTPREFIX_PATH_STR";
--static const char qt_configure_documentation_path_str[256 + 12] = "$HOSTDOCUMENTATION_PATH_STR";
--static const char qt_configure_headers_path_str [256 + 12] = "$HOSTHEADERS_PATH_STR";
--static const char qt_configure_libraries_path_str [256 + 12] = "$HOSTLIBRARIES_PATH_STR";
--static const char qt_configure_binaries_path_str [256 + 12] = "$HOSTBINARIES_PATH_STR";
--static const char qt_configure_plugins_path_str [256 + 12] = "$HOSTPLUGINS_PATH_STR";
--static const char qt_configure_imports_path_str [256 + 12] = "$HOSTIMPORTS_PATH_STR";
--static const char qt_configure_data_path_str [256 + 12] = "$HOSTDATA_PATH_STR";
--static const char qt_configure_translations_path_str [256 + 12] = "$HOSTTRANSLATIONS_PATH_STR";
--static const char qt_configure_settings_path_str [256 + 12] = "$HOSTSETTINGS_PATH_STR";
--static const char qt_configure_examples_path_str [256 + 12] = "$HOSTEXAMPLES_PATH_STR";
--static const char qt_configure_demos_path_str [256 + 12] = "$HOSTDEMOS_PATH_STR";
-+static const char qt_configure_prefix_path_str [512 + 12] = "$HOSTPREFIX_PATH_STR";
-+static const char qt_configure_documentation_path_str[512 + 12] = "$HOSTDOCUMENTATION_PATH_STR";
-+static const char qt_configure_headers_path_str [512 + 12] = "$HOSTHEADERS_PATH_STR";
-+static const char qt_configure_libraries_path_str [512 + 12] = "$HOSTLIBRARIES_PATH_STR";
-+static const char qt_configure_binaries_path_str [512 + 12] = "$HOSTBINARIES_PATH_STR";
-+static const char qt_configure_plugins_path_str [512 + 12] = "$HOSTPLUGINS_PATH_STR";
-+static const char qt_configure_imports_path_str [512 + 12] = "$HOSTIMPORTS_PATH_STR";
-+static const char qt_configure_data_path_str [512 + 12] = "$HOSTDATA_PATH_STR";
-+static const char qt_configure_translations_path_str [512 + 12] = "$HOSTTRANSLATIONS_PATH_STR";
-+static const char qt_configure_settings_path_str [512 + 12] = "$HOSTSETTINGS_PATH_STR";
-+static const char qt_configure_examples_path_str [512 + 12] = "$HOSTEXAMPLES_PATH_STR";
-+static const char qt_configure_demos_path_str [512 + 12] = "$HOSTDEMOS_PATH_STR";
- #else // QT_BOOTSTRAPPED
- EOF
- fi
-
- cat >> "$outpath/src/corelib/global/qconfig.cpp.new" <<EOF
- /* Installation Info */
--static const char qt_configure_prefix_path_str [256 + 12] = "$PREFIX_PATH_STR";
--static const char qt_configure_documentation_path_str[256 + 12] = "$DOCUMENTATION_PATH_STR";
--static const char qt_configure_headers_path_str [256 + 12] = "$HEADERS_PATH_STR";
--static const char qt_configure_libraries_path_str [256 + 12] = "$LIBRARIES_PATH_STR";
--static const char qt_configure_binaries_path_str [256 + 12] = "$BINARIES_PATH_STR";
--static const char qt_configure_plugins_path_str [256 + 12] = "$PLUGINS_PATH_STR";
--static const char qt_configure_imports_path_str [256 + 12] = "$IMPORTS_PATH_STR";
--static const char qt_configure_data_path_str [256 + 12] = "$DATA_PATH_STR";
--static const char qt_configure_translations_path_str [256 + 12] = "$TRANSLATIONS_PATH_STR";
--static const char qt_configure_settings_path_str [256 + 12] = "$SETTINGS_PATH_STR";
--static const char qt_configure_examples_path_str [256 + 12] = "$EXAMPLES_PATH_STR";
--static const char qt_configure_demos_path_str [256 + 12] = "$DEMOS_PATH_STR";
-+static const char qt_configure_prefix_path_str [512 + 12] = "$PREFIX_PATH_STR";
-+static const char qt_configure_documentation_path_str[512 + 12] = "$DOCUMENTATION_PATH_STR";
-+static const char qt_configure_headers_path_str [512 + 12] = "$HEADERS_PATH_STR";
-+static const char qt_configure_libraries_path_str [512 + 12] = "$LIBRARIES_PATH_STR";
-+static const char qt_configure_binaries_path_str [512 + 12] = "$BINARIES_PATH_STR";
-+static const char qt_configure_plugins_path_str [512 + 12] = "$PLUGINS_PATH_STR";
-+static const char qt_configure_imports_path_str [512 + 12] = "$IMPORTS_PATH_STR";
-+static const char qt_configure_data_path_str [512 + 12] = "$DATA_PATH_STR";
-+static const char qt_configure_translations_path_str [512 + 12] = "$TRANSLATIONS_PATH_STR";
-+static const char qt_configure_settings_path_str [512 + 12] = "$SETTINGS_PATH_STR";
-+static const char qt_configure_examples_path_str [512 + 12] = "$EXAMPLES_PATH_STR";
-+static const char qt_configure_demos_path_str [512 + 12] = "$DEMOS_PATH_STR";
- EOF
-
- if [ ! -z "$QT_HOST_PREFIX" ]; then
---
-1.8.0
-
+++ /dev/null
-From b7029fbd12c32e851ed7d81b692197176eb71d9e Mon Sep 17 00:00:00 2001
-From: Gunnar Sletta <gunnar.sletta@digia.com>
-Date: Thu, 4 Jul 2013 16:20:40 +1000
-Subject: [PATCH] Fix drawing of 0-width polylines from outside the devicerect.
-
-This was broken by a previous fix which aimed to fix gaps in
-polylines with tiny line segments. The result was that we
-skipped updating the origin point when stroke() didn't produce
-pixels which accidentally included the case of the line
-being completely outside the deviceRect. I fixed this
-by returning the value of clipLine in drawLine to the caller
-so we could still update the origin for this case.
-
-Upstream-Status: Accepted [https://codereview.qt-project.org/#change,60427]
-Signed-off-by: Jonathan Liu <net147@gmail.com>
-
-Task-number: QTBUG-31579
-Change-Id: Iac29436f042da7658bbeaf9370351dc6f2c95065
-(cherry picked from qtbase/900cccfd459fcbdbc4aa3d313afe12cfbf68fd87)
----
- src/gui/painting/qcosmeticstroker.cpp | 42 ++++++++++++++++++++++-------------
- src/gui/painting/qcosmeticstroker_p.h | 2 +-
- 2 files changed, 27 insertions(+), 17 deletions(-)
-
-diff --git a/src/gui/painting/qcosmeticstroker.cpp b/src/gui/painting/qcosmeticstroker.cpp
-index 0061ecb..4413170 100644
---- a/src/gui/painting/qcosmeticstroker.cpp
-+++ b/src/gui/painting/qcosmeticstroker.cpp
-@@ -133,10 +133,15 @@ struct NoDasher {
-
- };
-
-+/*
-+ * The return value is the result of the clipLine() call performed at the start
-+ * of each of the two functions, aka "false" means completely outside the devices
-+ * rect.
-+ */
- template<DrawPixel drawPixel, class Dasher>
--static void drawLine(QCosmeticStroker *stroker, qreal x1, qreal y1, qreal x2, qreal y2, int caps);
-+static bool drawLine(QCosmeticStroker *stroker, qreal x1, qreal y1, qreal x2, qreal y2, int caps);
- template<DrawPixel drawPixel, class Dasher>
--static void drawLineAA(QCosmeticStroker *stroker, qreal x1, qreal y1, qreal x2, qreal y2, int caps);
-+static bool drawLineAA(QCosmeticStroker *stroker, qreal x1, qreal y1, qreal x2, qreal y2, int caps);
-
- inline void drawPixel(QCosmeticStroker *stroker, int x, int y, int coverage)
- {
-@@ -602,17 +607,20 @@ void QCosmeticStroker::drawPath(const QVectorPath &path)
- caps |= CapEnd;
-
- QCosmeticStroker::Point last = this->lastPixel;
-- stroke(this, p.x(), p.y(), p2.x(), p2.y(), caps);
-+ bool unclipped = stroke(this, p.x(), p.y(), p2.x(), p2.y(), caps);
-
- /* fix for gaps in polylines with fastpen and aliased in a sequence
- of points with small distances: if current point p2 has been dropped
-- out, keep last non dropped point p. */
-- if (fastPenAliased) {
-- if (last.x != lastPixel.x || last.y != lastPixel.y ||
-- points == begin + 2 || points == end - 2 ) {
-- {
-- p = p2;
-- }
-+ out, keep last non dropped point p.
-+
-+ However, if the line was completely outside the devicerect, we
-+ still need to update p to avoid drawing the line after this one from
-+ a bad starting position.
-+ */
-+ if (fastPenAliased && unclipped) {
-+ if (last.x != lastPixel.x || last.y != lastPixel.y
-+ || points == begin + 2 || points == end - 2) {
-+ p = p2;
- }
- } else {
- p = p2;
-@@ -720,10 +728,10 @@ static inline void capAdjust(int caps, int &x1, int &x2, int &y, int yinc)
- the drawing shifts from horizontal to vertical or back.
- */
- template<DrawPixel drawPixel, class Dasher>
--static void drawLine(QCosmeticStroker *stroker, qreal rx1, qreal ry1, qreal rx2, qreal ry2, int caps)
-+static bool drawLine(QCosmeticStroker *stroker, qreal rx1, qreal ry1, qreal rx2, qreal ry2, int caps)
- {
- if (stroker->clipLine(rx1, ry1, rx2, ry2))
-- return;
-+ return false;
-
- static const int half = 31;
- int x1 = toF26Dot6(rx1) + half;
-@@ -813,7 +821,7 @@ static void drawLine(QCosmeticStroker *stroker, qreal rx1, qreal ry1, qreal rx2,
- } else {
- // horizontal
- if (!dx)
-- return;
-+ return true;
-
- QCosmeticStroker::Direction dir = QCosmeticStroker::LeftToRight;
-
-@@ -886,14 +894,15 @@ static void drawLine(QCosmeticStroker *stroker, qreal rx1, qreal ry1, qreal rx2,
- }
- }
- stroker->lastPixel = last;
-+ return true;
- }
-
-
- template<DrawPixel drawPixel, class Dasher>
--static void drawLineAA(QCosmeticStroker *stroker, qreal rx1, qreal ry1, qreal rx2, qreal ry2, int caps)
-+static bool drawLineAA(QCosmeticStroker *stroker, qreal rx1, qreal ry1, qreal rx2, qreal ry2, int caps)
- {
- if (stroker->clipLine(rx1, ry1, rx2, ry2))
-- return;
-+ return false;
-
- int x1 = toF26Dot6(rx1);
- int y1 = toF26Dot6(ry1);
-@@ -967,7 +976,7 @@ static void drawLineAA(QCosmeticStroker *stroker, qreal rx1, qreal ry1, qreal rx
- } else {
- // horizontal
- if (!dx)
-- return;
-+ return true;
-
- int yinc = F16Dot16FixedDiv(dy, dx);
-
-@@ -1029,6 +1038,7 @@ static void drawLineAA(QCosmeticStroker *stroker, qreal rx1, qreal ry1, qreal rx
- drawPixel(stroker, x, (y>>16) + 1, alpha * alphaEnd >> 6);
- }
- }
-+ return true;
- }
-
- QT_END_NAMESPACE
-diff --git a/src/gui/painting/qcosmeticstroker_p.h b/src/gui/painting/qcosmeticstroker_p.h
-index 870738b..3216856 100644
---- a/src/gui/painting/qcosmeticstroker_p.h
-+++ b/src/gui/painting/qcosmeticstroker_p.h
-@@ -56,7 +56,7 @@ QT_MODULE(Gui)
- class QCosmeticStroker;
-
-
--typedef void (*StrokeLine)(QCosmeticStroker *stroker, qreal x1, qreal y1, qreal x2, qreal y2, int caps);
-+typedef bool (*StrokeLine)(QCosmeticStroker *stroker, qreal x1, qreal y1, qreal x2, qreal y2, int caps);
-
- class QCosmeticStroker
- {
---
-1.8.3.2
-
+++ /dev/null
-From 1f40ed553e618c3b0511c7db4b4fd26c2d2b65bf Mon Sep 17 00:00:00 2001
-From: Peter Hartmann <phartmann@blackberry.com>
-Date: Thu, 25 Jul 2013 12:05:29 -0400
-Subject: [PATCH] QHttpMultiPart: fix data corruption in readData method
-
-When readData() is called repeatedly, we need to keep track which
-part of the multipart message we are currently reading from.
-Hereby we also need to take the boundary size into account, and not
-only the size of the multipart; otherwise we would skip a not
-completely read part. This would then later lead to advancing the
-read pointer by negative indexes and data loss.
-
-Upstream-Status: Accepted [https://codereview.qt-project.org/#change,61861]
-Signed-off-by: Jonathan Liu <net147@gmail.com>
-
-Task-number: QTBUG-32534
-Change-Id: Ibb6dff16adaf4ea67181d23d1d0c8459e33a0ed0
-Reviewed-by: Jonathan Liu <net147@gmail.com>
-Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
-(cherry picked from qtbase/af96c6fed931564c95037539f07e9c8e33c69529)
-Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
----
- src/network/access/qhttpmultipart.cpp | 3 +-
- tests/auto/qnetworkreply/tst_qnetworkreply.cpp | 44 ++++++++++++++++++++++++++
- 2 files changed, 46 insertions(+), 1 deletion(-)
-
-diff --git a/src/network/access/qhttpmultipart.cpp b/src/network/access/qhttpmultipart.cpp
-index 635129a..b25e917 100644
---- a/src/network/access/qhttpmultipart.cpp
-+++ b/src/network/access/qhttpmultipart.cpp
-@@ -488,7 +488,8 @@ qint64 QHttpMultiPartIODevice::readData(char *data, qint64 maxSize)
-
- // skip the parts we have already read
- while (index < multiPart->parts.count() &&
-- readPointer >= partOffsets.at(index) + multiPart->parts.at(index).d->size())
-+ readPointer >= partOffsets.at(index) + multiPart->parts.at(index).d->size()
-+ + multiPart->boundary.count() + 6) // 6 == 2 boundary dashes, \r\n after boundary, \r\n after multipart
- index++;
-
- // read the data
---
-1.8.3.4
-
+++ /dev/null
-From 0726127285413829f58618b5b82fb3e2da0c3a74 Mon Sep 17 00:00:00 2001
-From: Andy Shaw <andy.shaw@digia.com>
-Date: Tue, 8 Oct 2013 15:45:42 +0200
-Subject: [PATCH] Ensure lastPixel.y is also initalized to -1 when necessary
-
-Task-number: QTBUG-31579
-
-Upstream-Status: Accepted [https://codereview.qt-project.org/#change,67624]
-Signed-off-by: Jonathan Liu <net147@gmail.com>
-
-Change-Id: Ia4916ac0d384ea523bbfad0dafbc90044da7ec3e
-Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
-(cherry picked from qtbase/f0b950144dde85b65df0c3cf83f7c8df0e94bbbf)
----
- src/gui/painting/qcosmeticstroker.cpp | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/src/gui/painting/qcosmeticstroker.cpp b/src/gui/painting/qcosmeticstroker.cpp
-index 4413170..36616d4 100644
---- a/src/gui/painting/qcosmeticstroker.cpp
-+++ b/src/gui/painting/qcosmeticstroker.cpp
-@@ -305,6 +305,7 @@ void QCosmeticStroker::setup()
- ymax = deviceRect.bottom() + 2;
-
- lastPixel.x = -1;
-+ lastPixel.y = -1;
- }
-
- // returns true if the whole line gets clipped away
-@@ -533,6 +534,7 @@ void QCosmeticStroker::drawPath(const QVectorPath &path)
- QPointF p = QPointF(points[0], points[1]) * state->matrix;
- patternOffset = state->lastPen.dashOffset()*64;
- lastPixel.x = -1;
-+ lastPixel.y = -1;
-
- bool closed;
- const QPainterPath::ElementType *e = subPath(type, end, points, &closed);
-@@ -587,6 +589,7 @@ void QCosmeticStroker::drawPath(const QVectorPath &path)
- QPointF movedTo = p;
- patternOffset = state->lastPen.dashOffset()*64;
- lastPixel.x = -1;
-+ lastPixel.y = -1;
-
- const qreal *begin = points;
- const qreal *end = points + 2*path.elementCount();
---
-1.8.4
-
+++ /dev/null
-From c368cbad3a505d44894ff150dc25c74d0174ca15 Mon Sep 17 00:00:00 2001
-From: Jonathan Liu <net147@gmail.com>
-Date: Wed, 23 Oct 2013 00:28:17 +1100
-Subject: [PATCH] Fix misaligned selection region with text when centered
-
-If the text is centered, the x/y position in the selection QRectF may
-be a multiple of 0.5 which is rounded up. This rounding causes
-misalignment of the selection region with the text.
-
-The alignment is fixed by using qFloor on the x and y components.
-
-Upstream-Status: Accepted [https://codereview.qt-project.org/#change,68935]
-Signed-off-by: Jonathan Liu <net147@gmail.com>
-
-Task-number: QTBUG-34218
-Task-number: QTBUG-34234
-Change-Id: I4f2fadeb38602f62a93773c6e5faecf03b28069f
-Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
-(cherry picked from qtbase/5d8a882c11201a29475c5ea71cfb76c9de6573f5)
----
- src/gui/text/qtextlayout.cpp | 19 ++++++++++++++-----
- 1 file changed, 14 insertions(+), 5 deletions(-)
-
-diff --git a/src/gui/text/qtextlayout.cpp b/src/gui/text/qtextlayout.cpp
-index 3d340cb..8d652ea 100644
---- a/src/gui/text/qtextlayout.cpp
-+++ b/src/gui/text/qtextlayout.cpp
-@@ -44,6 +44,7 @@
-
- #include <qfont.h>
- #include <qapplication.h>
-+#include <qmath.h>
- #include <qpainter.h>
- #include <qvarlengtharray.h>
- #include <qtextformat.h>
-@@ -979,15 +980,23 @@ static void addSelectedRegionsToPath(QTextEngine *eng, int lineNumber, const QPo
- continue;
- }
-
-- if (lastSelectionWidth > 0)
-- region->addRect(boundingRect & QRectF(lastSelectionX.toReal(), selectionY, lastSelectionWidth.toReal(), lineHeight));
-+ if (lastSelectionWidth > 0) {
-+ QRectF rect = boundingRect & QRectF(lastSelectionX.toReal(), selectionY, lastSelectionWidth.toReal(), lineHeight);
-+ rect.moveLeft(qFloor(rect.left()));
-+ rect.moveTop(qFloor(rect.top()));
-+ region->addRect(rect);
-+ }
-
- lastSelectionX = selectionX;
- lastSelectionWidth = selectionWidth;
- }
- }
-- if (lastSelectionWidth > 0)
-- region->addRect(boundingRect & QRectF(lastSelectionX.toReal(), selectionY, lastSelectionWidth.toReal(), lineHeight));
-+ if (lastSelectionWidth > 0) {
-+ QRectF rect = boundingRect & QRectF(lastSelectionX.toReal(), selectionY, lastSelectionWidth.toReal(), lineHeight);
-+ rect.moveLeft(qFloor(rect.left()));
-+ rect.moveTop(qFloor(rect.top()));
-+ region->addRect(rect);
-+ }
- }
-
- static inline QRectF clipIfValid(const QRectF &rect, const QRectF &clip)
-@@ -2081,7 +2090,7 @@ static void setPenAndDrawBackground(QPainter *p, const QPen &defaultPen, const Q
-
- QBrush bg = chf.background();
- if (bg.style() != Qt::NoBrush && !chf.property(SuppressBackground).toBool())
-- p->fillRect(r, bg);
-+ p->fillRect(QRectF(qFloor(r.x()), qFloor(r.y()), r.width(), r.height()), bg);
- if (c.style() != Qt::NoBrush) {
- p->setPen(QPen(c, 0));
- }
---
-1.8.4
-
+++ /dev/null
-From 0460e2a5f13aaf0081c3c9fec89280046842ddbb Mon Sep 17 00:00:00 2001
-From: Paul Eggleton <paul.eggleton@linux.intel.com>
-Date: Wed, 3 Jul 2013 17:48:30 +0100
-Subject: [PATCH] tools.pro: disable qmeegographicssystemhelper
-
-We don't want this enabled just because we have EGL and OpenGL ES 2.0
-enabled.
-
-Upstream-Status: Inappropriate [config]
-
-Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
----
- tools/tools.pro | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/tools/tools.pro b/tools/tools.pro
-index 0e27053..2d3f36d 100644
---- a/tools/tools.pro
-+++ b/tools/tools.pro
-@@ -49,4 +49,4 @@ QTDIR_build:REQUIRES = "contains(QT_CONFIG, full-config)"
-
- !win32:!embedded:!mac:!symbian:CONFIG += x11
-
--x11:contains(QT_CONFIG, opengles2):contains(QT_CONFIG, egl):SUBDIRS += qmeegographicssystemhelper
-+#x11:contains(QT_CONFIG, opengles2):contains(QT_CONFIG, egl):SUBDIRS += qmeegographicssystemhelper
---
-1.8.1.2
-
+++ /dev/null
-#
-# qmake configuration for common gcc
-#
-
-QMAKE_COMPILER = gcc
-
-QMAKE_CC = $(OE_QMAKE_CC)
-QMAKE_CFLAGS += -pipe $(OE_QMAKE_CFLAGS)
-QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += $(OE_QMAKE_CFLAGS)
-QMAKE_CFLAGS_DEPS += -M
-QMAKE_CFLAGS_WARN_ON += -Wall -W
-QMAKE_CFLAGS_WARN_OFF += -w
-QMAKE_CFLAGS_RELEASE +=
-QMAKE_CFLAGS_DEBUG += -g
-QMAKE_CFLAGS_SHLIB += -fPIC
-QMAKE_CFLAGS_STATIC_LIB += -fPIC
-QMAKE_CFLAGS_YACC += -Wno-unused -Wno-parentheses
-QMAKE_CFLAGS_HIDESYMS += -fvisibility=hidden
-QMAKE_CFLAGS_PRECOMPILE += -x c-header -c ${QMAKE_PCH_INPUT} -o ${QMAKE_PCH_OUTPUT}
-QMAKE_CFLAGS_USE_PRECOMPILE += -include ${QMAKE_PCH_OUTPUT_BASE}
-
-QMAKE_CXX = $(OE_QMAKE_CXX)
-QMAKE_CXXFLAGS += $$QMAKE_CFLAGS $(OE_QMAKE_CXXFLAGS)
-QMAKE_CXXFLAGS_DEPS += $$QMAKE_CFLAGS_DEPS
-QMAKE_CXXFLAGS_WARN_ON += $$QMAKE_CFLAGS_WARN_ON
-QMAKE_CXXFLAGS_WARN_OFF += $$QMAKE_CFLAGS_WARN_OFF
-QMAKE_CXXFLAGS_RELEASE += $$QMAKE_CFLAGS_RELEASE
-QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO
-QMAKE_CXXFLAGS_DEBUG += $$QMAKE_CFLAGS_DEBUG
-QMAKE_CXXFLAGS_SHLIB += $$QMAKE_CFLAGS_SHLIB
-QMAKE_CXXFLAGS_STATIC_LIB += $$QMAKE_CFLAGS_STATIC_LIB
-QMAKE_CXXFLAGS_YACC += $$QMAKE_CFLAGS_YACC
-QMAKE_CXXFLAGS_HIDESYMS += $$QMAKE_CFLAGS_HIDESYMS -fvisibility-inlines-hidden
-QMAKE_CXXFLAGS_PRECOMPILE += -x c++-header -c ${QMAKE_PCH_INPUT} -o ${QMAKE_PCH_OUTPUT}
-QMAKE_CXXFLAGS_USE_PRECOMPILE = $$QMAKE_CFLAGS_USE_PRECOMPILE
-
-QMAKE_LINK = $(OE_QMAKE_LINK)
-QMAKE_LINK_SHLIB = $(OE_QMAKE_LINK)
-QMAKE_LINK_C = $(OE_QMAKE_LINK)
-QMAKE_LINK_C_SHLIB = $(OE_QMAKE_LINK)
-QMAKE_LFLAGS += $(OE_QMAKE_LDFLAGS)
-QMAKE_LFLAGS_RELEASE +=
-QMAKE_LFLAGS_DEBUG +=
-QMAKE_LFLAGS_APP +=
-QMAKE_LFLAGS_NOUNDEF += -Wl,--no-undefined
-QMAKE_LFLAGS_RPATH = -Wl,-rpath-link,
-
-QMAKE_PCH_OUTPUT_EXT = .gch
-
-# -Bsymbolic-functions (ld) support
-QMAKE_LFLAGS_BSYMBOLIC_FUNC = -Wl,-Bsymbolic-functions
-QMAKE_LFLAGS_DYNAMIC_LIST = -Wl,--dynamic-list,
-
-# do not depend on gdb
-CONFIG -= gdb_dwarf_index
-
-# some linking helper...
-CONFIG += rpath_libdirs
-
-# for the SDK
-isEmpty(QMAKE_QT_CONFIG):QMAKE_QT_CONFIG = $(OE_QMAKE_QT_CONFIG)
+++ /dev/null
-#
-# qmake configuration for common linux
-#
-
-QMAKE_CFLAGS_THREAD += -D_REENTRANT
-QMAKE_CXXFLAGS_THREAD += $$QMAKE_CFLAGS_THREAD
-
-QMAKE_INCDIR =
-QMAKE_LIBDIR =
-QMAKE_INCDIR_X11 =
-QMAKE_LIBDIR_X11 =
-QMAKE_INCDIR_QT = $(OE_QMAKE_INCDIR_QT)
-QMAKE_LIBDIR_QT = $(OE_QMAKE_LIBDIR_QT)
-QMAKE_INCDIR_OPENGL =
-QMAKE_LIBDIR_OPENGL =
-QMAKE_INCDIR_OPENGL_ES1 = $$QMAKE_INCDIR_OPENGL
-QMAKE_LIBDIR_OPENGL_ES1 = $$QMAKE_LIBDIR_OPENGL
-QMAKE_INCDIR_OPENGL_ES2 = $$QMAKE_INCDIR_OPENGL
-QMAKE_LIBDIR_OPENGL_ES2 = $$QMAKE_LIBDIR_OPENGL
-QMAKE_INCDIR_EGL =
-QMAKE_LIBDIR_EGL =
-QMAKE_INCDIR_OPENVG =
-QMAKE_LIBDIR_OPENVG =
-
-
-QMAKE_LIBS =
-QMAKE_LIBS_DYNLOAD = -ldl
-QMAKE_LIBS_X11 = $(OE_QMAKE_LIBS_X11)
-QMAKE_LIBS_X11SM = $(OE_QMAKE_LIBS_X11SM)
-QMAKE_LIBS_NIS = -lnsl
-QMAKE_LIBS_EGL = -lEGL
-QMAKE_LIBS_OPENGL = -lGL
-QMAKE_LIBS_OPENGL_QT = -lGL
-QMAKE_LIBS_OPENGL_ES1 = -lGLES_CM
-QMAKE_LIBS_OPENGL_ES2 = -lGLESv2
-QMAKE_LIBS_OPENVG = -lOpenVG
-QMAKE_LIBS_THREAD = -lpthread
-
-QMAKE_MOC = $(OE_QMAKE_MOC)
-QMAKE_UIC = $(OE_QMAKE_UIC)
-QMAKE_UIC3 = $(OE_QMAKE_UIC3)
-QMAKE_RCC = $(OE_QMAKE_RCC)
-QMAKE_QDBUSCPP2XML = $(OE_QMAKE_QDBUSCPP2XML)
-QMAKE_QDBUSXML2CPP = $(OE_QMAKE_QDBUSXML2CPP)
-
-QMAKE_AR = $(OE_QMAKE_AR) cqs
-QMAKE_OBJCOPY = objcopy
-QMAKE_RANLIB =
-
-QMAKE_TAR = tar -cf
-QMAKE_GZIP = gzip -9f
-
-QMAKE_COPY = cp -f
-QMAKE_COPY_FILE = $(COPY)
-QMAKE_COPY_DIR = $(COPY) -r
-QMAKE_MOVE = mv -f
-QMAKE_DEL_FILE = rm -f
-QMAKE_DEL_DIR = rmdir
-QMAKE_STRIP = $(OE_QMAKE_STRIP)
-QMAKE_STRIPFLAGS_LIB += --strip-unneeded
-QMAKE_CHK_DIR_EXISTS = test -d
-QMAKE_MKDIR = mkdir -p
-QMAKE_INSTALL_FILE = install -m 644 -p
-QMAKE_INSTALL_PROGRAM = install -m 755 -p
-
-include(unix.conf)
+++ /dev/null
-#!/bin/sh
-
-if [ -e /dev/input/touchscreen0 ]
-then
- QWS_MOUSE_PROTO=Tslib:/dev/input/touchscreen0
- export QWS_MOUSE_PROTO
-fi
+++ /dev/null
-SUMMARY = "Cross-platform UI toolkit and application framework (framebuffer version)"
-DESCRIPTION = "Qt is a versatile cross-platform application framework -- this is the embedded (framebuffer) version."
-SECTION = "libs"
-HOMEPAGE = "http://qt-project.org/"
-DEPENDS += "directfb tslib"
-INC_PR = "r52"
-
-QT4EDEPENDS = ""
-QT_BASE_LIB ?= "libqt-embedded"
-
-# Set necessary variables in the profile
-SRC_URI += "file://qte.sh"
-
-QT_EMBEDDED_FLAGS ?= " \
- -embedded $QT_ARCH \
- -qtlibinfix ${QT_LIBINFIX} \
-"
-QT_EMBEDDED_EXTRA_FLAGS ?= " \
- -plugin-gfx-transformed -plugin-gfx-qvfb -plugin-gfx-vnc -plugin-gfx-directfb \
- -plugin-mouse-tslib -qt-mouse-pc -qt-mouse-qvfb -qt-mouse-linuxinput \
- -qt-kbd-tty -qt-kbd-linuxinput \
-"
-QT_EMBEDDED_KEYPAD_FLAGS ?= " \
- -DQT_KEYPAD_NAVIGATION \
-"
-
-QT_CONFIG_FLAGS += "${QT_EMBEDDED_FLAGS} ${QT_EMBEDDED_EXTRA_FLAGS} ${QT_EMBEDDED_KEYPAD_FLAGS}"
-
-require qt4.inc
-
-do_install_append() {
- install -d ${D}/${libdir}/fonts
- touch ${D}/${libdir}/fonts/fontdir
-
- install -d ${D}${sysconfdir}/profile.d/
- install -m 0755 ${WORKDIR}/qte.sh ${D}${sysconfdir}/profile.d/
-}
-
-# We put the qte profile into it's own package as we don't want to install all qt stuff
-# with depending on the global package qt4-embedded
-PACKAGES += " ${PN}-conf"
-FILES_${PN}-conf += " ${sysconfdir}/profile.d/qte.sh"
-RRECOMMENDS_${PN} += " ${PN}-conf"
-
-OTHER_PACKAGES += "\
- ${QT_BASE_NAME}-fonts \
- ${QT_BASE_NAME}-fonts-ttf-vera \
- ${QT_BASE_NAME}-fonts-ttf-dejavu \
- ${QT_BASE_NAME}-fonts-pfa \
- ${QT_BASE_NAME}-fonts-pfb \
- ${QT_BASE_NAME}-fonts-qpf"
-
-RRECOMMENDS_${QT_BASE_NAME}-fonts = " \
- ${QT_BASE_NAME}-fonts-ttf-vera \
- ${QT_BASE_NAME}-fonts-ttf-dejavu \
- ${QT_BASE_NAME}-fonts-pfa \
- ${QT_BASE_NAME}-fonts-pfb \
- ${QT_BASE_NAME}-fonts-qpf"
-RRECOMMENDS_${QT_BASE_NAME}-demos += " \
- ${QT_BASE_NAME}-fonts"
-
-ALLOW_EMPTY_${QT_BASE_NAME}-fonts = "1"
-PACKAGES_DYNAMIC += "^${QT_BASE_NAME}-fonts-.*"
-
-FILES_${QT_BASE_NAME}-fonts-ttf-vera = "${libdir}/fonts/Vera*.ttf"
-FILES_${QT_BASE_NAME}-fonts-ttf-dejavu = "${libdir}/fonts/DejaVu*.ttf"
-FILES_${QT_BASE_NAME}-fonts-pfa = "${libdir}/fonts/*.pfa"
-FILES_${QT_BASE_NAME}-fonts-pfb = "${libdir}/fonts/*.pfb"
-FILES_${QT_BASE_NAME}-fonts-qpf = "${libdir}/fonts/*.qpf*"
-FILES_${QT_BASE_NAME}-fonts = "${libdir}/fonts/README ${libdir}/fonts/fontdir"
-
-inherit qt4e
-
+++ /dev/null
-require qt4-${PV}.inc
-require qt4-embedded.inc
-
-QT_CONFIG_FLAGS_append_arm = "${@bb.utils.contains("TUNE_FEATURES", "neon", "", " -no-neon" ,d)}"
-
-QT_CONFIG_FLAGS += " \
- -exceptions \
-"
-
+++ /dev/null
-SUMMARY = "Qt version 4 tools and support files for the build host"
-DEPENDS = "zlib-native dbus-native"
-SECTION = "libs"
-HOMEPAGE = "http://qt-project.org/"
-PROVIDES = "qt4-tools-native"
-
-LICENSE = "LGPLv2.1 | GPLv3"
-LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=fbc093901857fcd118f065f900982c24 \
- file://LICENSE.GPL3;md5=6e1694ee338db410417517884918d4d2 \
- file://LGPL_EXCEPTION.txt;md5=0145c4d1b6f96a661c2c139dfb268fb6"
-
-INC_PR = "r20"
-
-inherit native
-
-SRC_URI = "http://download.qt-project.org/official_releases/qt/4.8/${PV}/qt-everywhere-opensource-src-${PV}.tar.gz \
- file://0001-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch \
- file://0002-qkbdtty_qws-fix-build-with-old-kernel-headers.patch \
- file://0003-webkit2-set-OUTPUT_DIR-value-if-empty.patch \
- file://0021-configure-make-qt4-native-work-with-long-building-pa.patch \
- file://g++.conf \
- file://linux.conf \
- "
-S = "${WORKDIR}/qt-everywhere-opensource-src-${PV}"
-
-EXTRA_OECONF = "-prefix ${prefix} \
- -bindir ${bindir} \
- -libdir ${libdir} \
- -datadir ${datadir}/qt4 \
- -sysconfdir ${sysconfdir}/qt4 \
- -docdir ${docdir}/qt4 \
- -headerdir ${includedir}/qt4 \
- -plugindir ${libdir}/qt4/plugins \
- -importdir ${libdir}/qt4/imports \
- -translationdir ${datadir}/qt4/translations \
- -examplesdir ${bindir}/qt4/examples \
- -demosdir ${bindir}/qt4/demos \
- -L ${STAGING_LIBDIR_NATIVE} \
- -I ${STAGING_INCDIR_NATIVE} \
- -qt-libjpeg -system-zlib \
- -no-libjpeg -no-libpng -no-libmng -no-libtiff \
- -no-accessibility \
- -no-cups \
- -no-nas-sound \
- -no-nis -no-openssl \
- -verbose -release \
- -embedded -no-freetype -no-glib -no-iconv \
- -exceptions -xmlpatterns \
- -qt3support \
- -no-fast -silent -no-rpath"
-
-# yank default -e, otherwise we get the following error:
-# moc_qbuffer.cpp: No such file or directory
-EXTRA_OEMAKE = " "
-
-do_configure() {
- # Avoid problems with Qt 4.8.0 configure setting QMAKE_LINK from LD (since we want the linker to be g++)
- unset LD
-
- (echo o; echo yes) | ./configure ${EXTRA_OECONF} || die "Configuring qt failed. EXTRA_OECONF was ${EXTRA_OECONF}"
-}
-
-TOBUILD = "\
- src/tools/moc \
- src/corelib \
- src/sql \
- src/xml \
- src/network \
- src/tools/uic \
- src/tools/rcc \
- src/xmlpatterns \
- src/dbus \
- src/gui \
- src/testlib \
- src/qt3support \
- src/tools/uic3 \
- tools/linguist/lconvert \
- tools/linguist/lrelease \
- tools/linguist/lupdate \
- tools/qdbus/qdbuscpp2xml \
- tools/qdbus/qdbusxml2cpp \
- tools/xmlpatterns \
-"
-
-do_compile() {
- for i in ${TOBUILD}; do
- cd ${S}/$i && oe_runmake CC="${CC}" CXX="${CXX}"
- done
-}
-
-do_install() {
- install -d ${D}${bindir}/
- install -m 0755 bin/qmake ${D}${bindir}/qmake2
- for i in moc uic uic3 rcc lconvert lrelease lupdate qdbuscpp2xml qdbusxml2cpp xmlpatterns; do
- install -m 0755 bin/${i} ${D}${bindir}/${i}4
- done
-
- install -d ${D}${datadir}/qt4/
- cp -PfR mkspecs ${D}${datadir}/qt4/
- ln -sf linux-g++ ${D}${datadir}/qt4/mkspecs/${BUILD_OS}-oe-g++
- if [ -f ${D}${datadir}/qt4/mkspecs/common/g++-unix.conf ] ; then
- # mkspecs were refactored for 4.8.0
- cp -f ${WORKDIR}/g++.conf ${D}${datadir}/qt4/mkspecs/common/g++-unix.conf
- else
- cp -f ${WORKDIR}/g++.conf ${D}${datadir}/qt4/mkspecs/common/g++.conf
- fi
- cp -f ${WORKDIR}/linux.conf ${D}${datadir}/qt4/mkspecs/common/
-
- install -m 0644 tools/porting/src/q3porting.xml ${D}${datadir}/qt4/
-
- for i in ${TOBUILD}; do
- cd ${S}/$i && oe_runmake install INSTALL_ROOT=${D}
- done
-}
+++ /dev/null
-require qt4-native.inc
-
-TOBUILD := "src/tools/bootstrap ${TOBUILD}"
-
-SRC_URI[md5sum] = "1864987bdbb2f58f8ae8b350dfdbe133"
-SRC_URI[sha256sum] = "eb728f8268831dc4373be6403b7dd5d5dde03c169ad6882f9a8cb560df6aa138"
+++ /dev/null
-require qt4.inc
-
-SUMMARY = "Cross-platform UI toolkit and application framework (X11 version)"
-DESCRIPTION = "Qt is a versatile cross-platform application framework -- this is the X11 version."
-HOMEPAGE = "http://qt-project.org/"
-SECTION = "x11/libs"
-DEPENDS += "virtual/libgl virtual/libx11 fontconfig libxft libxext libxrender libxrandr libxcursor"
-PROVIDES += "qt4-x11"
-QT4DEPENDS = ""
-
-INC_PR = "r50"
-
-QT_GLFLAGS ?= "${@base_contains('DISTRO_FEATURES', 'opengl', '-opengl', '-no-opengl', d)} "
-QT_GLFLAGS_qemux86 = "-opengl"
-QT_GLFLAGS_qemuppc = "-opengl"
-QT_X11_FLAGS ?= "-no-xinerama -no-xkb -no-gtkstyle"
-QT_CONFIG_FLAGS += "${QT_X11_FLAGS}"
-QT_BASE_LIB ?= "libqt"
-
-# required by kdelibs4
-QT_KDE_FLAGS ?= "-accessibility -sm"
-QT_DISTRO_FLAGS ?= "${QT_KDE_FLAGS}"
-
-inherit qt4x11
-
-do_install_append() {
- # fix pkgconfig, libtool and prl files
- sed -i -e 's#I/usr/include#Iincludedir}#g' \
- -e 's#Iin#I${in#g' \
- ${D}${libdir}/*.la ${D}${libdir}/*.prl ${D}${libdir}/pkgconfig/*.pc
-
- # QT abuses $includedir to point to its headers, which breaks pkgconfig sysroot, so
- # manually fix it up here:
- for pc in ${D}${libdir}/pkgconfig/*.pc ; do
- sed -i -e "s:prefix}include/${QT_BASE_NAME}/$(basename $pc .pc):prefix}/include:" \
- -e "s,Cflags: ,Cflags: -IP{includedir}/${QT_BASE_NAME}/$(basename $pc .pc) ," \
- -e 's:IP{:I${:g' $pc
- done
-}
+++ /dev/null
-require qt4-x11-free.inc
-require qt4-${PV}.inc
-
-QT_CONFIG_FLAGS_append_arm = "${@bb.utils.contains("TUNE_FEATURES", "neon", "", " -no-neon" ,d)}"
-
-QT_CONFIG_FLAGS += " \
- -no-embedded \
- -xrandr \
- -x11"
+++ /dev/null
-inherit qmake_base
-
-DEPENDS += "qt4-tools-native freetype jpeg libpng zlib dbus openssl glib-2.0 gstreamer gst-plugins-base sqlite3 tiff icu"
-DEPENDS += "${@base_contains('DISTRO_FEATURES', 'pulseaudio', 'pulseaudio', '', d)}"
-
-require qt4_arch.inc
-
-QT_DISTRO_FLAGS ?= "-no-accessibility -no-sm"
-QT_DISTRO_FLAGS_linuxstdbase = "-sm"
-
-QT_SQL_DRIVER_FLAGS ?= "-no-sql-ibase -no-sql-mysql -no-sql-psql -no-sql-odbc -plugin-sql-sqlite -system-sqlite"
-
-QT_GLFLAGS ?= ""
-
-
-QT_QT3SUPPORT ?= "-qt3support"
-QT_XML ?= "-xmlpatterns"
-QT_WEBKIT ?= "-webkit"
-QT_PHONON ?= "-phonon"
-QT_DBUS ?= "-qdbus"
-QT_MULTIMEDIA ?= "${@base_contains('DISTRO_FEATURES', 'pulseaudio', '-pulseaudio', '-no-pulseaudio', d)}"
-
-QT_CONFIG_FLAGS += "-release -no-cups -reduce-relocations \
- -shared -no-nas-sound -no-nis \
- -system-libjpeg -system-libpng -system-libtiff -system-zlib \
- -no-pch -stl -glib -icu \
- -no-rpath -silent \
- ${QT_DBUS} \
- ${QT_QT3SUPPORT} \
- ${QT_WEBKIT} \
- ${QT_PHONON} \
- ${QT_XML} \
- ${QT_MULTIMEDIA} \
- ${QT_SQL_DRIVER_FLAGS} \
- ${QT_DISTRO_FLAGS} \
- ${QT_GLFLAGS}"
-
-EXTRA_OEMAKE = "-e"
-
-EXTRA_ENV = 'QMAKE="${STAGING_BINDIR_NATIVE}/qmake2 -after \
- INCPATH+=${STAGING_INCDIR}/freetype2 LIBS+=-L${STAGING_LIBDIR}" \
- QMAKESPEC="${QMAKESPEC}" LINK="${CXX} -Wl,-rpath-link,${STAGING_LIBDIR}" \
- AR="${TARGET_PREFIX}ar cqs" \
- MOC="${STAGING_BINDIR_NATIVE}/moc4" UIC="${STAGING_BINDIR_NATIVE}/uic4" MAKE="make -e"'
-
-export QT_CONF_PATH="${WORKDIR}/qt.conf"
-
-# Library packages
-QT_LIB_NAMES = "Qt3Support QtAssistantClient QtCLucene QtCore QtDBus QtDesigner QtDesignerComponents QtGui QtHelp QtNetwork QtOpenGL QtScript QtScriptTools QtSql QtSvg QtTest QtUiTools QtWebKit QtXml QtXmlPatterns phonon QtMultimedia QtOpenVG QtMediaServices QtDeclarative"
-
-QT_EXTRA_LIBS = "pvrQWSWSEGL"
-
-python __anonymous () {
- lib_packages = []
- dev_packages = []
- dbg_packages = []
- staticdev_packages = []
- for name in d.getVar("QT_LIB_NAMES", True).split():
- pkg = d.getVar("QT_BASE_LIB", True) + name.lower().replace("qt", "").replace("_", "-") + "4"
- # NOTE: the headers for QtAssistantClient are different
- incname = name.replace("QtAssistantClient", "QtAssistant")
- d.setVar("FILES_%s" % pkg, "${libdir}/lib%(name)s${QT_LIBINFIX}.so.*" % locals())
- d.setVar("FILES_%s-dev" % pkg, """${libdir}/lib%(name)s${QT_LIBINFIX}.prl
- ${libdir}/lib%(name)s${QT_LIBINFIX}.la
- ${libdir}/lib%(name)s${QT_LIBINFIX}.so
- ${includedir}/${QT_DIR_NAME}/%(incname)s
- ${libdir}/pkgconfig/%(name)s${QT_LIBINFIX}.pc""" % locals())
- d.setVar("FILES_%s-staticdev" % pkg, "${libdir}/lib%(name)s${QT_LIBINFIX}.a" % locals())
- d.setVar("FILES_%s-dbg" % pkg, "${libdir}/.debug/lib%(name)s${QT_LIBINFIX}.so*" % locals())
- d.setVar("RRECOMMENDS_%s-dbg" % pkg, "${PN}-dbg")
- lib_packages.append(pkg)
- dev_packages.append("%s-dev" % pkg)
- dbg_packages.append("%s-dbg" % pkg)
- staticdev_packages.append("%s-staticdev" % pkg)
- for name in d.getVar("OTHER_PACKAGES", True).split():
- dbg_packages.append("%s-dbg" % name)
- staticdev_packages.append("%s-staticdev" % name)
-
- for name in d.getVar("QT_EXTRA_LIBS", True).split():
- pkg = d.getVar("QT_BASE_LIB", True) + name.lower().replace("qt", "").replace("_", "-") + "4"
- d.setVar("FILES_%s" % pkg, "${libdir}/lib%(name)s.so.*" % locals())
- d.setVar("FILES_%s-staticdev" % pkg, "${libdir}/lib%(name)s.a" % locals())
- d.setVar("FILES_%s-dev" % pkg, """${libdir}/lib%(name)s.prl
- ${libdir}/lib%(name)s.la
- ${libdir}/lib%(name)s.so
- ${includedir}/${QT_DIR_NAME}/%(incname)s
- ${libdir}/pkgconfig/%(name)s.pc""" % locals())
- d.setVar("FILES_%s-dbg" % pkg, "${libdir}/.debug/lib%(name)s.so*" % locals())
- d.setVar("RRECOMMENDS_%s-dbg" % pkg, "${PN}-dbg")
- lib_packages.append(pkg)
- dev_packages.append("%s-dev" % pkg)
- dbg_packages.append("%s-dbg" % pkg)
- staticdev_packages.append("%s-staticdev" % pkg)
-
- d.setVar("LIB_PACKAGES", " ".join(lib_packages))
- d.setVar("DEV_PACKAGES", " ".join(dev_packages))
- d.setVar("DBG_PACKAGES", " ".join(dbg_packages))
- d.setVar("STATICDEV_PACKAGES", " ".join(staticdev_packages))
-}
-
-OTHER_PACKAGES = "\
- ${QT_BASE_NAME}-tools \
- ${QT_BASE_NAME}-assistant \
- ${QT_BASE_NAME}-common \
- ${QT_BASE_NAME}-dbus \
- ${QT_BASE_NAME}-demos \
- ${QT_BASE_NAME}-designer \
- ${QT_BASE_NAME}-examples \
- ${QT_BASE_NAME}-linguist \
- ${QT_BASE_NAME}-makeqpf \
- ${QT_BASE_NAME}-mkspecs \
- ${QT_BASE_NAME}-pixeltool \
- ${QT_BASE_NAME}-qmlviewer \
- ${QT_BASE_NAME}-xmlpatterns \
- ${QT_BASE_NAME}-qt3to4 \
- ${QT_BASE_NAME}-qml-plugins"
-
-#We prepend so ${QT_BASE_NAME}-demos-doc comes before ${PN}-doc,so the packaging of FILES_ get done before.
-PACKAGES =+ "${QT_BASE_NAME}-demos-doc"
-PACKAGES += " \
- ${LIB_PACKAGES} \
- ${DEV_PACKAGES} \
- ${DBG_PACKAGES} \
- ${STATICDEV_PACKAGES} \
- ${OTHER_PACKAGES}"
-
-PACKAGES_DYNAMIC += "^${QT_BASE_NAME}-plugin-.* ^${QT_BASE_NAME}-translation-.* ^${QT_BASE_NAME}-phrasebook-.*"
-
-ALLOW_EMPTY_${PN} = "1"
-FILES_${PN} = ""
-FILES_${PN}-dev = "${includedir}/${QT_DIR_NAME}/Qt/*"
-FILES_${PN}-dbg = "/usr/src/debug/"
-FILES_${QT_BASE_NAME}-demos-doc = "${docdir}/${QT_DIR_NAME}/qch/qt.qch"
-RRECOMMENDS_${PN} = "${LIB_PACKAGES} ${OTHER_PACKAGES}"
-RRECOMMENDS_${PN}-dev = "${DEV_PACKAGES}"
-RRECOMMENDS_${PN}-dbg = "${DBG_PACKAGES}"
-RRECOMMENDS_${QT_BASE_LIB}core4_append_libc-glibc = " eglibc-gconv-utf-16"
-RRECOMMENDS_${QT_BASE_NAME}-demos += " \
- ${QT_BASE_NAME}-examples \
- ${QT_BASE_NAME}-plugin-sqldriver-sqlite \
- ${QT_BASE_NAME}-plugin-imageformat-jpeg \
- ${QT_BASE_NAME}-qml-plugins \
- ${QT_BASE_NAME}-assistant \
- ${QT_BASE_NAME}-demos-doc"
-RRECOMMENDS_${QT_BASE_NAME}-examples += " \
- ${QT_BASE_NAME}-plugin-sqldriver-sqlite \
- ${QT_BASE_NAME}-plugin-imageformat-jpeg \
- ${QT_BASE_NAME}-qml-plugins"
-RRECOMMENDS_${QT_BASE_NAME}-qmlviewer += " \
- ${QT_BASE_NAME}-qml-plugins"
-RRECOMMENDS_${QT_BASE_NAME}-doc += " \
- ${QT_BASE_NAME}-demos-doc"
-
-RPROVIDES_${QT_BASE_NAME}-tools += "qmake2"
-RREPLACES_${QT_BASE_NAME}-tools += "qmake2"
-
-FILES_${QT_BASE_NAME}-tools = "${bindir}/qttracereplay ${bindir}/qdoc* ${bindir}/qmake ${bindir}/moc ${bindir}/uic* ${bindir}/rcc"
-FILES_${QT_BASE_NAME}-tools-dbg = "${bindir}/.debug/qttracereplay ${bindir}/.debug/qdoc* ${bindir}/.debug/qmake ${bindir}/.debug/uic* ${bindir}/.debug/moc ${bindir}/.debug/rcc"
-FILES_${QT_BASE_NAME}-assistant = "${bindir}/*assistant* ${bindir}/qcollectiongenerator ${bindir}/qhelpconverter ${bindir}/qhelpgenerator"
-FILES_${QT_BASE_NAME}-assistant-dbg = "${bindir}/.debug/*assistant* ${bindir}/.debug/qcollectiongenerator ${bindir}/.debug/qhelpconverter ${bindir}/.debug/qhelpgenerator"
-FILES_${QT_BASE_NAME}-common = "${bindir}/qtconfig"
-FILES_${QT_BASE_NAME}-common-dbg = "${bindir}/.debug/qtconfig"
-FILES_${QT_BASE_NAME}-dbus = "${bindir}/qdbus ${bindir}/qdbusxml2cpp ${bindir}/qdbuscpp2xml ${bindir}/qdbusviewer"
-FILES_${QT_BASE_NAME}-dbus-dbg = "${bindir}/.debug/qdbus ${bindir}/.debug/qdbusxml2cpp ${bindir}/.debug/qdbuscpp2xml ${bindir}/.debug/qdbusviewer"
-FILES_${QT_BASE_NAME}-demos = "${bindir}/qtdemo* ${bindir}/${QT_DIR_NAME}/demos/*"
-FILES_${QT_BASE_NAME}-demos-staticdev = "${bindir}/${QT_DIR_NAME}/demos/shared/libdemo_shared.a"
-FILES_${QT_BASE_NAME}-demos-dbg = "${bindir}/.debug/qtdemo* ${bindir}/${QT_DIR_NAME}/demos/.debug/* ${bindir}/${QT_DIR_NAME}/demos/*/.debug ${bindir}/${QT_DIR_NAME}/demos/*/*/.debug ${bindir}/${QT_DIR_NAME}/demos/*/*/*/.debug"
-FILES_${QT_BASE_NAME}-designer = "${bindir}/*designer*"
-FILES_${QT_BASE_NAME}-designer-dbg = "${bindir}/.debug/*designer*"
-FILES_${QT_BASE_NAME}-examples = "${bindir}/${QT_DIR_NAME}/examples/*"
-FILES_${QT_BASE_NAME}-examples-staticdev = "${bindir}/${QT_DIR_NAME}/examples/tools/plugandpaint/plugins/libpnp_basictools.a"
-FILES_${QT_BASE_NAME}-examples-dbg = "${bindir}/${QT_DIR_NAME}/examples/.debug ${bindir}/${QT_DIR_NAME}/examples/*/.debug ${bindir}/${QT_DIR_NAME}/examples/*/*/.debug ${bindir}/${QT_DIR_NAME}/examples/*/*/*/.debug ${bindir}/${QT_DIR_NAME}/examples/*/*/*/*/.debug ${bindir}/${QT_DIR_NAME}/examples/declarative/*/*/*/*/*/.debug/* ${bindir}/${QT_DIR_NAME}/examples/declarative/*/*/*/*/.debug/*"
-FILES_${QT_BASE_NAME}-linguist = "${bindir}/*linguist* ${bindir}/lrelease ${bindir}/lupdate ${bindir}/lconvert ${bindir}/qm2ts"
-FILES_${QT_BASE_NAME}-linguist-dbg = "${bindir}/.debug/*linguist* ${bindir}/.debug/lrelease ${bindir}/.debug/lupdate ${bindir}/.debug/lconvert ${bindir}/.debug/qm2ts"
-FILES_${QT_BASE_NAME}-pixeltool = "${bindir}/pixeltool"
-FILES_${QT_BASE_NAME}-pixeltool-dbg = "${bindir}/.debug/pixeltool"
-FILES_${QT_BASE_NAME}-qt3to4 = "${bindir}/qt3to4 ${datadir}/${QT_DIR_NAME}/q3porting.xml"
-FILES_${QT_BASE_NAME}-qt3to4-dbg = "${bindir}/.debug/qt3to4"
-FILES_${QT_BASE_NAME}-qmlviewer = "${bindir}/qmlviewer"
-FILES_${QT_BASE_NAME}-qmlviewer-dbg = "${bindir}/.debug/qmlviewer"
-FILES_${QT_BASE_NAME}-makeqpf = "${bindir}/makeqpf"
-FILES_${QT_BASE_NAME}-makeqpf-dbg = "${bindir}/.debug/makeqpf"
-FILES_${QT_BASE_NAME}-mkspecs = "${datadir}/${QT_DIR_NAME}/mkspecs/* ${datadir}/${QT_DIR_NAME}/environment-setup"
-FILES_${QT_BASE_NAME}-xmlpatterns = "${bindir}/xmlpatterns*"
-FILES_${QT_BASE_NAME}-xmlpatterns-dbg = "${bindir}/.debug/xmlpatterns*"
-FILES_${QT_BASE_NAME}-qml-plugins = "${libdir}/${QT_DIR_NAME}/imports/* ${libdir}/${QT_DIR_NAME}/plugins/qmltooling/*"
-FILES_${QT_BASE_NAME}-qml-plugins-dbg = "${libdir}/${QT_DIR_NAME}/imports/*/*/*/.debug/* ${libdir}/${QT_DIR_NAME}/imports/*/.debug ${libdir}/${QT_DIR_NAME}/plugins/qmltooling/.debug"
-INSANE_SKIP_${MLPREFIX}${QT_BASE_NAME}-examples += "libdir"
-INSANE_SKIP_${MLPREFIX}${QT_BASE_NAME}-examples-dbg += "libdir"
-
-# License options, to be set by the recipe if different values are needed
-QT_LICENSE_FILE ?= ""
-QT_LICENSE_FLAGS ?= "-opensource"
-
-do_configure() {
- unset QMAKESPEC
- unset QTDIR
-
- set_arch
- set_endian
-
- if [ ! -e bin/qmake ]; then
- ln -sf ${STAGING_BINDIR_NATIVE}/qmake2 bin/qmake
- fi
-
- if [ ! -e mkspecs/${TARGET_OS}-oe-g++ ]; then
- ln -sf linux-g++ mkspecs/${TARGET_OS}-oe-g++
- fi
-
- if [ -f mkspecs/common/g++-unix.conf ] ; then
- # mkspecs were refactored for 4.8.0
- cp -f ${WORKDIR}/g++.conf mkspecs/common/g++-unix.conf
- else
- cp -f ${WORKDIR}/g++.conf mkspecs/common/g++.conf
- fi
- cp -f ${WORKDIR}/linux.conf mkspecs/common/
-
- echo "[Paths]" > $QT_CONF_PATH
- echo "Prefix=${prefix}" >> $QT_CONF_PATH
- echo "Documentation=${docdir}/${QT_DIR_NAME}" >> $QT_CONF_PATH
- echo "Headers=${includedir}/${QT_DIR_NAME}" >> $QT_CONF_PATH
- echo "Libraries=${libdir}" >> $QT_CONF_PATH
- echo "Binaries=${bindir}" >> $QT_CONF_PATH
- echo "Plugins=${libdir}/${QT_DIR_NAME}/plugins" >> $QT_CONF_PATH
- echo "Imports=${libdir}/${QT_DIR_NAME}/imports" >> $QT_CONF_PATH
- echo "Data=${datadir}/${QT_DIR_NAME}" >> $QT_CONF_PATH
- echo "Translations=${datadir}/${QT_DIR_NAME}/translations" >> $QT_CONF_PATH
- echo "Settings=${sysconfdir}/${QT_DIR_NAME}" >> $QT_CONF_PATH
- echo "Examples=${bindir}/${QT_DIR_NAME}/examples" >> $QT_CONF_PATH
- echo "Demos=${bindir}/${QT_DIR_NAME}/demos" >> $QT_CONF_PATH
-
- ${EXTRA_QMAKE_MUNGE}|| true
-
- echo yes | QT_LICENSE_FILE="${QT_LICENSE_FILE}" ./configure -v \
- -prefix ${prefix} \
- -bindir ${bindir} \
- -libdir ${libdir} \
- -datadir ${datadir}/${QT_DIR_NAME} \
- -sysconfdir ${sysconfdir}/${QT_DIR_NAME} \
- -docdir ${docdir}/${QT_DIR_NAME} \
- -headerdir ${includedir}/${QT_DIR_NAME} \
- -plugindir ${libdir}/${QT_DIR_NAME}/plugins \
- -importdir ${libdir}/${QT_DIR_NAME}/imports \
- -translationdir ${datadir}/${QT_DIR_NAME}/translations \
- -examplesdir ${bindir}/${QT_DIR_NAME}/examples \
- -demosdir ${bindir}/${QT_DIR_NAME}/demos \
- -platform ${TARGET_OS}-oe-g++ \
- -xplatform ${TARGET_OS}-oe-g++ \
- ${QT_ENDIAN} \
- -crossarch ${QT_ARCH} \
- ${QT_LICENSE_FLAGS} \
- ${QT_CONFIG_FLAGS} -no-fast \
- -L${STAGING_LIBDIR} -I${STAGING_INCDIR} \
- -I${STAGING_INCDIR}/freetype2
-}
-
-do_compile() {
- # Fixup missing wsegl header in some SGX SDKs
- if ! [ -e ${STAGING_INCDIR}/wsegl.h ] ; then
- cp src/3rdparty/powervr/wsegl.h src/plugins/gfxdrivers/powervr/QWSWSEGL/
- fi
-
- unset CFLAGS CXXFLAGS
-
- oe_runmake ${EXTRA_ENV}
-
- # Build target qmake
- export QMAKESPEC="${S}/mkspecs/${TARGET_OS}-oe-g++"
- cd ${S}/qmake
- ${OE_QMAKE_QMAKE}
- oe_runmake CC="${CC}" CXX="${CXX}"
- cd ${S}
-}
-
-python populate_packages_prepend() {
- translation_dir = d.expand('${datadir}/${QT_DIR_NAME}/translations/')
- translation_name = d.expand('${QT_BASE_NAME}-translation-%s')
- do_split_packages(d, translation_dir, '^(assistant|designer|linguist|qt|qtconfig|qvfb)_(.*)\.qm$', translation_name, '${PN} translation for %s', extra_depends='' )
-
- phrasebook_dir = d.expand('${datadir}/${QT_DIR_NAME}/phrasebooks/')
- phrasebook_name = d.expand('${QT_BASE_NAME}-phrasebook-%s')
-
- if os.path.exists("%s%s" % (d.expand('${D}'), phrasebook_dir)):
- do_split_packages(d, phrasebook_dir, '^(.*)\.qph$', phrasebook_name, '${PN} phrasebook for %s', extra_depends='' )
- else:
- bb.note("The path does not exist:", d.expand('${D}'), phrasebook_dir)
-
- # Package all the plugins and their -dbg version and create a meta package
- def qtopia_split(path, name, glob):
- """
- Split the package into a normal and -dbg package and then add the
- new packages to the meta package.
- """
- plugin_dir = d.expand('${libdir}/${QT_DIR_NAME}/plugins/%s/' % path)
- if not os.path.exists("%s%s" % (d.expand('${D}'), plugin_dir)):
- bb.note("The path does not exist:", d.expand('${D}'), plugin_dir)
- return
-
- plugin_name = d.expand('${QT_BASE_NAME}-plugin-%s-%%s' % name)
- dev_packages = []
- dev_hook = lambda file,pkg,b,c,d:dev_packages.append((file,pkg))
- do_split_packages(d, plugin_dir, glob, plugin_name, '${PN} %s for %%s' % name, extra_depends='', hook=dev_hook)
- # Create a -dbg package as well
- plugin_dir_dbg = d.expand('${libdir}/${QT_DIR_NAME}/plugins/%s/.debug' % path)
- packages = d.getVar('PACKAGES')
- for (file,package) in dev_packages:
- packages = "%s %s-dbg" % (packages, package)
- file_name = os.path.join(plugin_dir_dbg, os.path.basename(file))
- d.setVar("FILES_%s-dbg" % package, file_name)
- d.setVar("DESCRIPTION_%s-dbg" % package, "${PN} %s for %s" % (name, package))
-
- d.setVar('PACKAGES', packages)
-
- qtopia_split('accessible', 'accessible', '^libq(.*)\.so$')
- qtopia_split('codecs', 'codec', '^libq(.*)\.so$')
- qtopia_split('decorations', 'decoration', '^libqdecoration(.*)\.so$')
- qtopia_split('designer', 'designer', '^lib(.*)\.so$')
- qtopia_split('gfxdrivers', 'gfxdriver', '^libq(.*)\.so$')
- qtopia_split('graphicssystems','graphicssystems', '^libq(.*)\.so$')
- qtopia_split('kbddrivers', 'kbddriver', '^libq(.*)kbddriver\.so$')
- qtopia_split('mousedrivers', 'mousedriver', '^libq(.*)mousedriver\.so$')
- qtopia_split('iconengines', 'iconengine', '^libq(.*)\.so$')
- qtopia_split('imageformats', 'imageformat', '^libq(.*)\.so$')
- qtopia_split('inputmethods', 'inputmethod', '^libq(.*)\.so$')
- qtopia_split('sqldrivers', 'sqldriver', '^libq(.*)\.so$')
- qtopia_split('script', 'script', '^libqtscript(.*)\.so$')
- qtopia_split('styles', 'style', '^libq(.*)\.so$')
- qtopia_split('phonon_backend','phonon-backend','^libphonon_(.*)\.so$')
- qtopia_split('bearer', 'bearer', '^libq(.*)bearer\.so$')
-}
-
-do_install() {
- oe_runmake install INSTALL_ROOT=${D}
-
- # Install a proper target version of qmake
- rm ${D}/${bindir}/qmake
- install -m 0755 bin/qmake2 ${D}${bindir}/qmake
-
- # fix pkgconfig, libtool and prl files
- sed -i -e 's#-L${S}/lib/\?##g' \
- -e 's#-L${STAGING_LIBDIR}/\?##g' \
- -e 's#STAGING_LIBDIR}#libdir}'#g \
- -e 's#-L${libdir}/\?##g' \
- -e s#'$(OE_QMAKE_LIBS_X11)'#"${OE_QMAKE_LIBS_X11}"#g \
- -e 's#" -Wl,-rpath-link,${S}/lib/\?"##g' \
- -e 's#" -Wl,-rpath-link,${libdir}/\?"##g' \
- -e 's#Iin#I${in#g' \
- -e 's#-L\.\./\.\./WebCore/release\s\+-L\.\./\.\./JavaScriptCore/release\s\+-lwebcore##g' \
- -e 's#-ljscore##g' \
- ${D}${libdir}/*.la ${D}${libdir}/*.prl ${D}${libdir}/pkgconfig/*.pc
-
- sed -i -e s#" -Wl,-rpath-link,${S}/lib"##g \
- ${D}${datadir}/${QT_DIR_NAME}/mkspecs/common/linux.conf
-
- # fix pkgconfig files
- sed -i -e s#"moc_location=.*$"#"moc_location=${bindir}/moc4"# \
- -e s#"uic_location=.*$"#"uic_location=${bindir}/uic4"# \
- ${D}${libdir}/pkgconfig/*.pc
- for name in ${QT_LIB_NAMES}; do
- sed -i -e /Requires/s#"${name}"#"${name}${QT_LIBINFIX}"#g ${D}${libdir}/pkgconfig/*.pc
- done
-
- # QT abuses $includedir to point to its headers, which breaks pkgconfig sysroot, so manually fix it up here:
- for pc in ${D}${libdir}/pkgconfig/*.pc ; do
- sed -i -e "s:prefix}/include/${QT_DIR_NAME}/$(basename $pc .pc):prefix}/include:" \
- -e 's:IP{:I${:g' $pc
- done
-
- #Append an E to the qtdemo file
- if [ -n "${QT_LIBINFIX}" ] ; then
- [ -f ${D}${bindir}/qtdemo ] && mv ${D}${bindir}/qtdemo ${D}${bindir}/qtdemo${QT_LIBINFIX}
- fi
-
- script="${D}/${datadir}/${QT_DIR_NAME}/environment-setup"
- touch $script
- echo 'export QT_DIR_NAME=${QT_DIR_NAME}' >> $script
- echo 'export QT_LIBINFIX=${QT_LIBINFIX}' >> $script
- echo 'export OE_QMAKE_AR=ar' >> $script
- echo 'export OE_QMAKE_CC=gcc' >> $script
- echo 'export OE_QMAKE_CXX=g++' >> $script
- echo 'export OE_QMAKE_LINK=g++' >> $script
- echo 'export OE_QMAKE_LIBDIR_QT=${libdir}' >> $script
- echo 'export OE_QMAKE_INCDIR_QT=${includedir}/${QT_DIR_NAME}' >> $script
- echo 'export OE_QMAKE_MOC=${bindir}/moc' >> $script
- echo 'export OE_QMAKE_UIC=${bindir}/uic' >> $script
- echo 'export OE_QMAKE_UIC3=${bindir}/uic3' >> $script
- echo 'export OE_QMAKE_RCC=${bindir}/rcc' >> $script
- echo 'export OE_QMAKE_QDBUSCPP2XML=${bindir}/qdbuscpp2xml' >> $script
- echo 'export OE_QMAKE_QDBUSXML2CPP=${bindir}/qdbusxml2cpp' >> $script
- echo 'export OE_QMAKE_QT_CONFIG=${datadir}/${QT_DIR_NAME}/mkspecs/qconfig.pri' >> $script
- echo 'export QMAKESPEC=${datadir}/${QT_DIR_NAME}/mkspecs/linux-g++' >> $script
- chmod 0755 $script
-}
+++ /dev/null
-inherit siteinfo
-
-ARM_INSTRUCTION_SET = "arm"
-
-set_arch() {
- case ${TARGET_ARCH} in
- arm*) QT_ARCH=arm ;;
- i*86*) QT_ARCH=i386 ;;
- mips*) QT_ARCH=mips ;;
- powerpc*) QT_ARCH=powerpc ;;
- x86_64*) QT_ARCH=x86_64 ;;
- esac
-}
-
-set_endian() {
- if [ ${SITEINFO_ENDIANNESS} = "le" ] ; then
- QT_ENDIAN="-little-endian"
- elif [ ${SITEINFO_ENDIANNESS} = "be" ] ; then
- QT_ENDIAN="-big-endian"
- fi
-}
+++ /dev/null
-SUMMARY = "Simple music player using GTK+ and GStreamer"
-LICENSE = "GPLv2+"
-LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \
- file://main.c;beginline=1;endline=20;md5=0c02b4ef945956832b37a036b9cc103a"
-DEPENDS = "gtk+ gstreamer libowl-av"
-
-RDEPENDS_${PN} = "gst-plugins-base-audioconvert \
- gst-plugins-base-audioresample \
- gst-plugins-base-typefindfunctions \
- gst-plugins-base-playbin"
-
-RRECOMMENDS_${PN} = "gst-plugins-good-id3demux \
- gst-plugins-base-vorbis \
- gst-plugins-base-alsa \
- gst-plugins-base-ogg \
- ${COMMERCIAL_AUDIO_PLUGINS}"
-
-SRCREV = "a0be2fe4b5f12b8b07f4e3bd624b3729657f0ac5"
-PV = "0.1+git${SRCPV}"
-
-SRC_URI = "git://git.yoctoproject.org/${BPN}"
-
-S = "${WORKDIR}/git"
-
-inherit autotools pkgconfig
+++ /dev/null
-SUMMARY = "Sato theme engine for GTK+"
-HOMEPAGE = "http://www.o-hand.com"
-BUGTRACKER = "http://bugzilla.yoctoproject.org/"
-
-LICENSE = "LGPLv2.1 & LGPLv2+"
-
-SECTION = "x11/base"
-DEPENDS = "gtk+"
-RDEPENDS_gtk-theme-sato = "gtk-sato-engine"
-
-PACKAGES += "gtk-theme-sato"
-FILES_${PN} = "${libdir}/gtk-2.0/*/engines/*.so "
-FILES_${PN}-dev = "${libdir}/gtk-2.0/*/engines/*.la"
-FILES_${PN}-dbg += " ${libdir}/gtk-2.0/*/engines/.debug"
-FILES_gtk-theme-sato = "${datadir}/icons ${datadir}/themes"
-
-inherit autotools-brokensep pkgconfig
-
-do_configure_prepend() {
- for i in `ls gtk-common`; do
- ln -sf ../gtk-common/$i gtk2-engine/$i
- done
-}
+++ /dev/null
-require gtk-sato-engine.inc
-
-LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \
- file://src/sato-utils.h;endline=24;md5=708f28cfe7fe028d497aaf4389b80b62 \
- file://src/sato-main.c;endline=24;md5=b5e5dddebca570275becb51b526e4c5a"
-
-SRCREV = "4740ad8d53aba4368ce3e03b06cfdc69eb86dcdc"
-PV = "0.3.3+git${SRCPV}"
-
-SRC_URI = "git://git.yoctoproject.org/${BPN}"
-
-S = "${WORKDIR}/git"
-
-EXTRA_OECONF += "${@base_contains('MACHINE_FEATURES', 'qvga', '--with-mode=qvga', '',d)}"
+++ /dev/null
-require core-image-sato.bb
-
-DESCRIPTION = "Image with Sato for development work. It includes everything \
-within core-image-sato plus a native toolchain, application development and \
-testing libraries, profiling and debug symbols."
-
-IMAGE_FEATURES += "dev-pkgs"
+++ /dev/null
-require core-image-sato.bb
-
-DESCRIPTION = "Image with Sato support that includes everything within \
-core-image-sato plus meta-toolchain, development headers and libraries to \
-form a standalone SDK."
-
-QT4PKG = "qt4-pkgs"
-QT4PKG_mips64 = ""
-
-IMAGE_FEATURES += "dev-pkgs tools-sdk ${QT4PKG} \
- tools-debug eclipse-debug tools-profile tools-testapps debug-tweaks ssh-server-openssh"
-
-IMAGE_INSTALL += "kernel-dev"
-
+++ /dev/null
-DESCRIPTION = "Image with Sato, a mobile environment and visual style for \
-mobile devices. The image supports X11 with a Sato theme, Pimlico \
-applications, and contains terminal, editor, and file manager."
-
-IMAGE_FEATURES += "splash package-management x11-base x11-sato ssh-server-dropbear hwcodecs"
-
-LICENSE = "MIT"
-
-inherit core-image
-
-IMAGE_INSTALL += "packagegroup-core-x11-sato-games"
+++ /dev/null
-[Desktop Entry]
-Name=Notes
-Exec=/usr/bin/leafpad
-Comment=Text Editor
-Icon=accessories-text-editor
-Terminal=false
-Type=Application
-Categories=GTK;Utility;TextEditor;
-X-MB-SingleInstance=true
-StartupNotify=true
+++ /dev/null
-Upstream-Status: Inappropriate [enable feature]
-
---- tmp/src/menu.c.orig 2007-04-23 12:08:41.000000000 +0100
-+++ tmp/src/menu.c 2007-04-23 12:08:41.000000000 +0100
-@@ -152,7 +152,7 @@
- }
-
- accel_group = gtk_accel_group_new();
-- ifactory = gtk_item_factory_new(GTK_TYPE_MENU_BAR, "<main>", accel_group);
-+ ifactory = gtk_item_factory_new(GTK_TYPE_MENU, "<main>", accel_group);
- gtk_item_factory_set_translate_func(ifactory, menu_translate, NULL, NULL);
- gtk_item_factory_create_items(ifactory, nmenu_items, menu_items, NULL);
- gtk_window_add_accel_group(GTK_WINDOW(window), accel_group);
-
---- tmp/src/window.c.orig 2007-04-23 12:14:07.000000000 +0100
-+++ tmp/src/window.c 2007-04-23 12:14:07.000000000 +0100
-@@ -18,6 +18,8 @@
- */
-
- #include "leafpad.h"
-+#include <libowl/owlwindowmenu.h>
-+
- /*
- static void cb_scroll_event(GtkAdjustment *adj, GtkWidget *view)
- {
-@@ -52,7 +54,6 @@
- gtk_container_add(GTK_CONTAINER(window), vbox);
-
- menubar = create_menu_bar(window);
-- gtk_box_pack_start(GTK_BOX(vbox), menubar, FALSE, FALSE, 0);
-
- sw = gtk_scrolled_window_new(NULL, NULL);
- gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(sw),
-
---- tmp/src/main.c.orig 2007-04-23 12:15:03.000000000 +0100
-+++ tmp/src/main.c 2007-04-23 12:15:03.000000000 +0100
-@@ -244,6 +244,7 @@
- Conf *conf;
- GtkItemFactory *ifactory;
- gchar *stdin_data = NULL;
-+ GtkWidget *menu;
-
- bindtextdomain(PACKAGE, LOCALEDIR);
- bind_textdomain_codeset(PACKAGE, "UTF-8");
-@@ -293,7 +294,10 @@
- conf->autoindent);
-
- gtk_widget_show_all(pub->mw->window);
-+ owl_set_window_menu (GTK_WINDOW(pub->mw->window),
-+ GTK_MENU(pub->mw->menubar));
-+
- g_free(conf->fontname);
- g_free(conf);
-
-
---- tmp/src/Makefile.am.orig 2007-04-23 12:17:54.000000000 +0100
-+++ tmp/src/Makefile.am 2007-04-23 12:17:54.000000000 +0100
-@@ -27,4 +27,4 @@
- i18n.h
-
- leafpad_CFLAGS = $(GTK_CFLAGS) $(GNOMEPRINT_CFLAGS)
--leafpad_LDADD = $(GTK_LIBS) $(INTLLIBS) $(GNOMEPRINT_LIBS)
-+leafpad_LDADD = $(GTK_LIBS) $(INTLLIBS) $(GNOMEPRINT_LIBS) -lowl
+++ /dev/null
-SUMMARY = "Simple GTK+ Text Editor"
-HOMEPAGE = "http://tarot.freeshell.org/leafpad/"
-
-LICENSE = "GPLv2 & GPLv2+"
-LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
- file://src/leafpad.h;endline=20;md5=d3d6a89f5e61e8b13bdea537511ba1fa \
- file://src/utils.c;endline=20;md5=0d2cc6584ba3202448bb274f62739571"
-
-DEPENDS = "gtk+ intltool-native"
-DEPENDS_append_poky = " libowl"
-SRC_URI = "http://savannah.nongnu.org/download/${BPN}/${BPN}-${PV}.tar.gz \
- file://leafpad.desktop"
-
-SRC_URI[md5sum] = "254a72fc67505e3aa52884c729cd7b97"
-SRC_URI[sha256sum] = "959d22ae07f22803bc66ff40d373a854532a6e4732680bf8a96a3fbcb9f80a2c"
-PR = "r2"
-
-SRC_URI_append_poky = " file://owl-menu.patch;apply=yes "
-
-inherit autotools pkgconfig
-
-EXTRA_OECONF = " --enable-chooser --disable-emacs --disable-print"
-
-do_install_append () {
- install -d ${D}/${datadir}
- install -d ${D}/${datadir}/applications
- install -m 0644 ${WORKDIR}/leafpad.desktop ${D}/${datadir}/applications
-}
-
-FILES_${PN} += "${datadir}/applications/leafpad.desktop"
-
-PACKAGES += "leafpad-stock-icons"
-FILES_leafpad-stock-icons = "${datadir}/icons/hicolor/"
+++ /dev/null
-SUMMARY = "OpenedHand Widget Library"
-HOMEPAGE = "http://www.o-hand.com"
-BUGTRACKER = "http://bugzilla.yoctoproject.org/"
-
-LICENSE = "GPLv2 & LGPLv2+"
-LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
- file://libowl/owlpaned.h;endline=20;md5=7fef844c4cc01b10541a7ab6ab5971af \
- file://libowl/owltreemodelslice.h;endline=20;md5=a5421f2cdae8debe5e4c48c09a02beb9 \
- file://libowl/owlcolourswatch.h;endline=24;md5=063c415c58719d536990ca8f606b5730"
-
-SECTION = "libs"
-DEPENDS = "gtk+"
-SRCREV = "6ebc8ac8f8575278dd40a535cadefa26374e44b1"
-PV = "0.1+git${SRCPV}"
-
-SRC_URI = "git://git.yoctoproject.org/${BPN}"
-
-S = "${WORKDIR}/git"
-
-inherit autotools pkgconfig
+++ /dev/null
-Upstream-Status: Inappropriate [configuration]
-
-Index: appearance/mb-appearance.c
-===================================================================
---- appearance/mb-appearance.c (revision 1614)
-+++ appearance/mb-appearance.c (working copy)
-@@ -300,11 +300,13 @@
- gtk_font_button_set_font_name (GTK_FONT_BUTTON (font_button),
- gconf_value_get_string (value));
- } else if (strcmp (key, HANDED_KEY) == 0) {
-+#if 0
- GEnumValue *e;
- e = g_enum_get_value_by_name (g_type_class_ref (GTK_TYPE_CORNER_TYPE),
- gconf_value_get_string (value));
- gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (handed_check),
- e->value == GTK_CORNER_TOP_RIGHT);
-+#endif
- }
- }
-
-@@ -395,12 +397,13 @@
- gtk_container_add (GTK_CONTAINER (align), font_button);
-
- /* Left/Right Handed */
--
-+#if 0
- frame = new_frame (_("Orientation"), &align);
- gtk_box_pack_start (GTK_BOX (box), frame, TRUE, TRUE, 0);
- handed_check = gtk_check_button_new_with_mnemonic (_("_Left-handed"));
- g_signal_connect (handed_check, "toggled", G_CALLBACK (on_handed_set), NULL);
- gtk_container_add (GTK_CONTAINER (align), handed_check);
-+#endif
-
- gconf_client_add_dir (gconf, INTERFACE_DIR, GCONF_CLIENT_PRELOAD_ONELEVEL, NULL);
- g_signal_connect (gconf, "value-changed", G_CALLBACK (on_gconf_value_changed), NULL);
+++ /dev/null
-SUMMARY = "Matchbox GTK+ theme configuration application"
-HOMEPAGE = "http://matchbox-project.org"
-BUGTRACKER = "http://bugzilla.yoctoproject.org/"
-
-LICENSE = "GPLv2+"
-LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
- file://appearance/mb-appearance.c;endline=25;md5=ea92333cf8a6802639d62d874c114a28"
-
-DEPENDS = "gconf gtk+"
-RDEPENDS_${PN} = "settings-daemon"
-
-SRCREV = "3ed74dfb7c57be088a5ab36e446c0ccde9fa1028"
-PV = "0.0+git${SRCPV}"
-
-S = "${WORKDIR}/git"
-
-SRC_URI = "git://git.yoctoproject.org/${BPN} \
- file://no-handed.patch;striplevel=0"
-
-inherit autotools pkgconfig
-
+++ /dev/null
-SUMMARY = "Matchbox desktop folders for the Sato environment"
-HOMEPAGE = "http://matchbox-project.org"
-BUGTRACKER = "http://bugzilla.yoctoproject.org/"
-
-LICENSE = "GPLv2"
-LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552"
-
-SECTION = "x11"
-DEPENDS = ""
-RCONFLICTS_${PN} = "matchbox-common"
-
-SRCREV = "810b0b08eb79e4685202da2ec347b990bb467e07"
-PV = "0.1+git${SRCPV}"
-PR = "r1"
-
-SRC_URI = "git://git.yoctoproject.org/${BPN}"
-
-S = "${WORKDIR}/git"
-
-inherit autotools pkgconfig
-
-FILES_${PN} += "${datadir}"
+++ /dev/null
-after gcc linking has changed, all the libraries must be explicitely specified to for linking.
-This patch avoids this linking error:
-
-| make[2]: Entering directory `/disk0/pokybuild/build1/tmp/work/i586-poky-linux/matchbox-desktop-2.0+svnr2096-r0/matchbox-desktop-2/src'^M
-| ccache i586-poky-linux-gcc -march=i586 --sysroot=/disk0/pokybuild/build1/tmp/sysroots/i586-poky-linux -Wall -fexpensive-optimizations -fomit-frame-pointer -frename-registers -O2 -ggdb -feliminate-unused-debug-types -Wl,-O1 -Wl,--hash-style=gnu -Wl,--as-needed -o matchbox-desktop main.o taku-category-bar.o desktop.o ../libtaku/libtaku.a -pthread -lgtk-x11-2.0 -lgdk-x11-2.0 -latk-1.0 -lgio-2.0 -lpangoft2-1.0 -lgdk_pixbuf-2.0 -lpangocairo-1.0 -lcairo -lpango-1.0 -lfreetype -lfontconfig -lgobject-2.0 -lgmodule-2.0 -lgthread-2.0 -lrt -lglib-2.0 -ldbus-1 -lpthread -lrt -lstartup-notification-1 ../libtaku/libinotify.a^M
-| /disk0/pokybuild/build1/tmp/sysroots/x86_64-linux/usr/libexec/i586-poky-linux/gcc/i586-poky-linux/4.5.1/ld: F^A: invalid DSO for symbol `XFree' definition^M
-| /disk0/pokybuild/build1/tmp/sysroots/i586-poky-linux/usr/lib/libX11.so.6: could not read symbols: Bad value^M
-| collect2: ld returned 1 exit status^M
-| make[2]: *** [matchbox-desktop] Error 1
-
-Nitin A Kamble <nitin.a.kamble@intel.com>
-Date: 2011/01/11
-
-Upstream-Status: Accepted
-
-Index: matchbox-desktop-2/configure.ac
-===================================================================
---- matchbox-desktop-2.orig/configure.ac
-+++ matchbox-desktop-2/configure.ac
-@@ -14,7 +14,7 @@ if test x$inotify_support = xyes; then
- AC_DEFINE(WITH_INOTIFY, [1], [If inotify is enabled])
- fi
-
--PKG_CHECK_MODULES(GTK, gtk+-2.0)
-+PKG_CHECK_MODULES(GTK, [gtk+-2.0 x11])
-
- AC_ARG_ENABLE(startup_notification,
- AC_HELP_STRING([--disable-startup-notification], [disable startup notification support]),
+++ /dev/null
-SUMMARY = "Matchbox Window Manager Desktop"
-LICENSE = "GPLv2.0+"
-DEPENDS = "libmatchbox startup-notification"
-SECTION = "x11/wm"
-
-SRC_URI = "http://downloads.yoctoproject.org/releases/matchbox/matchbox-desktop/0.9/matchbox-desktop-${PV}.tar.bz2"
-
-SRC_URI[md5sum] = "3335a30b1a1aacfb39f23b505254765c"
-SRC_URI[sha256sum] = "ecb025d3660d80a9850973111b4fdfffaa50b47cbf0c5467b508d28d65146793"
-
-EXTRA_OECONF = "--enable-startup-notification --enable-dnotify"
-
-inherit autotools pkgconfig
-
-FILES_${PN} = "${bindir}/* \
- ${datadir}/applications \
- ${libdir}/matchbox/desktop/*.so \
- ${datadir}/matchbox-desktop \
- ${datadir}/pixmaps \
- ${sysconfdir}/matchbox"
-
-FILES_${PN}-dev += "${libdir}/matchbox-desktop \
- ${includedir}/matchbox-desktop \
- ${libdir}/matchbox/desktop/*.*a \
- ${datadir}/matchbox/desktop/modules/*a"
-
-FILES_${PN}-dbg += "${libdir}/matchbox/desktop/.debug/"
+++ /dev/null
-SUMMARY = "Matchbox Window Manager Desktop"
-LICENSE = "GPLv2.0+"
-DEPENDS = "gtk+ startup-notification"
-SECTION = "x11/wm"
-PR = "r2"
-
-SRC_URI = "http://downloads.yoctoproject.org/releases/matchbox/matchbox-desktop/2.0/matchbox-desktop-${PV}.tar.bz2 \
- file://dso_linking_change_build_fix.patch"
-
-SRC_URI[md5sum] = "b0a4a47130272e2adab4e9feb43a6c9c"
-SRC_URI[sha256sum] = "be33ff0bc8a9b1eee6af360a5118e470e69a6292ecc9e154ec6f349fce5c5f75"
-
-EXTRA_OECONF = "--enable-startup-notification"
-
-inherit autotools pkgconfig
+++ /dev/null
-SUMMARY = "Matchbox Window Manager Desktop"
-HOMEPAGE = "http://matchbox-project.org/"
-BUGTRACKER = "http://bugzilla.yoctoproject.org/"
-
-LICENSE = "GPLv2+ & LGPLv2+"
-LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
- file://libtaku/eggsequence.h;endline=20;md5=b91f68f7642a1459fa1f4c9df94a8f15 \
- file://src/desktop.c;endline=20;md5=36c9bf295e6007f3423095f405af5a2d \
- file://src/main.c;endline=19;md5=2044244f97a195c25b7dc602ac7e9a00"
-
-DEPENDS = "gtk+ startup-notification dbus"
-SECTION = "x11/wm"
-SRCREV = "71e3e6e04271e9d5a14f1c231ef100c7f320134d"
-PV = "2.0+git${SRCPV}"
-
-SRC_URI = "git://git.yoctoproject.org/${BPN}-2"
-
-EXTRA_OECONF = "--enable-startup-notification --with-dbus"
-
-S = "${WORKDIR}/git"
-
-inherit autotools pkgconfig
+++ /dev/null
-#!/bin/sh
-
-. /etc/formfactor/config
-
-CMD=""
-
-if [ "$HAVE_KEYBOARD" = "0" ]; then
- CMD="matchbox-keyboard -d"
-elif [ "$DISPLAY_CAN_ROTATE" = "1" ]; then
- if [ "$HAVE_KEYBOARD_PORTRAIT" = "1" -a "$HAVE_KEYBOARD_LANDSCAPE" = "0" ]; then
- CMD="matchbox-keyboard -d -o landscape"
- elif [ "$HAVE_KEYBOARD_LANDSCAPE" = "1" -a "$HAVE_KEYBOARD_PORTRAIT" = "0" ]; then
- CMD="matchbox-keyboard -d -o portrait"
- fi
-fi
-
-if [ "$CMD" ]; then
- # Delay to make sure the window manager is active
- # by waiting for the desktop to say its finished loading
- dbus-wait org.matchbox_project.desktop Loaded && $CMD &
-fi
+++ /dev/null
-Multiple matchbox-keyboard instances would occupy whole screen and cause X
-window segfault(Bug 509). Making matchbox-keyboard singleton is one work
-around.
-
-This patch allow only one instance of matchbox-keyboard based on some mechanism
-in matchbox-desktop. In future, an applet and GTK-IM modules in
-matchbox-keyboard can be used to automatically map/unmap the virtual keyboard
-on demand.
-
-Signed-off-by: Zhai Edwin <edwin.zhai@intel.com>
-
-Upstream-Status: Inappropriate [configuration]
-
-Index: matchbox-keyboard/matchbox-keyboard.desktop
-===================================================================
---- matchbox-keyboard.orig/matchbox-keyboard.desktop 2010-12-22 20:41:40.000000000 +0800
-+++ matchbox-keyboard/matchbox-keyboard.desktop 2010-12-22 20:42:12.000000000 +0800
-@@ -6,3 +6,5 @@
- Icon=matchbox-keyboard.png
- Categories=Panel;Utility;MB
- X-MB-INPUT-MECHANSIM=True
-+X-MB-SingleInstance=true
-+StartupNotify=true
+++ /dev/null
-SUMMARY = "Matchbox virtual keyboard for X11"
-HOMEPAGE = "http://matchbox-project.org"
-BUGTRACKER = "http://bugzilla.yoctoproject.org/"
-SECTION = "x11"
-
-LICENSE = "LGPLv2.1"
-LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c \
- file://src/matchbox-keyboard.h;endline=17;md5=9d6586c69e4a926f3cb0b4425f24ba3c \
- file://applet/applet.c;endline=18;md5=4a0f721724746b14d95b51ddd42b95e7"
-
-DEPENDS = "libfakekey expat libxft gtk+ matchbox-panel-2"
-
-SRCREV = "217f1bfe14c41cf7e291d04a63aa2d79cc13d063"
-PV = "0.0+git${SRCPV}"
-PR = "r4"
-
-SRC_URI = "git://git.yoctoproject.org/${BPN};branch=matchbox-keyboard-0-1 \
- file://single-instance.patch \
- file://80matchboxkeyboard.sh"
-
-S = "${WORKDIR}/git"
-
-inherit autotools pkgconfig gettext gtk-immodules-cache
-
-EXTRA_OECONF = "--disable-cairo --enable-gtk-im --enable-applet"
-
-PACKAGES += "${PN}-im ${PN}-applet"
-
-FILES_${PN} = "${bindir}/ \
- ${sysconfdir} \
- ${datadir}/applications \
- ${datadir}/pixmaps \
- ${datadir}/matchbox-keyboard"
-
-FILES_${PN}-dbg += "${libdir}/gtk-2.0/*/immodules/.debug"
-
-FILES_${PN}-im = "${libdir}/gtk-2.0/*/immodules/*.so"
-
-FILES_${PN}-applet = "${libdir}/matchbox-panel/*.so"
-
-
-do_install_append () {
- install -d ${D}/${sysconfdir}/X11/Xsession.d/
- install -m 755 ${WORKDIR}/80matchboxkeyboard.sh ${D}/${sysconfdir}/X11/Xsession.d/
-
- rm -f ${D}${libdir}/gtk-2.0/*/immodules/*.la
- rm -f ${D}${libdir}/matchbox-panel/*.la
-}
-
-GTKIMMODULES_PACKAGES = "${PN}-im"
-
-RDEPENDS_${PN} = "formfactor dbus-wait"
-RRECOMMENDS_${PN} = "${PN}-applet"
+++ /dev/null
-Don't warn if the machine doesn't actually have a battery, or if the applets
-string contains consecutive separators.
-
-Upstream-Status: Backport
-Signed-off-by: Ross Burton <ross.burton@intel.com>
-
-diff --git a/applets/battery/battery-acpi.c b/applets/battery/battery-acpi.c
-index 6515cb0..c44dd12 100644
---- a/applets/battery/battery-acpi.c
-+++ b/applets/battery/battery-acpi.c
-@@ -14,8 +14,6 @@ int batt_state, ac_state;
- int pm_support(void)
- {
- if(check_acpi_support() == NOT_SUPPORTED){
-- g_warning("No ACPI support\n");
--
- return 0;
- }
-
-@@ -32,8 +30,9 @@ const char* pm_battery_icon(void)
- const char *icon;
- battery_t *binfo;
-
-+ /* No battery available (not present, disabled, or something
-+ else. Silently do nothing. */
- if (batt_state != SUCCESS) {
-- g_warning("Couldnt initialize ACPI battery\n");
- return NULL;
- }
-
-diff --git a/applets/battery/battery-apm.c b/applets/battery/battery-apm.c
-index 5467438..2f39cb6 100644
---- a/applets/battery/battery-apm.c
-+++ b/applets/battery/battery-apm.c
-@@ -10,8 +10,6 @@
- int pm_support(void)
- {
- if (1 == apm_exists ()) {
-- g_warning ("No APM support");
--
- return 0;
- }
-
-diff --git a/matchbox-panel/mb-panel.c b/matchbox-panel/mb-panel.c
-index 2d8cafd..828a36d 100644
---- a/matchbox-panel/mb-panel.c
-+++ b/matchbox-panel/mb-panel.c
-@@ -110,10 +110,15 @@ load_applets (const char *applets_desc,
- applets = g_strsplit (applets_desc, ",", -1);
-
- for (i = 0; applets[i]; i++) {
-+ char *s;
- char **bits;
- GtkWidget *applet;
-
-- bits = g_strsplit (applets[i], ":", 2);
-+ s = applets[i];
-+ if (s == NULL || s[0] == '\0')
-+ continue;
-+
-+ bits = g_strsplit (s, ":", 2);
-
- applet = load_applet (bits[0],
- bits[1],
+++ /dev/null
-SUMMARY = "Simple GTK+ based panel for handheld devices"
-HOMEPAGE = "http://matchbox-project.org"
-BUGTRACKER = "http://bugzilla.yoctoproject.org/"
-
-LICENSE = "GPLv2+"
-LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
- file://matchbox-panel/mb-panel.h;endline=10;md5=0b7db28f4b6863fb853d0467e590019a \
- file://applets/startup/startup.c;endline=22;md5=b0a64fbef3097d79f8264e6907a98f03"
-
-DEPENDS = "gnome-common gtk+ startup-notification dbus dbus-glib"
-DEPENDS += " ${@base_contains("MACHINE_FEATURES", "acpi", "libacpi", "",d)}"
-DEPENDS += " ${@base_contains("MACHINE_FEATURES", "apm", "apmd", "",d)}"
-
-SRCREV = "26a3a67b41c50e0ae163d8fe86ccf7a0f0a671ae"
-PV = "2.0+git${SRCPV}"
-
-RPROVIDES_${PN} = "matchbox-panel"
-RREPLACES_${PN} = "matchbox-panel"
-RCONFLICTS_${PN} = "matchbox-panel"
-
-SRC_URI = "git://git.yoctoproject.org/${BPN} \
- file://silence-warnings.patch"
-
-EXTRA_OECONF = "--enable-startup-notification --enable-dbus"
-EXTRA_OECONF += " ${@base_contains("MACHINE_FEATURES", "acpi", "--with-battery=acpi", "",d)}"
-EXTRA_OECONF += " ${@base_contains("MACHINE_FEATURES", "apm", "--with-battery=apm", "",d)}"
-
-S = "${WORKDIR}/git"
-
-FILES_${PN} += "${libdir}/matchbox-panel/*.so \
- ${datadir}/matchbox-panel/brightness/*.png \
- ${datadir}/matchbox-panel/startup/*.png "
-FILES_${PN}-dbg += "${libdir}/matchbox-panel/.debug"
-FILES_${PN}-dev += "${libdir}/matchbox-panel/*.la"
-
-inherit autotools pkgconfig
+++ /dev/null
-#!/bin/sh
-
-. /etc/formfactor/config
-
-if [ "$HAVE_TOUCHSCREEN" = "1" ]; then
- SHOWCURSOR="no"
-else
- SHOWCURSOR="yes"
-fi
-
-if [ "$HAVE_KEYBOARD" = "1" ]; then
- KEYBOARD_APPLET=""
-else
- KEYBOARD_APPLET="keyboard"
-fi
-
-
-matchbox-desktop &
-
-# Lines containing feature-[foo] are removed at build time if the machine
-# doesn't have the feature "foo".
-
-START_APPLETS=showdesktop,windowselector
-END_APPLETS=clock,battery,$KEYBOARD_APPLET,systray,startup-notify,notify
-END_APPLETS=openmoko-panel-gsm,$END_APPLETS # feature-phone
-
-matchbox-panel --titlebar --start-applets $START_APPLETS --end-applets $END_APPLETS &
-
-exec matchbox-window-manager -theme Sato -use_desktop_mode decorated -use_cursor $SHOWCURSOR $@
+++ /dev/null
-SUMMARY = "Custom Matchbox session files for the Sato environment"
-HOMEPAGE = "http://www.matchbox-project.org/"
-BUGTRACKER = "http://bugzilla.yoctoproject.org/"
-
-LICENSE = "GPLv2.0+"
-LIC_FILES_CHKSUM = "file://session;endline=3;md5=f8a5c5b9c279e52dc094d10e11c2be63"
-
-SECTION = "x11"
-DEPENDS = "gconf-native"
-RDEPENDS_${PN} = "formfactor gtk-sato-engine matchbox-theme-sato gtk-theme-sato matchbox-panel-2 matchbox-desktop-sato matchbox-session gconf"
-PR = "r30"
-
-# This package is architecture specific because the session script is modified
-# based on the machine architecture.
-PACKAGE_ARCH = "${MACHINE_ARCH}"
-
-SRC_URI = "file://session"
-S = "${WORKDIR}"
-
-do_install() {
- # This is the set of machine features that the script has markers for
- FEATURES="phone"
- SCRIPT="${S}/sedder"
- rm -f $SCRIPT
- touch $SCRIPT
- for FEAT in $FEATURES; do
- if echo ${MACHINE_FEATURES} | awk "/$FEAT/ {exit 1}"; then
- echo "/feature-$FEAT/d" >> $SCRIPT
- fi
- done
-
- install -d ${D}/${sysconfdir}/matchbox
- sed -f "$SCRIPT" ${S}/session > ${D}/${sysconfdir}/matchbox/session
- chmod +x ${D}/${sysconfdir}/matchbox/session
-}
-
-pkg_postinst_${PN} () {
- set_value() {
- #type, name, value
- gconftool-2 --config-source=xml::$D${sysconfdir}/gconf/gconf.xml.defaults --direct --type $1 --set /desktop/poky/interface/$2 "$3"
- }
- set_value string theme Sato
- set_value string icon_theme Sato
- set_value bool touchscreen true
- set_value string font_name "Sans 9"
-}
+++ /dev/null
-SUMMARY = "Lightweight GTK+ terminal application"
-HOMEPAGE = "http://www.matchbox-project.org/"
-BUGTRACKER = "http://bugzilla.yoctoproject.org/"
-
-LICENSE = "GPLv2+"
-LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
- file://main.c;endline=20;md5=96e39176d9e355639a0b8b1c7a840820"
-
-DEPENDS = "gtk+ vte"
-SECTION = "x11/utils"
-SRCREV = "452bca253492a97a587f440289b9ab27d217353e"
-PV = "0.0+git${SRCPV}"
-
-SRC_URI = "git://git.yoctoproject.org/${BPN}"
-
-S = "${WORKDIR}/git"
-
-inherit autotools pkgconfig
+++ /dev/null
-SUMMARY = "Matchbox window manager Sato themes"
-HOMEPAGE = "http://www.matchbox-project.org/"
-BUGTRACKER = "http://bugzilla.yoctoproject.org/"
-
-LICENSE = "CC-BY-SA-3.0"
-LIC_FILES_CHKSUM = "file://COPYING;md5=aae86bb34b0a83716ca09f4e783d6ba4"
-
-DEPENDS = "matchbox-wm"
-SECTION = "x11/wm"
-
-inherit autotools pkgconfig
-
-FILES_${PN} += "${datadir}/themes"
+++ /dev/null
-require matchbox-theme-sato.inc
-
-PR = "r1"
-
-SRC_URI = "http://pokylinux.org/releases/sato/matchbox-theme-sato-0.1.tar.gz"
-
-SRC_URI[md5sum] = "72ae272ef7803141a3dcb69e670cff97"
-SRC_URI[sha256sum] = "5b59f9646edbfb907a309332db3bd6fa7080dc1fe24df549480cfae7d974a3fb"
+++ /dev/null
-require matchbox-theme-sato.inc
-
-SRCREV = "f72cf4ed7d71ad9e47b0f2d3dbc593bc2f3e76f8"
-PV = "0.2+git${SRCPV}"
-
-DEFAULT_PREFERENCE = "-1"
-
-SRC_URI = "git://git.yoctoproject.org/matchbox-sato"
-
-EXTRA_OECONF += "${@base_contains('MACHINE_FEATURES', 'qvga', '--with-mode=qvga', '',d)}"
-
-S = "${WORKDIR}/git"
+++ /dev/null
-SUMMARY = "A lightweight web browser"
-HOMEPAGE = "http://www.twotoasts.de/index.php?/pages/midori_summary.html"
-LICENSE = "LGPLv2.1"
-LIC_FILES_CHKSUM = "file://COPYING;md5=fbc093901857fcd118f065f900982c24"
-DEPENDS = "webkit-gtk libsoup-2.4 openssl python-native python-docutils-native librsvg-native libnotify libunique"
-
-SRC_URI = "http://www.midori-browser.org/downloads/${BPN}_${PV}_all_.tar.bz2 \
-"
-
-SRC_URI[md5sum] = "b99e87d4b73a4732ed1c1e591f0242ac"
-SRC_URI[sha256sum] = "ca69382a285222a86028abebd73fed1976735883027ff0adc094b627789bbd62"
-
-# midori depends on webkit-gtk, and webkit-gtk can NOT be built on
-# MIPS64 with n32 ABI. So remove it from mips64 n32 temporarily.
-COMPATIBLE_HOST_mips64 = "mips64.*-linux$"
-
-inherit gtk-icon-cache pkgconfig vala pythonnative
-
-do_configure() {
- sed -i -e 's:, shell=False::g' -e s:/usr/X11R6/include::g -e s:/usr/X11R6/lib::g wscript
- ./configure \
- --prefix=${prefix} \
- --bindir=${bindir} \
- --sbindir=${sbindir} \
- --libexecdir=${libexecdir} \
- --datadir=${datadir} \
- --sysconfdir=${sysconfdir} \
- --sharedstatedir=${sharedstatedir} \
- --localstatedir=${localstatedir} \
- --libdir=${libdir} \
- --includedir=${includedir} \
- --infodir=${infodir} \
- --mandir=${mandir} \
- --disable-gtk3 \
- --disable-zeitgeist \
-}
-
-PARALLEL_MAKE = ""
-TARGET_CC_ARCH += "${LDFLAGS}"
-
-do_install() {
- oe_runmake DESTDIR=${D} install
-}
-
-RRECOMMENDS_${PN} += "glib-networking ca-certificates gnome-icon-theme"
-
-FILES_${PN}-dev += "${datadir}/vala/vapi"
+++ /dev/null
-SUMMARY = "OpenedHand Widget Library Audio/Video"
-HOMEPAGE = "http://www.o-hand.com"
-BUGTRACKER = "http://bugzilla.yoctoproject.org/"
-
-LICENSE = "LGPLv2+"
-LIC_FILES_CHKSUM = "file://COPYING;md5=ac14b7ca45afea5af040da54db270eb0 \
- file://libowl-av/owl-video-widget.h;endline=22;md5=0d4caab10952acdf470086c25c7f70c8 \
- file://libowl-av/owl-audio-player.h;endline=22;md5=4af2d44f206a086f9f03881236f7390b"
-
-SECTION = "x11"
-DEPENDS = "gtk+ gstreamer gst-plugins-base"
-RDEPENDS_${PN} = "gst-meta-base"
-RRECOMMENDS_${PN} = "gst-meta-audio gst-meta-video"
-
-SRCREV = "03030c41ea578cfa74a2ffceb875675b248318ae"
-PV = "0.1+git${SRCPV}"
-PR = "r3"
-
-
-SRC_URI = "git://git.yoctoproject.org/${BPN}"
-
-S = "${WORKDIR}/git"
-
-inherit autotools pkgconfig
+++ /dev/null
-[Desktop Entry]
-Name=Video
-Exec=video
-Icon=video-player
-Terminal=false
-Type=Application
-Categories=AudioVideo;Video;Player;
-X-MB-SingleInstance=true
-StartupNotify=true
-Comment=Video Player
+++ /dev/null
-SUMMARY = "OpenedHand Widget Library video widget"
-HOMEPAGE = "http://o-hand.com/"
-BUGTRACKER = "http://bugzilla.yoctoproject.org/"
-LICENSE = "LGPLv2.1 & GPLv2+"
-LIC_FILES_CHKSUM = "file://COPYING;md5=ac14b7ca45afea5af040da54db270eb0 \
- file://src/video.c;endline=22;md5=e8e9f23c3691c11af7d8fc03264ca9da \
- file://src/bacon-volume.c;endline=20;md5=798804562b24e30bac482ba91c45e46d"
-SECTION = "x11"
-DEPENDS = "libowl-av"
-
-SRCREV = "07ab48f331a5e6e0d169e4892c7eb1fc22dc0b9d"
-PV = "0.1+git${SRCPV}"
-PR = "r2"
-
-S = "${WORKDIR}/git"
-
-SRC_URI = "git://git.yoctoproject.org/${BPN} \
- file://owl-video-widget.png \
- file://stock_media-play.png \
- file://stock_volume-0.png \
- file://stock_volume-min.png \
- file://stock_volume-med.png \
- file://stock_volume-max.png \
- file://owl-video-widget.desktop"
-
-inherit autotools pkgconfig
-
-do_install_append () {
- install -d ${D}/${datadir}/pixmaps
- install -m 0644 ${WORKDIR}/stock_media-play.png ${D}/${datadir}/pixmaps
- install -m 0644 ${WORKDIR}/stock_volume-0.png ${D}/${datadir}/pixmaps
- install -m 0644 ${WORKDIR}/stock_volume-min.png ${D}/${datadir}/pixmaps
- install -m 0644 ${WORKDIR}/stock_volume-med.png ${D}/${datadir}/pixmaps
- install -m 0644 ${WORKDIR}/stock_volume-max.png ${D}/${datadir}/pixmaps
- install -m 0644 ${WORKDIR}/owl-video-widget.png ${D}/${datadir}/pixmaps
-
- install -d ${D}/${datadir}/applications
- install -m 0644 ${WORKDIR}/owl-video-widget.desktop ${D}/${datadir}/applications
-}
-
-FILES_${PN} += "${datadir}/video"
+++ /dev/null
-#
-# Copyright (C) 2007-2008 OpenedHand Ltd.
-#
-
-SUMMARY = "Sato desktop"
-LICENSE = "MIT"
-PR = "r33"
-
-inherit packagegroup
-
-PACKAGE_ARCH = "${MACHINE_ARCH}"
-
-PACKAGES = "${PN} ${PN}-base ${PN}-apps ${PN}-games"
-
-# For backwards compatibility after rename
-RPROVIDES_${PN} = "task-core-x11-sato"
-RREPLACES_${PN} = "task-core-x11-sato"
-RCONFLICTS_${PN} = "task-core-x11-sato"
-
-RDEPENDS_${PN} = "\
- ${PN}-base \
- ${PN}-apps \
- ${PN}-games \
- "
-
-NETWORK_MANAGER ?= "connman-gnome"
-NETWORK_MANAGER_libc-uclibc = ""
-
-SUMMARY_${PN}-base = "Sato desktop - base packages"
-RDEPENDS_${PN}-base = "\
- matchbox-desktop \
- matchbox-session-sato \
- matchbox-keyboard \
- matchbox-keyboard-applet \
- matchbox-keyboard-im \
- matchbox-config-gtk \
- xcursor-transparent-theme \
- sato-icon-theme \
- settings-daemon \
- gtk-sato-engine \
- shutdown-desktop \
- libsdl \
- ${NETWORK_MANAGER} \
- udev-extraconf \
- "
-
-# pcmanfm doesn't work on mips
-FILEMANAGER ?= "pcmanfm"
-FILEMANAGER_mips ?= ""
-
-WEB ?= ""
-#WEB = "midori"
-
-SUMMARY_${PN}-apps = "Sato desktop - applications"
-RDEPENDS_${PN}-apps = "\
- leafpad \
- gaku \
- x11vnc \
- matchbox-terminal \
- sato-screenshot \
- ${FILEMANAGER} \
- ${WEB} \
- "
-
-SUMMARY_${PN}-games = "Sato desktop - games"
-RDEPENDS_${PN}-games = "\
- oh-puzzles \
- "
+++ /dev/null
-Disable the desktop preferences launcher as we don't use the pcmanfm desktop in
-Sato.
-
-Upstream-Status: Inappropriate
-Signed-off-by: Ross Burton <ross.burton@intel.com>
-
-diff --git a/data/pcmanfm-desktop-pref.desktop b/data/pcmanfm-desktop-pref.desktop
-index ccf8abb..3f6fc1c 100644
---- a/data/pcmanfm-desktop-pref.desktop.in
-+++ b/data/pcmanfm-desktop-pref.desktop.in
-@@ -7,3 +7,4 @@ Exec=pcmanfm --desktop-pref
- StartupNotify=true
- Terminal=false
- NotShowIn=GNOME;XFCE;KDE;
-+NoDisplay=true
+++ /dev/null
-SUMMARY = "Fast lightweight tabbed filemanager"
-HOMEPAGE = "http://pcmanfm.sourceforge.net/"
-
-LICENSE = "GPLv2 & GPLv2+ & LGPLv2.1+"
-LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \
- file://src/pcmanfm.h;endline=22;md5=417b3855771a3a87f8ad753d994491f0 \
- file://src/gseal-gtk-compat.h;endline=21;md5=46922c8691f58d124f9420fe16149ce2"
-
-SECTION = "x11"
-DEPENDS = "gtk+ startup-notification libfm"
-DEPENDS_append_poky = " libowl"
-
-
-COMPATIBLE_HOST = '(x86_64.*|i.86.*|aarch64.*|arm.*|mips.*|powerpc.*|sh.*)-(linux|freebsd.*)'
-
-SRC_URI = "${SOURCEFORGE_MIRROR}/pcmanfm/pcmanfm-${PV}.tar.gz \
- file://gnome-fs-directory.png \
- file://gnome-fs-regular.png \
- file://gnome-mime-text-plain.png \
- file://emblem-symbolic-link.png \
- file://no-desktop.patch"
-
-SRC_URI[md5sum] = "41104699e653ff2b0a9a9e80a257d6a2"
-SRC_URI[sha256sum] = "23ee33b34066ac83ce9a98bc9930049e69839438fb60489bd453bec8c2068950"
-
-inherit autotools pkgconfig
-
-do_install_append () {
- install -d ${D}/${datadir}
- install -d ${D}/${datadir}/pixmaps/
-
- install -m 0644 ${WORKDIR}/*.png ${D}/${datadir}/pixmaps
-}
+++ /dev/null
-This patch enable owl menu, which is hidden in the title bar to save space on
-small screen. It has not been used for a long time, rebase needed.
-
-Upstream-Status: Inappropriate [enable feature]
-
-Index: src/gtk.c
-===================================================================
---- src/gtk.c (revision 22)
-+++ src/gtk.c (working copy)
-@@ -28,6 +28,8 @@
- #include <gdk/gdkx.h>
- #include <gdk-pixbuf/gdk-pixbuf.h>
-
-+#include <libowl/owlwindowmenu.h>
-+
- #include <librsvg/rsvg.h>
-
- #include <X11/Xlib.h>
-@@ -1237,6 +1239,7 @@
- }
- }
-
-+#if 0
- static void
- add_widget (GtkUIManager *merge,
- GtkWidget *widget,
-@@ -1247,10 +1250,11 @@
- gtk_box_pack_start (box, widget, FALSE, FALSE, 0);
-
- toplevel = gtk_widget_get_toplevel (GTK_WIDGET (box));
-- gtk_widget_show_all (toplevel);
- }
-+#endif
-
- static GtkActionEntry toplevel_actions[] = {
-+ { "Top", NULL, "" },
- { "Game", NULL, N_("Game") },
- { "Settings", NULL, N_("Settings") },
- { "Help", NULL, N_("Help") },
-@@ -1303,11 +1307,13 @@
- frontend *fe)
- {
- GString *xml;
-+ GError *error = NULL;
- gboolean presets = FALSE;
- GSList *radio_group = NULL;
- int i;
-
-- xml = g_string_new ("<ui><menubar><placeholder name=\"TypePlaceholder\">"
-+ xml = g_string_new ("<ui><menubar><menu name=\"TopMenu\" action=\"Top\">"
-+ "<placeholder name=\"TypePlaceholder\">"
- "<menu name=\"SettingsMenu\" action=\"Settings\">");
-
- for (i = 0; i < midend_num_presets(fe->me); i++) {
-@@ -1359,8 +1365,14 @@
- "<menuitem name=\"CustomMenu\" action=\"Custom\"/>");
- }
-
-- g_string_append (xml, "</menu></placeholder></menubar></ui>");
-- gtk_ui_manager_add_ui_from_string (merge, xml->str, -1, NULL);
-+ g_string_append (xml, "</menu></placeholder></menu></menubar></ui>");
-+
-+ gtk_ui_manager_add_ui_from_string (merge, xml->str, -1, &error);
-+ if (error != NULL) {
-+ g_warning ("Error adding custom: %s", error->message);
-+ g_error_free (error);
-+ }
-+
- g_string_free (xml, TRUE);
- }
-
-@@ -1434,6 +1446,7 @@
- new_window(char *arg, char **error)
- {
- frontend *fe;
-+ GError *err = NULL;
- GtkBox *vbox;
- GtkUIManager *merge;
- GtkActionGroup *actions;
-@@ -1496,8 +1509,6 @@
- gtk_window_add_accel_group(GTK_WINDOW(fe->window), fe->accelgroup);
-
- merge = gtk_ui_manager_new ();
-- g_signal_connect (G_OBJECT (merge), "add_widget",
-- G_CALLBACK (add_widget), vbox);
-
- actions = gtk_action_group_new ("PuzzleActions");
- gtk_action_group_add_actions (actions, toplevel_actions,
-@@ -1509,22 +1520,39 @@
-
- gtk_ui_manager_insert_action_group (merge, actions, 0);
-
-- gtk_ui_manager_add_ui_from_file (merge, DATADIR "/oh-puzzles/ui/menu.xml", NULL);
-+ gtk_ui_manager_add_ui_from_file (merge, DATADIR "/oh-puzzles/ui/menu.xml",
-+ &err);
-+ if (err != NULL) {
-+ g_warning ("Error making UI: %s", err->message);
-+ g_error_free (err);
-+ err = NULL;
-+ }
-
- if (thegame.can_solve) {
-- char *str = "<ui><menubar><menu name=\"GameMenu\" action=\"Game\">"
-+ char *str = "<ui><menubar><menu name=\"TopMenu\" action=\"Top\">"
-+ "<menu name=\"GameMenu\" action=\"Game\">"
- "<placeholder name=\"SolvePlaceholder\">"
- "<separator name=\"SolveSep\"/>"
- "<menuitem name=\"SolveMenu\" action=\"Solve\"/>"
-- "</placeholder></menu></menubar></ui>";
-+ "</placeholder></menu></menu></menubar></ui>";
-
-- gtk_ui_manager_add_ui_from_string (merge, str, -1, NULL);
-+ gtk_ui_manager_add_ui_from_string (merge, str, -1, &err);
-+ if (err != NULL) {
-+ g_warning ("Error adding solve. %s", err->message);
-+ g_error_free (err);
-+ }
- }
-
- if ((n = midend_num_presets(fe->me)) > 0 || thegame.can_configure) {
- generate_settings_menu (merge, actions, fe);
- }
-
-+ /* Do this so that the menu is packed now instead of in the idle loop */
-+ gtk_ui_manager_ensure_update (merge);
-+
-+ owl_set_window_menu_item (GTK_WINDOW (fe->window),
-+ GTK_MENU_ITEM (gtk_ui_manager_get_widget (merge, "/menubar/TopMenu")));
-+
- setup_colours (fe);
- setup_pixbufs (fe);
-
-@@ -1572,7 +1600,7 @@
- GDK_BUTTON_RELEASE_MASK |
- GDK_BUTTON_MOTION_MASK);
-
-- /* The window is shown once the menubar has been added */
-+ gtk_widget_show_all (fe->window);
- return fe;
- }
-
-Index: src/menu.xml
-===================================================================
---- src/menu.xml (revision 22)
-+++ src/menu.xml (working copy)
-@@ -1,26 +1,25 @@
- <ui>
- <menubar>
--<menu name="GameMenu" action="Game">
-- <menuitem name="NewMenu" action="New"/>
-- <menuitem name="RestartMenu" action="Restart"/>
--<!-- <menuitem name="SpecificMenu" action="Specific"/> -->
-- <menuitem name="RandomMenu" action="Random"/>
-- <separator name="GameSep1"/>
-- <menuitem name="LoadMenu" action="Load"/>
-- <menuitem name="SaveMenu" action="Save"/>
-- <separator name="GameSep2"/>
-- <menuitem name="UndoMenu" action="Undo"/>
-- <menuitem name="RedoMenu" action="Redo"/>
-- <placeholder name="CopyPlaceholder"/>
-- <placeholder name="SolvePlaceholder"/>
-- <separator name="GameSep3"/>
-- <menuitem name="QuitMenu" action="Quit"/>
--</menu>
-+<menu name="TopMenu" action="Top">
-+ <menu name="GameMenu" action="Game">
-+ <menuitem name="NewMenu" action="New"/>
-+ <menuitem name="RestartMenu" action="Restart"/>
-+ <!-- <menuitem name="SpecificMenu" action="Specific"/> -->
-+ <menuitem name="RandomMenu" action="Random"/>
-+ <separator name="GameSep1"/>
-+ <menuitem name="LoadMenu" action="Load"/>
-+ <menuitem name="SaveMenu" action="Save"/>
-+ <separator name="GameSep2"/>
-+ <menuitem name="UndoMenu" action="Undo"/>
-+ <menuitem name="RedoMenu" action="Redo"/>
-+ <placeholder name="CopyPlaceholder"/>
-+ <placeholder name="SolvePlaceholder"/>
-+ </menu>
-
--<placeholder name="TypePlaceholder"/>
--
--<menu name="HelpMenu" action="Help">
-+ <placeholder name="TypePlaceholder"/>
- <menuitem name="AboutMenu" action="About"/>
-+ <menuitem name="QuitMenu" action="Quit"/>
-+
- </menu>
- </menubar>
- </ui>
-Index: src/Makefile.am
-===================================================================
---- src/Makefile.am (revision 22)
-+++ src/Makefile.am (working copy)
-@@ -10,7 +10,7 @@
- lightup loopy map mines net netslide pattern pegs rect samegame \
- sixteen slant solo tents twiddle untangle
-
--libpuzzles_la_LIBADD = $(PUZZLES_LIBS)
-+libpuzzles_la_LIBADD = $(PUZZLES_LIBS) -lowl
- libpuzzles_la_SOURCES = combi.c \
- configuration.c \
- drawing.c \
+++ /dev/null
-SUMMARY = "Portable Puzzle Collection"
-HOMEPAGE = "http://o-hand.com/"
-BUGTRACKER = "http://bugzilla.yoctoproject.org/"
-
-LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://LICENCE;md5=f56ec6772dd1c7c367067bbea8ea1675 \
- file://src/tree234.h;endline=28;md5=a188e6d250430ca094a54a82f48472a7 \
- file://src/tree234.c;endline=28;md5=b4feb1976feebf8f1379093ed52f2945"
-
-SECTION = "x11"
-DEPENDS = "gtk+ gconf intltool-native librsvg"
-DEPENDS_append_poky = " libowl"
-
-SRCREV = "92f1a20e4b72eed7a35b00984d9793b51dc2fb3b"
-PV = "0.2+git${SRCPV}"
-PR = "r10"
-
-SRC_URI = "git://git.yoctoproject.org/${BPN}"
-SRC_URI_append_poky = " file://oh-puzzles-owl-menu.patch;striplevel=0 "
-
-S = "${WORKDIR}/git"
-
-inherit autotools pkgconfig
-
-bindir = "/usr/games"
-
-EXTRA_OEMAKE += "GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1"
-
-do_install_append () {
- install -d ${D}/${datadir}/applications/
-
- cd ${D}/${prefix}/games
- for prog in *; do
- if [ -x $prog ]; then
- # Convert prog to Title Case
- title=$(echo $prog | sed 's/\(^\| \)./\U&/g')
- echo "making ${D}/${datadir}/applications/$prog.desktop"
- cat <<STOP > ${D}/${datadir}/applications/$prog.desktop
-[Desktop Entry]
-Name=$title
-Exec=${prefix}/games/$prog
-Icon=applications-games
-Terminal=false
-Type=Application
-Categories=Game;
-StartupNotify=true
-X-MB-SingleInstance=true
-Comment=Play $title.
-STOP
- fi
- done
-}
-
-PACKAGES += "${PN}-extra"
-RDEPENDS_${PN}-extra += "oh-puzzles"
-
-FILES_${PN} = "/usr/share/pixmaps /usr/share/oh-puzzles/"
-FILES_${PN}-dbg += "/usr/games/.debug/*"
-FILES_${PN}-extra = "/usr/games/ /usr/share/applications /etc/gconf/schemas"
-
-python __anonymous () {
- var = bb.data.expand("FILES_${PN}", d, 1)
- data = d.getVar(var, True)
- for name in ("bridges", "fifteen", "inertia", "map", "samegame", "slant"):
- data = data + " /usr/games/%s" % name
- data = data + " /usr/share/applications/%s.desktop" % name
- data = data + " /etc/gconf/schemas/%s.schemas" % name
- d.setVar(var, data)
-}
+++ /dev/null
-SUMMARY = "Simon Tatham's Portable Puzzle Collection"
-HOMEPAGE = "http://www.chiark.greenend.org.uk/~sgtatham/puzzles/"
-
-DEPENDS = "gtk+ libxt"
-MOD_PV = "${@d.getVar('PV',1)[1:]}"
-
-LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://LICENCE;md5=33bcd4bce8f3c197f2aefbdbd2d299bc"
-
-SRC_URI = "svn://svn.tartarus.org/sgt;module=puzzles;rev=${MOD_PV}"
-
-S = "${WORKDIR}/${BPN}"
-
-inherit autotools-brokensep
-
-do_configure_prepend () {
- ./mkfiles.pl
-}
-
-FILES_${PN} = "${prefix}/bin/* ${datadir}/applications/*"
-FILES_${PN}-dbg += "${prefix}/bin/.debug"
-
-do_install () {
- rm -rf ${D}/*
- export prefix=${D}
- export DESTDIR=${D}
- install -d ${D}/${prefix}/bin/
- oe_runmake install
-
-
- install -d ${D}/${datadir}/applications/
-
- # Create desktop shortcuts
- cd ${D}/${prefix}/bin
- for prog in *; do
- if [ -x $prog ]; then
- # Convert prog to Title Case
- title=$(echo $prog | sed 's/\(^\| \)./\U&/g')
- echo "making ${D}/${datadir}/applications/$prog.desktop"
- cat <<STOP > ${D}/${datadir}/applications/$prog.desktop
-[Desktop Entry]
-Name=$title
-Exec=${prefix}/bin/$prog
-Icon=applications-games
-Terminal=false
-Type=Application
-Categories=Game;
-StartupNotify=true
-X-MB-SingleInstance=true
-STOP
- fi
- done
-}
+++ /dev/null
-[Desktop Entry]
-Version=1.0
-Name=Terminal
-Comment=A unicode capable rxvt clone
-Exec=rxvt
-Icon=terminal
-Terminal=false
-Type=Application
-Categories=Utility;TerminalEmulator;
+++ /dev/null
-Upstream-Status: Pending
-
-diff -ruN rxvt-unicode-9.10-orig//src/screen.C rxvt-unicode-9.10/src/screen.C
---- rxvt-unicode-9.10-orig//src/screen.C 2011-04-19 13:34:01.327664984 +0800
-+++ rxvt-unicode-9.10/src/screen.C 2011-04-19 13:34:47.037665001 +0800
-@@ -3152,7 +3152,7 @@
- return false;
- }
-
--#if 0
-+#if HAVE_XWC
- XTextProperty ct;
-
- if (XwcTextListToTextProperty (dpy, &selection.text, 1, XStringStyle, &ct) >= 0)
-@@ -3734,9 +3734,11 @@
- }
- else
- #endif
-+#ifdef HAVE_XWC
- if (XwcTextListToTextProperty (dpy, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0)
- freect = 1;
- else
-+#endif
- {
- /* if we failed to convert then send it raw */
- ct.value = (unsigned char *)cl;
+++ /dev/null
-SECTION = "x11/utils"
-SUMMARY = "rxvt terminal clone supporting unicode"
-DESCRIPTION = "rxvt-unicode is a clone of the well known \
-terminal emulator rxvt, modified to store text in Unicode \
-(either UCS-2 or UCS-4) and to use locale-correct input and \
-output. It also supports mixing multiple fonts at the \
-same time, including Xft fonts."
-LICENSE = "GPLv2+"
-LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
- file://src/main.C;beginline=1;endline=31;md5=775485398a09fa7aee6f90464af88432"
-
-DEPENDS = "virtual/libx11 libxt libxft gdk-pixbuf"
-
-SRC_URI = "http://dist.schmorp.de/rxvt-unicode/Attic/rxvt-unicode-${PV}.tar.bz2 \
- file://xwc.patch \
- file://rxvt.desktop \
- file://rxvt.png"
-
-SRC_URI[md5sum] = "45ad197eb9b5a840c0f65e3a8131921c"
-SRC_URI[sha256sum] = "d9237cf1973af461ecbeeb708e4d00893294771558e8338b4f33418ed52d3241"
-
-inherit autotools update-alternatives
-
-PROVIDES = "virtual/x-terminal-emulator"
-ALTERNATIVE_${PN} = "x-terminal-emulator"
-ALTERNATIVE_TARGET[x-terminal-emulator] = "${bindir}/rxvt"
-
-CFLAGS_append = " -fpermissive"
-
-EXTRA_OECONF = "--enable-menubar --enable-xim \
- --enable-utmp --enable-wtmp --enable-lastlog \
- --disable-strings --with-term=rxvt --enable-keepscrolling \
- --enable-xft --with-name=rxvt --enable-frills \
- --enable-swapscreen --enable-transparency \
- --with-codesets=eu \
- --enable-cursor-blink --enable-pointer-blank \
- --enable-text-blink --enable-rxvt-scroll \
- --enable-combining --enable-shared \
- --enable-xgetdefault \
- --disable-perl \
- --with-x=${STAGING_DIR_HOST}${prefix}"
-
-do_configure_prepend () {
- if [ ! -e ${S}/acinclude.m4 ]; then
- cp ${S}/aclocal.m4 ${S}/acinclude.m4
- fi
-}
-
-do_compile_prepend () {
- echo '#define UTMP_FILE "${localstatedir}/run/utmp"' >> config.h
- echo '#define WTMP_FILE "${localstatedir}/log/wtmp"' >> config.h
- echo '#define LASTLOG_FILE "${localstatedir}/log/lastlog"' >> config.h
- echo '#define HAVE_XLOCALE 1' >> config.h
-}
-
-do_install_append () {
- install -d ${D}/${datadir}
- install -d ${D}/${datadir}/applications
- install -d ${D}/${datadir}/pixmaps/
-
- install -m 0644 ${WORKDIR}/rxvt.png ${D}/${datadir}/pixmaps
- install -m 0644 ${WORKDIR}/rxvt.desktop ${D}/${datadir}/applications
-}
-
-FILES_${PN} += "${datadir}/applications/rxvt.desktop ${datadir}/pixmaps/rxvt.png"
+++ /dev/null
-From b9f02989310a3c920589f1aa646bcbf16b2572a0 Mon Sep 17 00:00:00 2001
-From: Ross Burton <ross.burton@intel.com>
-Date: Wed, 13 Jun 2012 11:07:33 +0100
-Subject: [PATCH] Inherit the GNOME icon theme
-
-If the GNOME icon theme isn't installed this is a no-op, but if it is then
-you'll get fallback from Sato to GNOME for icons that are not in Sato.
-
-As applications that use the full GNOME icon theme depend on gnome-icon-theme,
-this just works.
-
-Upstream-Status: Backport
----
- index.theme | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/index.theme b/index.theme
-index c4b03a7..688fbbf 100644
---- a/index.theme
-+++ b/index.theme
-@@ -1,6 +1,7 @@
- [Icon Theme]
- Name=Sato
- Comment=Sato icon theme
-+Inherits=gnome
-
- Directories=16x16/apps,16x16/status,16x16/stock,16x16/places,16x16/mimetypes,16x16/devices,16x16/actions,22x22/apps,22x22/status,22x22/stock,22x22/places,22x22/mimetypes,22x22/devices,22x22/actions,32x32/apps,32x32/status,32x32/stock,32x32/places,32x32/mimetypes,32x32/devices,32x32/actions,48x48/apps,48x48/status,48x48/stock,48x48/places,48x48/mimetypes,48x48/devices,48x48/actions,64x64/apps,64x64/status,64x64/stock,64x64/places,64x64/mimetypes,64x64/devices,64x64/actions,
-
---
-1.7.10
-
+++ /dev/null
-SUMMARY = "Sato icon theme"
-HOMEPAGE = "http://www.o-hand.com"
-BUGTRACKER = "http://bugzilla.yoctoproject.org/"
-
-LICENSE = "CC-BY-SA-3.0"
-LIC_FILES_CHKSUM = "file://COPYING;md5=56a830bbe6e4697fe6cbbae01bb7c2b2"
-SECTION = "x11"
-
-PR = "r6"
-
-DEPENDS = "icon-naming-utils-native libxml-simple-perl-native"
-
-SRC_URI = "http://pokylinux.org/releases/sato/${BPN}-${PV}.tar.gz \
- file://0001-Inherit-the-GNOME-icon-theme.patch"
-
-SRC_URI[md5sum] = "86a847f3128a43a9cf23b7029a656f50"
-SRC_URI[sha256sum] = "0b0a2807a6a96918ac799a86094ec3e8e2c892be0fd679a4232c2a77f2f61732"
-
-inherit autotools pkgconfig allarch gtk-icon-cache perlnative
-
-# The configure script uses pkg-config to find native binaries to execute, so
-# tell it to use our pkg-config-native wrapper.
-export PKG_CONFIG = "pkg-config-native"
-
-FILES_${PN} += "${datadir}/icons/Sato"
-
-do_install_append() {
- find ${D}${datadir}/icons/Sato/ -maxdepth 1 -type d -exec ln -s preferences-system.png {}/apps/preferences-desktop.png \;
- find ${D}${datadir}/icons/Sato/ -maxdepth 1 -type d -exec ln -s file-manager.png {}/apps/system-file-manager.png \;
- find ${D}${datadir}/icons/Sato/ -maxdepth 1 -type d -exec ln -s ../apps/terminal.png {}/places/computer.png \;
-}
-
-# Explictly setting "Sato" as the default icon theme to avoid flickering from
-# the desktop and settings daemon racing. This shouldn't be done here but in the sato image
-pkg_postinst_${PN} () {
- mkdir -p $D/etc/gtk-2.0
-
- grep -s -q -e ^gtk-icon-theme-name.*\"Sato\" $D/etc/gtk-2.0/gtkrc || \
- echo 'gtk-icon-theme-name = "Sato"' >> $D/etc/gtk-2.0/gtkrc
-}
+++ /dev/null
-SUMMARY = "Ultra-simple screen capture utility, aimed at handheld devices"
-HOMEPAGE = "http://www.o-hand.com"
-BUGTRACKER = "http://bugzilla.yoctoproject.org/"
-
-LICENSE = "GPLv2 & GPLv2+"
-LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
- file://main.c;endline=9;md5=023e14d6404d0a961eb97cbd011fc141 \
- file://screenshot-ui.h;endline=9;md5=638d9ffa83e9325a36df224166ed6ad0"
-
-DEPENDS = "matchbox-panel-2"
-SRCREV = "3a9688e8a01b63a78f402b4e7c0b8b005fcdfa29"
-PV = "0.1+git${SRCPV}"
-PR = "r2"
-
-SRC_URI = "git://git.yoctoproject.org/screenshot"
-
-S = "${WORKDIR}/git"
-
-inherit autotools pkgconfig
-
-FILES_${PN} += "${libdir}/matchbox-panel/*.so"
-FILES_${PN}-dbg += "${libdir}/matchbox-panel/.debug"
-
-do_install_append () {
- rm ${D}${libdir}/matchbox-panel/*.la
-}
+++ /dev/null
-/usr/bin/settings-daemon &
+++ /dev/null
-Upstream-Status: Pending
-
-Index: settings-daemon/settings-daemon.c
-===================================================================
---- settings-daemon.orig/settings-daemon.c 2009-05-22 14:57:05.000000000 +0100
-+++ settings-daemon/settings-daemon.c 2009-05-22 14:58:22.000000000 +0100
-@@ -187,6 +187,10 @@
- GCONF_VALUE_STRING, translate_string_string },
- { "/desktop/poky/interface/gtk_color_scheme", "Gtk/ColorScheme",
- GCONF_VALUE_STRING, translate_string_string },
-+ { "/desktop/gnome/sound/theme_name", "Net/SoundThemeName",
-+ GCONF_VALUE_STRING, translate_string_string },
-+ { "/desktop/gnome/sound/event_sounds", "Net/EnableEventSounds" ,
-+ GCONF_VALUE_BOOL, translate_bool_int },
- };
-
- static const TranslationEntry*
-Index: settings-daemon/settings-daemon.schemas
-===================================================================
---- settings-daemon.orig/settings-daemon.schemas 2009-05-22 15:49:17.000000000 +0100
-+++ settings-daemon/settings-daemon.schemas 2009-05-22 15:51:31.000000000 +0100
-@@ -196,6 +196,27 @@
- </locale>
- </schema>
-
-+ <schema>
-+ <key>/schemas/desktop/gnome/sound/theme_name</key>
-+ <applyto>/desktop/gnome/sound/theme_name</applyto>
-+ <owner>gnome</owner>
-+ <type>string</type>
-+ <default>freedesktop</default>
-+ <locale name="C">
-+ <short>Sound Theme Name</short>
-+ </locale>
-+ </schema>
-+
-+ <schema>
-+ <key>/schemas/desktop/gnome/sound/event_sounds</key>
-+ <applyto>/desktop/gnome/sound/event_sounds</applyto>
-+ <owner>gnome</owner>
-+ <type>bool</type>
-+ <default>true</default>
-+ <locale name="C">
-+ <short>Enable Sound Events</short>
-+ </locale>
-+ </schema>
-
- </schemalist>
- </gconfschemafile>
+++ /dev/null
-Upstream-Status: Inappropriate [configuration]
-
-after gcc linking has changed, all the libraries must be explicitely specified to for linking.
-This patch avoids this linking error:
-
-| make all-am^M
-| make[1]: Entering directory `/disk0/pokybuild/build1/tmp/work/i586-poky-linux/settings-daemon-0.0+svnr2059-r3/settings-daemon'^M
-| ccache i586-poky-linux-gcc -march=i586 --sysroot=/disk0/pokybuild/build1/tmp/sysroots/i586-poky-linux -Wall -fexpensive-optimizations -fomit-frame-pointer -frename-registers -O2 -ggdb -feliminate-unused-debug-types -Wl,-O1 -Wl,--hash-style=gnu -Wl,--as-needed -o settings-daemon settings_daemon-xsettings-common.o settings_daemon-xsettings-manager.o settings_daemon-settings-daemon.o -pthread -lgconf-2 -ldbus-glib-1 -ldbus-1 -lpthread -lgdk-x11-2.0 -lgdk_pixbuf-2.0 -lpangocairo-1.0 -lpango-1.0 -lcairo -lgobject-2.0 -lgmodule-2.0 -lgthread-2.0 -lrt -lglib-2.0^M
-| /disk0/pokybuild/build1/tmp/sysroots/x86_64-linux/usr/libexec/i586-poky-linux/gcc/i586-poky-linux/4.5.1/ld: *^A: invalid DSO for symbol `XCreateSimpleWindow' definition^M
-| /disk0/pokybuild/build1/tmp/sysroots/i586-poky-linux/usr/lib/libX11.so.6: could not read symbols: Bad value^M
-| collect2: ld returned 1 exit status^M
-| make[1]: *** [settings-daemon] Error 1^M
-| make[1]: Leaving directory `/disk0/pokybuild/build1/tmp/work/i586-poky-linux/settings-daemon-0.0+svnr2059-r3/settings-daemon'^M
-| make: *** [all] Error 2^M
-
-Nitin A Kamble <nitin.a.kamble@intel.com>
-Date: 2011/01/11
-
-Index: settings-daemon/configure.ac
-===================================================================
---- settings-daemon.orig/configure.ac
-+++ settings-daemon/configure.ac
-@@ -14,7 +14,7 @@ AC_PROG_CC
-
-
- dnl TODO: make gconf optional
--PKG_CHECK_MODULES(APP, [gconf-2.0 gdk-x11-2.0])
-+PKG_CHECK_MODULES(APP, [gconf-2.0 gdk-x11-2.0 x11])
-
-
- AC_SUBST(APP_CFLAGS)
+++ /dev/null
-SUMMARY = "Provides a bridge between gconf and xsettings"
-HOMEPAGE = "http://svn.o-hand.com/view/matchbox/trunk/settings-daemon/"
-BUGTRACKER = "http://bugzilla.yoctoproject.org/"
-LICENSE = "MIT-style"
-LIC_FILES_CHKSUM = "file://xsettings-manager.h;endline=22;md5=7cfac9d2d4dc3694cc7eb605cf32a69b \
- file://xsettings-common.h;endline=22;md5=7cfac9d2d4dc3694cc7eb605cf32a69b"
-DEPENDS = "gconf glib-2.0 gtk+"
-SECTION = "x11"
-SRCREV = "9a99528b02255450db81176abd9bbcc1dab9a4c1"
-PV = "0.0+git${SRCPV}"
-
-
-SRC_URI = "git://git.yoctoproject.org/xsettings-daemon \
- file://addsoundkeys.patch;apply=yes \
- file://70settings-daemon.sh \
- file://dso_linking_change_build_fix.patch"
-
-S = "${WORKDIR}/git"
-
-inherit autotools pkgconfig gconf
-
-FILES_${PN} = "${bindir}/* ${sysconfdir}"
-
-do_install_append () {
- install -d ${D}/${sysconfdir}/X11/Xsession.d
- install -m 755 ${WORKDIR}/70settings-daemon.sh ${D}/${sysconfdir}/X11/Xsession.d/
-}
+++ /dev/null
-SUMMARY = "Provides an icon to shut down the system cleanly"
-LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=4d92cd373abda3937c2bc47fbc49d690 \
- file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
-
-SRC_URI = "file://shutdown.desktop"
-
-PR = "r1"
-
-S = "${WORKDIR}"
-
-do_install() {
- install -d ${D}${datadir}/applications
- install -m 0644 shutdown.desktop ${D}${datadir}/applications/
-
- sed -i ${D}${datadir}/applications/shutdown.desktop -e 's#^Exec=\(.*\)#Exec=${base_sbindir}/\1#'
-}
-
-pkg_postinst_${PN} () {
- grep -q qemuarm $D${sysconfdir}/hostname && \
- sed -i $D${datadir}/applications/shutdown.desktop -e 's#^Exec=\(.*\)/halt#Exec=\1/reboot#' \
- || true
-}
-
-inherit allarch
+++ /dev/null
-[Desktop Entry]
-Encoding=UTF-8
-Type=Application
-Name=Shutdown
-Comment=Close down the machine safely
-Exec=poweroff
-Icon=system-shutdown
-Terminal=false
-Categories=Utility;
-StartupNotify=true
\ No newline at end of file
+++ /dev/null
-Upstream-Status: Backport
-http://trac.webkit.org/changeset/124099
-
-Subversion Revision: 123651
-diff --git a/Source/WebCore/css/CSSGrammar.y b/Source/WebCore/css/CSSGrammar.y
-index c7c10b541cd46ad4febc6efe289e81b2cfb0861e..1c604e76b4da4cc65f395bc4a73b112561bd5c84 100644
---- a/Source/WebCore/css/CSSGrammar.y
-+++ b/Source/WebCore/css/CSSGrammar.y
-@@ -53,14 +53,13 @@ using namespace HTMLNames;
- #define YYMAXDEPTH 10000
- #define YYDEBUG 0
-
--// FIXME: Replace with %parse-param { CSSParser* parser } once we can depend on bison 2.x
--#define YYPARSE_PARAM parser
--#define YYLEX_PARAM parser
--
- %}
-
- %pure_parser
-
-+%parse-param { CSSParser* parser }
-+%lex-param { CSSParser* parser }
-+
- %union {
- bool boolean;
- char character;
-@@ -89,7 +88,7 @@ using namespace HTMLNames;
-
- %{
-
--static inline int cssyyerror(const char*)
-+static inline int cssyyerror(void*, const char*)
- {
- return 1;
- }
-diff --git a/Source/WebCore/css/CSSParser.cpp b/Source/WebCore/css/CSSParser.cpp
-index 650844060477cfc6ea6fdeaf11ec63b34ac646e7..8369549dbff25537cf93a11237a9bbbac4fe50f2 100644
---- a/Source/WebCore/css/CSSParser.cpp
-+++ b/Source/WebCore/css/CSSParser.cpp
-@@ -114,7 +114,7 @@
- extern int cssyydebug;
- #endif
-
--extern int cssyyparse(void* parser);
-+extern int cssyyparse(WebCore::CSSParser*);
-
- using namespace std;
- using namespace WTF;
-diff --git a/Source/WebCore/xml/XPathGrammar.y b/Source/WebCore/xml/XPathGrammar.y
-index 2eba5b35bd2338272a0f4ec756d137e47d2d59c8..d558211db2d89ea13716762a51397755560f66f3 100644
---- a/Source/WebCore/xml/XPathGrammar.y
-+++ b/Source/WebCore/xml/XPathGrammar.y
-@@ -34,6 +34,7 @@
- #include "XPathParser.h"
- #include "XPathPath.h"
- #include "XPathPredicate.h"
-+#include "XPathStep.h"
- #include "XPathVariableReference.h"
- #include <wtf/FastMalloc.h>
-
-@@ -44,8 +45,6 @@
- #define YYLTYPE_IS_TRIVIAL 1
- #define YYDEBUG 0
- #define YYMAXDEPTH 10000
--#define YYPARSE_PARAM parserParameter
--#define PARSER static_cast<Parser*>(parserParameter)
-
- using namespace WebCore;
- using namespace XPath;
-@@ -53,6 +52,7 @@ using namespace XPath;
- %}
-
- %pure_parser
-+%parse-param { WebCore::XPath::Parser* parser }
-
- %union
- {
-@@ -71,7 +71,7 @@ using namespace XPath;
- %{
-
- static int xpathyylex(YYSTYPE* yylval) { return Parser::current()->lex(yylval); }
--static void xpathyyerror(const char*) { }
-+static void xpathyyerror(void*, const char*) { }
-
- %}
-
-@@ -118,7 +118,7 @@ static void xpathyyerror(const char*) { }
- Expr:
- OrExpr
- {
-- PARSER->m_topExpr = $1;
-+ parser->m_topExpr = $1;
- }
- ;
-
-@@ -138,7 +138,7 @@ AbsoluteLocationPath:
- '/'
- {
- $$ = new LocationPath;
-- PARSER->registerParseNode($$);
-+ parser->registerParseNode($$);
- }
- |
- '/' RelativeLocationPath
-@@ -150,7 +150,7 @@ AbsoluteLocationPath:
- {
- $$ = $2;
- $$->insertFirstStep($1);
-- PARSER->unregisterParseNode($1);
-+ parser->unregisterParseNode($1);
- }
- ;
-
-@@ -159,22 +159,22 @@ RelativeLocationPath:
- {
- $$ = new LocationPath;
- $$->appendStep($1);
-- PARSER->unregisterParseNode($1);
-- PARSER->registerParseNode($$);
-+ parser->unregisterParseNode($1);
-+ parser->registerParseNode($$);
- }
- |
- RelativeLocationPath '/' Step
- {
- $$->appendStep($3);
-- PARSER->unregisterParseNode($3);
-+ parser->unregisterParseNode($3);
- }
- |
- RelativeLocationPath DescendantOrSelf Step
- {
- $$->appendStep($2);
- $$->appendStep($3);
-- PARSER->unregisterParseNode($2);
-- PARSER->unregisterParseNode($3);
-+ parser->unregisterParseNode($2);
-+ parser->unregisterParseNode($3);
- }
- ;
-
-@@ -183,58 +183,58 @@ Step:
- {
- if ($2) {
- $$ = new Step(Step::ChildAxis, *$1, *$2);
-- PARSER->deletePredicateVector($2);
-+ parser->deletePredicateVector($2);
- } else
- $$ = new Step(Step::ChildAxis, *$1);
-- PARSER->deleteNodeTest($1);
-- PARSER->registerParseNode($$);
-+ parser->deleteNodeTest($1);
-+ parser->registerParseNode($$);
- }
- |
- NAMETEST OptionalPredicateList
- {
- String localName;
- String namespaceURI;
-- if (!PARSER->expandQName(*$1, localName, namespaceURI)) {
-- PARSER->m_gotNamespaceError = true;
-+ if (!parser->expandQName(*$1, localName, namespaceURI)) {
-+ parser->m_gotNamespaceError = true;
- YYABORT;
- }
-
- if ($2) {
- $$ = new Step(Step::ChildAxis, Step::NodeTest(Step::NodeTest::NameTest, localName, namespaceURI), *$2);
-- PARSER->deletePredicateVector($2);
-+ parser->deletePredicateVector($2);
- } else
- $$ = new Step(Step::ChildAxis, Step::NodeTest(Step::NodeTest::NameTest, localName, namespaceURI));
-- PARSER->deleteString($1);
-- PARSER->registerParseNode($$);
-+ parser->deleteString($1);
-+ parser->registerParseNode($$);
- }
- |
- AxisSpecifier NodeTest OptionalPredicateList
- {
- if ($3) {
- $$ = new Step($1, *$2, *$3);
-- PARSER->deletePredicateVector($3);
-+ parser->deletePredicateVector($3);
- } else
- $$ = new Step($1, *$2);
-- PARSER->deleteNodeTest($2);
-- PARSER->registerParseNode($$);
-+ parser->deleteNodeTest($2);
-+ parser->registerParseNode($$);
- }
- |
- AxisSpecifier NAMETEST OptionalPredicateList
- {
- String localName;
- String namespaceURI;
-- if (!PARSER->expandQName(*$2, localName, namespaceURI)) {
-- PARSER->m_gotNamespaceError = true;
-+ if (!parser->expandQName(*$2, localName, namespaceURI)) {
-+ parser->m_gotNamespaceError = true;
- YYABORT;
- }
-
- if ($3) {
- $$ = new Step($1, Step::NodeTest(Step::NodeTest::NameTest, localName, namespaceURI), *$3);
-- PARSER->deletePredicateVector($3);
-+ parser->deletePredicateVector($3);
- } else
- $$ = new Step($1, Step::NodeTest(Step::NodeTest::NameTest, localName, namespaceURI));
-- PARSER->deleteString($2);
-- PARSER->registerParseNode($$);
-+ parser->deleteString($2);
-+ parser->registerParseNode($$);
- }
- |
- AbbreviatedStep
-@@ -259,23 +259,23 @@ NodeTest:
- else if (*$1 == "comment")
- $$ = new Step::NodeTest(Step::NodeTest::CommentNodeTest);
-
-- PARSER->deleteString($1);
-- PARSER->registerNodeTest($$);
-+ parser->deleteString($1);
-+ parser->registerNodeTest($$);
- }
- |
- PI '(' ')'
- {
- $$ = new Step::NodeTest(Step::NodeTest::ProcessingInstructionNodeTest);
-- PARSER->deleteString($1);
-- PARSER->registerNodeTest($$);
-+ parser->deleteString($1);
-+ parser->registerNodeTest($$);
- }
- |
- PI '(' LITERAL ')'
- {
- $$ = new Step::NodeTest(Step::NodeTest::ProcessingInstructionNodeTest, $3->stripWhiteSpace());
-- PARSER->deleteString($1);
-- PARSER->deleteString($3);
-- PARSER->registerNodeTest($$);
-+ parser->deleteString($1);
-+ parser->deleteString($3);
-+ parser->registerNodeTest($$);
- }
- ;
-
-@@ -293,14 +293,14 @@ PredicateList:
- {
- $$ = new Vector<Predicate*>;
- $$->append(new Predicate($1));
-- PARSER->unregisterParseNode($1);
-- PARSER->registerPredicateVector($$);
-+ parser->unregisterParseNode($1);
-+ parser->registerPredicateVector($$);
- }
- |
- PredicateList Predicate
- {
- $$->append(new Predicate($2));
-- PARSER->unregisterParseNode($2);
-+ parser->unregisterParseNode($2);
- }
- ;
-
-@@ -315,7 +315,7 @@ DescendantOrSelf:
- SLASHSLASH
- {
- $$ = new Step(Step::DescendantOrSelfAxis, Step::NodeTest(Step::NodeTest::AnyNodeTest));
-- PARSER->registerParseNode($$);
-+ parser->registerParseNode($$);
- }
- ;
-
-@@ -323,13 +323,13 @@ AbbreviatedStep:
- '.'
- {
- $$ = new Step(Step::SelfAxis, Step::NodeTest(Step::NodeTest::AnyNodeTest));
-- PARSER->registerParseNode($$);
-+ parser->registerParseNode($$);
- }
- |
- DOTDOT
- {
- $$ = new Step(Step::ParentAxis, Step::NodeTest(Step::NodeTest::AnyNodeTest));
-- PARSER->registerParseNode($$);
-+ parser->registerParseNode($$);
- }
- ;
-
-@@ -337,8 +337,8 @@ PrimaryExpr:
- VARIABLEREFERENCE
- {
- $$ = new VariableReference(*$1);
-- PARSER->deleteString($1);
-- PARSER->registerParseNode($$);
-+ parser->deleteString($1);
-+ parser->registerParseNode($$);
- }
- |
- '(' Expr ')'
-@@ -349,15 +349,15 @@ PrimaryExpr:
- LITERAL
- {
- $$ = new StringExpression(*$1);
-- PARSER->deleteString($1);
-- PARSER->registerParseNode($$);
-+ parser->deleteString($1);
-+ parser->registerParseNode($$);
- }
- |
- NUMBER
- {
- $$ = new Number($1->toDouble());
-- PARSER->deleteString($1);
-- PARSER->registerParseNode($$);
-+ parser->deleteString($1);
-+ parser->registerParseNode($$);
- }
- |
- FunctionCall
-@@ -369,8 +369,8 @@ FunctionCall:
- $$ = createFunction(*$1);
- if (!$$)
- YYABORT;
-- PARSER->deleteString($1);
-- PARSER->registerParseNode($$);
-+ parser->deleteString($1);
-+ parser->registerParseNode($$);
- }
- |
- FUNCTIONNAME '(' ArgumentList ')'
-@@ -378,9 +378,9 @@ FunctionCall:
- $$ = createFunction(*$1, *$3);
- if (!$$)
- YYABORT;
-- PARSER->deleteString($1);
-- PARSER->deleteExpressionVector($3);
-- PARSER->registerParseNode($$);
-+ parser->deleteString($1);
-+ parser->deleteExpressionVector($3);
-+ parser->registerParseNode($$);
- }
- ;
-
-@@ -389,14 +389,14 @@ ArgumentList:
- {
- $$ = new Vector<Expression*>;
- $$->append($1);
-- PARSER->unregisterParseNode($1);
-- PARSER->registerExpressionVector($$);
-+ parser->unregisterParseNode($1);
-+ parser->registerExpressionVector($$);
- }
- |
- ArgumentList ',' Argument
- {
- $$->append($3);
-- PARSER->unregisterParseNode($3);
-+ parser->unregisterParseNode($3);
- }
- ;
-
-@@ -412,9 +412,9 @@ UnionExpr:
- $$ = new Union;
- $$->addSubExpression($1);
- $$->addSubExpression($3);
-- PARSER->unregisterParseNode($1);
-- PARSER->unregisterParseNode($3);
-- PARSER->registerParseNode($$);
-+ parser->unregisterParseNode($1);
-+ parser->unregisterParseNode($3);
-+ parser->registerParseNode($$);
- }
- ;
-
-@@ -430,9 +430,9 @@ PathExpr:
- {
- $3->setAbsolute(true);
- $$ = new Path(static_cast<Filter*>($1), $3);
-- PARSER->unregisterParseNode($1);
-- PARSER->unregisterParseNode($3);
-- PARSER->registerParseNode($$);
-+ parser->unregisterParseNode($1);
-+ parser->unregisterParseNode($3);
-+ parser->registerParseNode($$);
- }
- |
- FilterExpr DescendantOrSelf RelativeLocationPath
-@@ -440,10 +440,10 @@ PathExpr:
- $3->insertFirstStep($2);
- $3->setAbsolute(true);
- $$ = new Path(static_cast<Filter*>($1), $3);
-- PARSER->unregisterParseNode($1);
-- PARSER->unregisterParseNode($2);
-- PARSER->unregisterParseNode($3);
-- PARSER->registerParseNode($$);
-+ parser->unregisterParseNode($1);
-+ parser->unregisterParseNode($2);
-+ parser->unregisterParseNode($3);
-+ parser->registerParseNode($$);
- }
- ;
-
-@@ -453,9 +453,9 @@ FilterExpr:
- PrimaryExpr PredicateList
- {
- $$ = new Filter($1, *$2);
-- PARSER->unregisterParseNode($1);
-- PARSER->deletePredicateVector($2);
-- PARSER->registerParseNode($$);
-+ parser->unregisterParseNode($1);
-+ parser->deletePredicateVector($2);
-+ parser->registerParseNode($$);
- }
- ;
-
-@@ -465,9 +465,9 @@ OrExpr:
- OrExpr OR AndExpr
- {
- $$ = new LogicalOp(LogicalOp::OP_Or, $1, $3);
-- PARSER->unregisterParseNode($1);
-- PARSER->unregisterParseNode($3);
-- PARSER->registerParseNode($$);
-+ parser->unregisterParseNode($1);
-+ parser->unregisterParseNode($3);
-+ parser->registerParseNode($$);
- }
- ;
-
-@@ -477,9 +477,9 @@ AndExpr:
- AndExpr AND EqualityExpr
- {
- $$ = new LogicalOp(LogicalOp::OP_And, $1, $3);
-- PARSER->unregisterParseNode($1);
-- PARSER->unregisterParseNode($3);
-- PARSER->registerParseNode($$);
-+ parser->unregisterParseNode($1);
-+ parser->unregisterParseNode($3);
-+ parser->registerParseNode($$);
- }
- ;
-
-@@ -489,9 +489,9 @@ EqualityExpr:
- EqualityExpr EQOP RelationalExpr
- {
- $$ = new EqTestOp($2, $1, $3);
-- PARSER->unregisterParseNode($1);
-- PARSER->unregisterParseNode($3);
-- PARSER->registerParseNode($$);
-+ parser->unregisterParseNode($1);
-+ parser->unregisterParseNode($3);
-+ parser->registerParseNode($$);
- }
- ;
-
-@@ -501,9 +501,9 @@ RelationalExpr:
- RelationalExpr RELOP AdditiveExpr
- {
- $$ = new EqTestOp($2, $1, $3);
-- PARSER->unregisterParseNode($1);
-- PARSER->unregisterParseNode($3);
-- PARSER->registerParseNode($$);
-+ parser->unregisterParseNode($1);
-+ parser->unregisterParseNode($3);
-+ parser->registerParseNode($$);
- }
- ;
-
-@@ -513,17 +513,17 @@ AdditiveExpr:
- AdditiveExpr PLUS MultiplicativeExpr
- {
- $$ = new NumericOp(NumericOp::OP_Add, $1, $3);
-- PARSER->unregisterParseNode($1);
-- PARSER->unregisterParseNode($3);
-- PARSER->registerParseNode($$);
-+ parser->unregisterParseNode($1);
-+ parser->unregisterParseNode($3);
-+ parser->registerParseNode($$);
- }
- |
- AdditiveExpr MINUS MultiplicativeExpr
- {
- $$ = new NumericOp(NumericOp::OP_Sub, $1, $3);
-- PARSER->unregisterParseNode($1);
-- PARSER->unregisterParseNode($3);
-- PARSER->registerParseNode($$);
-+ parser->unregisterParseNode($1);
-+ parser->unregisterParseNode($3);
-+ parser->registerParseNode($$);
- }
- ;
-
-@@ -533,9 +533,9 @@ MultiplicativeExpr:
- MultiplicativeExpr MULOP UnaryExpr
- {
- $$ = new NumericOp($2, $1, $3);
-- PARSER->unregisterParseNode($1);
-- PARSER->unregisterParseNode($3);
-- PARSER->registerParseNode($$);
-+ parser->unregisterParseNode($1);
-+ parser->unregisterParseNode($3);
-+ parser->registerParseNode($$);
- }
- ;
-
-@@ -546,8 +546,8 @@ UnaryExpr:
- {
- $$ = new Negative;
- $$->addSubExpression($2);
-- PARSER->unregisterParseNode($2);
-- PARSER->registerParseNode($$);
-+ parser->unregisterParseNode($2);
-+ parser->registerParseNode($$);
- }
- ;
-
-diff --git a/Source/WebCore/xml/XPathParser.cpp b/Source/WebCore/xml/XPathParser.cpp
-index 62d8ee37fd6ebb74a580a00c59beb6cd40c5a8b7..b5e6a9237593b4aaa2a243f2ff9d86e57f930a97 100644
---- a/Source/WebCore/xml/XPathParser.cpp
-+++ b/Source/WebCore/xml/XPathParser.cpp
-@@ -32,24 +32,21 @@
- #include "XPathEvaluator.h"
- #include "XPathException.h"
- #include "XPathNSResolver.h"
-+#include "XPathPath.h"
- #include "XPathStep.h"
- #include <wtf/StdLibExtras.h>
- #include <wtf/text/StringHash.h>
-
--int xpathyyparse(void*);
--
-+using namespace WebCore;
- using namespace WTF;
- using namespace Unicode;
-+using namespace XPath;
-
--namespace WebCore {
--namespace XPath {
--
--class LocationPath;
--
--#include "XPathGrammar.h"
-+extern int xpathyyparse(WebCore::XPath::Parser*);
-+#include "XPathGrammar.h"
-
- Parser* Parser::currentParser = 0;
--
-+
- enum XMLCat { NameStart, NameCont, NotPartOfName };
-
- typedef HashMap<String, Step::Axis> AxisNamesMap;
-@@ -630,5 +627,3 @@ void Parser::deleteNodeTest(Step::NodeTest* t)
- delete t;
- }
-
--}
--}
+++ /dev/null
-make install invokes a gtk-doc tool without checking that we have gtk-doc.
-
-Signed-off-by: Ross Burton <ross.burton@intel.com>
-
-Upstream-Status: Pending (https://bugs.webkit.org/show_bug.cgi?id=91239)
-
-Index: webkit-1.8.1/Tools/GNUmakefile.am
-===================================================================
---- webkit-1.8.1.orig/Tools/GNUmakefile.am
-+++ webkit-1.8.1/Tools/GNUmakefile.am
-@@ -330,7 +330,9 @@ if ENABLE_WEBKIT2
- fi; \
- fi
- endif
-+if ENABLE_GTK_DOC
- @$(AM_V_GEN)$(PYTHON) $(srcdir)/Tools/gtk/generate-gtkdoc --rebase --virtual-root=$${DESTDIR}
-+endif
-
- uninstall-local:
- @DOC_MODULE_VERSION=`cat ./Documentation/webkitgtk/version.xml`; \
+++ /dev/null
-Dolt cause build error on some platform, so disable it.
-
-Signed-off-by: Zhai Edwin <edwin.zhai@intel.com>
-
-Upstream-Status: Inappropriate [configuration]
-
-Index: webkit-gtk-1.3.7+svnr72836-r72836-r0/configure.ac
-===================================================================
---- webkit-gtk-1.3.7+svnr72836-r72836-r0.orig/configure.ac 2011-01-21 11:11:07.000000000 +0800
-+++ webkit-gtk-1.3.7+svnr72836-r72836-r0/configure.ac 2011-01-21 11:11:15.000000000 +0800
-@@ -82,8 +82,6 @@
- AC_DISABLE_STATIC
- AC_LIBTOOL_WIN32_DLL
- AC_PROG_LIBTOOL
--# use dolt to speedup the build
--DOLT
-
- AC_PATH_PROG(FLEX, flex)
- if test -z "$FLEX"; then
+++ /dev/null
-Upstream-Status: Pending
-
-automake 1.12 has deprecated use of mkdir_p, and it recommends
-use of MKDIR_P instead. Changed the code to avoid these kind
-of warning-errors.
-
-./.deps/DerivedSources
-make[1]: ./.deps/DerivedSources: Command not found
-make[1]: *** [all-local] Error 127
-
-Signed-Off-By: Nitin A Kamble <nitin.a.kamble@intel.com>
-2012/07/10
-
-Index: webkit-gtk-1.7.2+svnr101488-r6/GNUmakefile.am
-===================================================================
---- webkit-gtk-1.7.2+svnr101488-r6.orig/GNUmakefile.am
-+++ webkit-gtk-1.7.2+svnr101488-r6/GNUmakefile.am
-@@ -255,7 +255,7 @@ MAINTAINERCLEANFILES += \
- # Older automake versions (1.7) place Plo files in a different place so we need
- # to create the output directory manually.
- all-local: stamp-po
-- $(mkdir_p) $(top_builddir)/$(DEPDIR)/DerivedSources
-+ $(MKDIR_P) $(top_builddir)/$(DEPDIR)/DerivedSources
-
- # remove built sources and program directories
- clean-local:
-Index: webkit-gtk-1.7.2+svnr101488-r6/Source/WebKit/gtk/po/GNUmakefile.am
-===================================================================
---- webkit-gtk-1.7.2+svnr101488-r6.orig/Source/WebKit/gtk/po/GNUmakefile.am
-+++ webkit-gtk-1.7.2+svnr101488-r6/Source/WebKit/gtk/po/GNUmakefile.am
-@@ -132,13 +132,13 @@ DISTCLEANFILES += \
- $(top_builddir)/Source/WebKit/gtk/po/$(DOMAIN).pot
-
- po-install-data-local: all
-- $(mkdir_p) $(DESTDIR)$(datadir)
-+ $(MKDIR_P) $(DESTDIR)$(datadir)
- @catalogs='$(MOFILES)'; \
- for cat in $$catalogs; do \
- cat=`basename $$cat`; \
- lang=`echo $$cat | sed -e 's/\.mo$$//'`; \
- dir=$(localedir)/$$lang/LC_MESSAGES; \
-- $(mkdir_p) $(DESTDIR)$$dir; \
-+ $(MKDIR_P) $(DESTDIR)$$dir; \
- if test -r Source/WebKit/gtk/po/$$cat; then realcat=Source/WebKit/gtk/po/$$cat; else realcat=$(srcdir)/$$cat; fi; \
- $(INSTALL_DATA) $$realcat $(DESTDIR)$$dir/$(DOMAIN).mo; \
- echo "installing $$realcat as $(DESTDIR)$$dir/$(DOMAIN).mo"; \
-@@ -173,13 +173,13 @@ po-install-data-local: all
- done
-
- po-installdirs-data-local:
-- $(mkdir_p) $(DESTDIR)$(datadir)
-+ $(MKDIR_P) $(DESTDIR)$(datadir)
- @catalogs='$(MOFILES)'; \
- for cat in $$catalogs; do \
- cat=`basename $$cat`; \
- lang=`echo $$cat | sed -e 's/\.gmo$$//'`; \
- dir=$(localedir)/$$lang/LC_MESSAGES; \
-- $(mkdir_p) $(DESTDIR)$$dir; \
-+ $(MKDIR_P) $(DESTDIR)$$dir; \
- for lc in '' $(EXTRA_LOCALE_CATEGORIES); do \
- if test -n "$$lc"; then \
- if (cd $(DESTDIR)$(localedir)/$$lang && LC_ALL=C ls -l -d $$lc 2>/dev/null) | grep ' -> ' >/dev/null; then \
+++ /dev/null
-From 4084d31d5b1fe3bf041881ad124873dbf3cd1868 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Fri, 17 May 2013 19:51:11 -0700
-Subject: [PATCH] Enable mips64 build
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
-Upstream-Status: Pending
----
- Source/JavaScriptCore/wtf/Platform.h | 2 +-
- Source/JavaScriptCore/wtf/dtoa/utils.h | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-Index: webkit-1.8.3/Source/JavaScriptCore/wtf/Platform.h
-===================================================================
---- webkit-1.8.3.orig/Source/JavaScriptCore/wtf/Platform.h 2012-08-20 09:30:25.000000000 -0700
-+++ webkit-1.8.3/Source/JavaScriptCore/wtf/Platform.h 2013-06-12 00:58:14.624055787 -0700
-@@ -76,14 +76,19 @@
-
- /* CPU(MIPS) - MIPS 32-bit */
- /* Note: Only O32 ABI is tested, so we enable it for O32 ABI for now. */
--#if (defined(mips) || defined(__mips__) || defined(MIPS) || defined(_MIPS_)) \
-- && defined(_ABIO32)
-+#if (defined(mips) || defined(__mips__) || defined(MIPS) || defined(_MIPS_) \
-+ || defined(__mips64))
-+#if defined(__mips64)
-+#define WTF_CPU_MIPS64 1
-+#define WTF_MIPS_ARCH __mips64
-+#else
- #define WTF_CPU_MIPS 1
-+#define WTF_MIPS_ARCH __mips
-+#endif
- #if defined(__MIPSEB__)
- #define WTF_CPU_BIG_ENDIAN 1
- #endif
- #define WTF_MIPS_PIC (defined __PIC__)
--#define WTF_MIPS_ARCH __mips
- #define WTF_MIPS_ISA(v) (defined WTF_MIPS_ARCH && WTF_MIPS_ARCH == v)
- #define WTF_MIPS_ISA_AT_LEAST(v) (defined WTF_MIPS_ARCH && WTF_MIPS_ARCH >= v)
- #define WTF_MIPS_ARCH_REV __mips_isa_rev
-@@ -295,7 +300,7 @@
-
- #endif /* ARM */
-
--#if CPU(ARM) || CPU(MIPS) || CPU(SH4) || CPU(SPARC)
-+#if CPU(ARM) || CPU(MIPS) || CPU(MIPS64) || CPU(SH4) || CPU(SPARC)
- #define WTF_CPU_NEEDS_ALIGNED_ACCESS 1
- #endif
-
-@@ -899,6 +904,7 @@
- || CPU(ALPHA) \
- || CPU(SPARC64) \
- || CPU(S390X) \
-+ || CPU(MIPS64) \
- || CPU(PPC64)
- #define WTF_USE_JSVALUE64 1
- #else
-Index: webkit-1.8.3/Source/JavaScriptCore/wtf/dtoa/utils.h
-===================================================================
---- webkit-1.8.3.orig/Source/JavaScriptCore/wtf/dtoa/utils.h 2012-08-20 09:26:05.000000000 -0700
-+++ webkit-1.8.3/Source/JavaScriptCore/wtf/dtoa/utils.h 2013-06-12 00:57:22.424054793 -0700
-@@ -49,7 +49,7 @@
- defined(__ARMEL__) || \
- defined(_MIPS_ARCH_MIPS32R2)
- #define DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS 1
--#elif CPU(MIPS) || CPU(PPC) || CPU(PPC64) || OS(WINCE) || CPU(SH4) || CPU(S390) || CPU(S390X) || CPU(IA64) || CPU(SPARC) || CPU(ALPHA)
-+#elif CPU(MIPS) || CPU(PPC) || CPU(PPC64) || OS(WINCE) || CPU(SH4) || CPU(S390) || CPU(S390X) || CPU(IA64) || CPU(SPARC) || CPU(ALPHA) || CPU(MIPS64)
- #define DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS 1
- #elif defined(_M_IX86) || defined(__i386__)
- #if defined(_WIN32)
+++ /dev/null
-Upstream-Status: Pending
-Signed-off-by: Riku Voipio <riku.voipio@linaro.org>
-Index: webkit-1.8.3/Source/JavaScriptCore/wtf/Platform.h
-===================================================================
---- webkit-1.8.3.orig/Source/JavaScriptCore/wtf/Platform.h 2013-06-12 00:58:14.000000000 -0700
-+++ webkit-1.8.3/Source/JavaScriptCore/wtf/Platform.h 2013-06-12 00:59:18.764056782 -0700
-@@ -304,6 +304,11 @@
- #define WTF_CPU_NEEDS_ALIGNED_ACCESS 1
- #endif
-
-+/* CPU(AARCH64) - Aarch64 */
-+#if defined(__aarch64__)
-+#define WTF_CPU_AARCH64 1
-+#endif
-+
- /* ==== OS() - underlying operating system; only to be used for mandated low-level services like
- virtual memory, not to choose a GUI toolkit ==== */
-
-@@ -905,7 +910,8 @@
- || CPU(SPARC64) \
- || CPU(S390X) \
- || CPU(MIPS64) \
-- || CPU(PPC64)
-+ || CPU(PPC64) \
-+ || CPU(AARCH64)
- #define WTF_USE_JSVALUE64 1
- #else
- #define WTF_USE_JSVALUE32_64 1
-Index: webkit-1.8.3/Source/JavaScriptCore/wtf/dtoa/utils.h
-===================================================================
---- webkit-1.8.3.orig/Source/JavaScriptCore/wtf/dtoa/utils.h 2013-06-12 00:57:22.000000000 -0700
-+++ webkit-1.8.3/Source/JavaScriptCore/wtf/dtoa/utils.h 2013-06-12 00:58:28.340056029 -0700
-@@ -49,7 +49,7 @@
- defined(__ARMEL__) || \
- defined(_MIPS_ARCH_MIPS32R2)
- #define DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS 1
--#elif CPU(MIPS) || CPU(PPC) || CPU(PPC64) || OS(WINCE) || CPU(SH4) || CPU(S390) || CPU(S390X) || CPU(IA64) || CPU(SPARC) || CPU(ALPHA) || CPU(MIPS64)
-+#elif CPU(MIPS) || CPU(PPC) || CPU(PPC64) || OS(WINCE) || CPU(SH4) || CPU(S390) || CPU(S390X) || CPU(IA64) || CPU(SPARC) || CPU(ALPHA) || CPU(MIPS64) || CPU(AARCH64)
- #define DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS 1
- #elif defined(_M_IX86) || defined(__i386__)
- #if defined(_WIN32)
+++ /dev/null
-Upstream-Status: Backport
-
-Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
-diff -Nurd webkit-1.8.3/configure.ac webkit-1.8.3/configure.ac
---- webkit-1.8.3/configure.ac 2012-08-20 19:35:38.000000000 +0300
-+++ webkit-1.8.3/configure.ac 2013-02-08 11:55:28.403397789 +0200
-@@ -111,7 +111,6 @@
-
- AC_PROG_CC
- AC_PROG_CXX
--AM_PROG_CC_STDC
- AM_PROG_CC_C_O
- AC_PROG_INSTALL
- AC_SYS_LARGEFILE
+++ /dev/null
-SUMMARY = "WebKit web rendering engine for the GTK+ platform"
-HOMEPAGE = "http://www.webkitgtk.org/"
-BUGTRACKER = "http://bugs.webkit.org/"
-
-LICENSE = "BSD & LGPLv2+"
-LIC_FILES_CHKSUM = "file://Source/WebCore/rendering/RenderApplet.h;endline=22;md5=fb9694013ad71b78f8913af7a5959680 \
- file://Source/WebKit/gtk/webkit/webkit.h;endline=21;md5=b4fbe9f4a944f1d071dba1d2c76b3351 \
- file://Source/JavaScriptCore/parser/Parser.h;endline=23;md5=b57c8a2952a8d0e655988fa0ecb2bf7f"
-
-PR = "r1"
-
-# Choice of language backends - icu has issues on Big Endian machines so use pango
-ICU_LIB = "icu"
-ICU_LIB_powerpc = "pango"
-
-DEPENDS = "zlib enchant libsoup-2.4 curl libxml2 cairo libxslt libxt libidn gnutls \
- gtk+ gstreamer gst-plugins-base flex-native gperf-native perl-native-runtime sqlite3 ${ICU_LIB}"
-DEPENDS += " ${@base_contains('DISTRO_FEATURES', 'opengl', 'virtual/libgl', '', d)}"
-
-SRC_URI = "\
- http://www.webkitgtk.org/releases/webkit-${PV}.tar.xz \
- file://nodolt.patch \
- file://no-gtkdoc.patch \
- file://webgit-gtk_fix_build_with_automake_1.12.patch \
- file://bison-2.6.patch \
- file://obsolete_automake_macros.patch \
- file://0001-Enable-mips64-build.patch \
- file://aarch64.patch \
- "
-
-SRC_URI[md5sum] = "dcbf9d5e2e6391f857c29a57528b32a6"
-SRC_URI[sha256sum] = "ada02d636af61aed38f142d3cded662d141ce71264f624c4eb873621a74cc9e7"
-
-# webkit-gtk can NOT be built on MIPS64 with n32 ABI
-COMPATIBLE_HOST_mips64 = "mips64.*-linux$"
-
-inherit autotools lib_package gtk-doc pkgconfig
-
-S = "${WORKDIR}/webkit-${PV}/"
-
-EXTRA_OECONF = "\
- --enable-debug=no \
- --enable-svg \
- --enable-icon-database=yes \
- --enable-fullscreen-api \
- --enable-image-resizer \
- --enable-link-prefetch \
- --with-gtk=2.0 \
- --disable-geolocation \
- ${@base_contains('DISTRO_FEATURES', 'opengl', '--enable-webgl', '--disable-webgl', d)} \
- UNICODE_CFLAGS=-D_REENTRANT \
- "
-
-#default unicode backend icu breaks in cross-compile when target and host are different endian type
-EXTRA_OECONF_append_powerpc = " --with-unicode-backend=glib"
-
-CPPFLAGS_append_powerpc = " -I${STAGING_INCDIR}/pango-1.0 \
- -I${STAGING_LIBDIR}/glib-2.0/include \
- -I${STAGING_INCDIR}/glib-2.0"
-
-# ld can run out of memory linking libwebkitgtk!
-#
-LDFLAGS += "-Wl,--no-keep-memory"
-
-EXTRA_AUTORECONF = " -I Source/autotools "
-
-
-#| ./Source/JavaScriptCore/heap/HandleTypes.h: In static member function 'static T* JSC::HandleTypes<T>::getFromSlot(JSC::HandleSlot) [with T = JSC::Structure, JSC::HandleTypes<T>::ExternalType = JSC::Structure*, JSC::HandleSlot = JSC::JSValue*]':
-#| ./Source/JavaScriptCore/heap/Handle.h:141:79: instantiated from 'JSC::Handle<T>::ExternalType JSC::Handle<T>::get() const [with T = JSC::Structure, JSC::Handle<T>::ExternalType = JSC::Structure*]'
-#| ./Source/JavaScriptCore/runtime/ScopeChain.h:39:75: instantiated from here
-#| ./Source/JavaScriptCore/heap/HandleTypes.h:38:130: warning: cast from 'JSC::JSCell*' to 'JSC::HandleTypes<JSC::Structure>::ExternalType {aka JSC::Structure*}' increases required alignment of target type [-Wcast-align]
-#| {standard input}: Assembler messages:
-#| {standard input}:28873: Error: invalid immediate: 983040 is out of range
-#| {standard input}:28873: Error: value of 983040 too large for field of 2 bytes at 15110
-#| /OE/shr-core/tmp/sysroots/x86_64-linux/usr/libexec/armv4t-oe-linux-gnueabi/gcc/arm-oe-linux-gnueabi/4.6.2/as: BFD (GNU Binutils) 2.21.1 assertion fail /OE/shr-core/tmp/work/armv4t-oe-linux-gnueabi/binutils-cross-2.21.1a-r0/binutils-2.21.1/bfd/elf.c:2819
-#| arm-oe-linux-gnueabi-g++: internal compiler error: Segmentation fault (program as)
-#| Please submit a full bug report,
-#| with preprocessed source if appropriate.
-#| See <http://gcc.gnu.org/bugs.html> for instructions.
-#| make[1]: *** [Source/JavaScriptCore/jit/libjavascriptcoregtk_1_0_la-JIT.lo] Error 1
-#| make[1]: Leaving directory `/OE/shr-core/tmp/work/armv4t-oe-linux-gnueabi/webkit-gtk-1.5.1+svnr90727-r0'
-ARM_INSTRUCTION_SET = "arm"
-
-CONFIGUREOPT_DEPTRACK = ""
-
-do_configure_append() {
- # somethings wrong with icu, fix it up manually
- for makefile in $(find ${B} -name "GNUmakefile") ; do
- sed -i s:-I/usr/include::g $makefile
- done
-}
-
-do_install_append() {
- rmdir ${D}${libexecdir}
-}
-
-PACKAGES =+ "${PN}-webinspector ${PN}launcher-dbg ${PN}launcher libjavascriptcore"
-FILES_${PN}launcher = "${bindir}/GtkLauncher"
-FILES_${PN}launcher-dbg = "${bindir}/.debug/GtkLauncher"
-FILES_libjavascriptcore = "${libdir}/libjavascriptcoregtk-1.0.so.*"
-FILES_${PN}-webinspector = "${datadir}/webkitgtk-*/webinspector/"
-FILES_${PN} += "${datadir}/webkitgtk-*/resources/error.html \
- ${datadir}/webkitgtk-*/images \
- ${datadir}/glib-2.0/schemas"
-
-
projects / thirdparty / openembedded / openembedded-core-contrib.git / commitdiff
