summaryrefslogtreecommitdiffstats
path: root/meta/recipes-qt/qt4/qt-4.8.0.inc
Commit message (Collapse)AuthorAgeFilesLines
* qt4: make pulseaudio support conditional upon DISTRO_FEATURESPaul Eggleton2012-03-021-0/+1
| | | | | | | | | | | | | | Add a pulseaudio DISTRO_FEATURES item and disable pulseaudio support in phonon within Qt4 if it is not present; otherwise it is a race condition as to whether it is enabled or disabled or breaks the build. Note that this adds pulseaudio to DISTRO_FEATURES_BACKFILL thus leaving existing distro configurations unaffected. (From OE-Core rev: b82c216c1ee8e2a009e87856b7adad08f7f50482) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* qt4: build qmake for the targetPaul Eggleton2012-02-281-10/+2
| | | | | | | | | | | | | | | | | | | | | | | qmake was not being built at all (since we had the host version from qt4-native) and the default is to build for the host machine within configure. With a minor hack we can build qmake for the target as well, which is useful if you want to build Qt 4 software on an actual device. This is now installed as part of the tools package (together with uic, moc etc.) Additionally, add an environment setup script (installed in /usr/share/qt4/environment-setup or /usr/share/qtopia/environment-setup for the embedded version) as part of the mkspecs package since the mkspecs will not work without the paths set up by this script. The code to create this script was adapted from the qmake2 recipe in meta-oe. Also move do_compile() from qt-${PV}.inc up to qt4.inc as both versions have the exact same content. (From OE-Core rev: 4306606489a2d922595d4c86a21c496bbd8a607e) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* qt4: fix compile error in Qt 4.8.0 with gcc 4.6Paul Eggleton2012-02-281-0/+1
| | | | | | | | | | | | Ensure the Qt configure script can can detect the compiler correctly as g++. This fixes the following compile error with gcc 4.6: ./wtf/NullPtr.h:48:1: error: identifier 'nullptr' will become a keyword in C++0x [-Werror=c++0x-compat] (From OE-Core rev: f29bb5b2a99ecef46e5570bf3336e9680c0b6705) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* qt4: add version 4.8.0Paul Eggleton2012-01-041-0/+61
Version 4.8.0 makes a few minor changes in the internal build system - the following issues had to be worked around: * The -qt-gif configure option has been removed. This is actually the default and has been for some time, so remove it from qt4.inc. * The mkspecs have been refactored requiring us to copy our g++.conf file over the top of g++-unix.conf instead. Some modifications to this file were also necessary to remove some settings that are now in other conf files (and we don't modify those values in any case). * The LD environment variable needs to be unset during configure, or else the configure script overrides our value of QMAKE_LINK which selects ${CXX} as our linker. * QMAKE_CXX contains a reference to OE_QMAKE_CXX which the configure script does not expect and cannot expand and this results in webkit being disabled, so add a workaround for this. (From OE-Core rev: 6b2a5d15ad20573502142b635e6cab9bcfb3b40a) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>