summaryrefslogtreecommitdiffstats
path: root/mkspecs
Commit message (Collapse)AuthorAgeFilesLines
* Add qmake CROSS_COMPILE variable via load(device_config)Peter Kümmel2012-09-071-7/+13
| | | | | | | | | The compiler prefix could be set optionally by CROSS_COMPILE. Partial cherry pick from qtbase/2dc3181bdcc0d447d2bec42fa3b7cbecb640a51a Change-Id: I9a9cc31d7c5fda8b33fe280ee2a90cda0196da7d Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Minimal backport of --device-option support in configurePeter Kümmel2012-09-071-0/+14
| | | | | | | | | | This parial backport only adds the --device-option so it becomes possible to set and cache additional qmake variables. Partial cherry pick from qtbase/84e98fd9d2594637e928096c8fcb19d52e5e2676 Change-Id: I96636766aec7e12bfb1d377c8a607301a325a46c Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* QNX: Move qpa-based mkspecs out of the unsupported directorySean Harmer2012-09-058-8/+8
| | | | | | | | | | | | | | RIM is committed to supporting Qt on its platforms and the port works well. Backport of commit 219ba05b2a43e40feeb2bdebbf53d6da55f2dba2 Change-Id: If34940018036685c6b8dbda193c97b8c50eef1dd Reviewed-by: Kevin Krammer <kevin.krammer@kdab.com> Reviewed-by: Nicolas Arnaud-Cormos <nicolas@kdab.com> Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com> Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* QNX: Enable pre-compiled header support for QNXSean Harmer2012-09-041-0/+5
| | | | | | | Backport of bc80ee36f8ffe18f8362b2328ca29f92291df132 Change-Id: I76453dadc24c9bf7ff34d972214c057b82143c77 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Decouple -lang-c++ from CXX command on QNX mkspecsSean Harmer2012-09-044-8/+5
| | | | | | | | | | | | | | Making -lang-c++ integral part of the $CXX command was wrong, because there are cases where $CXX must be called without the -lang-c++ file (when building asm files for instance). This commit moves the -lang-c++ to $CXX_FLAGS where it belongs. Backport of commits f4f185edd9dda513320e23b9a3e3f92be203884f e3224554272600a22fd9d22bdb754832b5127da2 Change-Id: I18be06411648281bd42f3c40b8add637cd7ddfa0 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Fix indentation.Morten Sorvig2012-08-247-7/+7
| | | | | Change-Id: I3442592b903afa99e85953cdf40b91b914963a8b Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
* QNX: Enable QT_NO_IMPORT_QT47_QMLKevin Ottens2012-08-231-0/+2
| | | | | | | | Add this include to reduce the startup time of QML based applications. Supporting the "Qt 4.7" module name isn't needed for QNX. Change-Id: I86db40eefa83ccdd53a036faf0df4fd2135b2b74 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Fix vcproj file generation for incredibuild handling of moc etc targetsAndy Shaw2012-08-141-1/+2
| | | | | | | | | | | | | | | When incredibuild-xge had been turned on by configure then it was not ensuring that the generated vcproj files had the right extra comments needed to make incredibuild run moc and other tools in parallel. By fixing the prf file to get around a problem in the parser this is now respected. Task-number: QTBUG-14482 Change-Id: Ifd24bde2db7d80d3a52719c733d15f228c7b3534 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com> (cherry picked from commit fb3c850581953983588d49391f40f03cc7e61e62)
* Update contact information in license headers.Sergio Ahumada2012-08-01160-310/+312
| | | | | | | | | | | | | - Replace Nokia contact email address with Qt Project website. - Remove "All rights reserved" line from license headers. As in the past, to avoid rewriting various autotests that contain line-number information, an extra blank line has been inserted at the end of the license text to ensure that this commit does not change the total number of lines in the license header. Change-Id: Ie7ba62011752fcb149b99b26317c54f2a0cfa931 Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
* [Blackberry] Set default platform name for QPARafael Roquetto2012-07-302-0/+4
| | | | | | | | | | | Set the default platform name/plugin to be 'blackberry' when building for BlackBerry devices. qtbase ref: 5430d1de Change-Id: Id2b3263fd9e1b2214751c3c4d75b8991599926e5 Reviewed-by: Kevin Krammer <kevin.krammer@kdab.com> Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Add common build flags required for iOS platform plugins.Ian Dean2012-07-271-1/+1
| | | | | | | Disable QPF & QPF2 fonts and dummy (QWS) input methods. Change-Id: I020f8e9f7e240a7bc4d31a008513e2289bb46f18 Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
* Removed existing iOS mkspecs. Added Qt5 iOS mkspecs to unsupported.Ian Dean2012-07-2541-317/+1322
| | | | | Change-Id: I504d987abd092d25c68f7209cb5787a01d6fac50 Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
* Clang: Do not warn about unused parameters (caused by ccache)Tobias Hunger2012-06-281-0/+2
| | | | | Change-Id: If4e16b17d999cebac5579e108e9a2dbb7df20d2d Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Fix compile issue on AIXAndy Shaw2012-06-241-1/+1
| | | | | | | | | | Since local thread storage is used we need to turn this on for the xlc compiler with the -qtls flag. Change-Id: Ib40ec87edada56a062b0c72b7d47b38a6d0b5b13 Reviewed-by: Teemu Katajisto <teemu.katajisto@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> (cherry picked from commit ef459193ec927f347a2c91b180994428c6ea1a97)
* Enable extra warnings for win32-g++ mkspecsJonathan Liu2012-05-242-2/+2
| | | | | | | Change-Id: Ia3a5c2ca35b9da466f0cfab054a8b69a941797fd Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> Reviewed-by: Mark Brand <mabrand@mabrand.nl> (cherry picked from commit 10cfb08eae9ce60ad6895d6a75e857d2591ca4dd)
* mkspecs: Define compilers and linkers elsewhere for freebsd-g++46.Raphael Kubo da Costa2012-05-031-4/+10
| | | | | | | | | | | | | | | | Commit ae2060dc56501ab387863757c3fd90d5cfed7dd2 has made the freebsd-g++46 mkspec use g++-base.conf, which on its turn resets QMAKE_CC and QMAKE_CXX to other values. Redefine them to gcc46 and g++46, respectively (and fix the linker values) after the inclusion of g++-unix.conf so the settings are not lost. Cherry-picked from f42a61e76ac209db0bfeefdb03de22ce26b422bf to qt5/qtbase. Change-Id: I005bab3bc79ca3a0dc1b2d3a70d058b77c304f46 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* mkspecs: Rename freebsd-g++40 to freebsd-g++46.Raphael Kubo da Costa2012-04-192-3/+3
| | | | | | | | | | | | lang/gcc40 was removed from FreeBSD's ports tree in 2007, and the lang/gcc port, which provides a stable GCC version newer than the one in the base system, is currently pointing to the 4.6 series. Cherry-picked from c7b52e2a2a46047b7b6bca74a39c81cf43f1c864 to qt5/qtbase. Change-Id: I085e8495d449f47c1cfcf74e7f6511b2a8e3caa1 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* mkspecs: Sync freebsd-g++40 and freebsd-g++.Raphael Kubo da Costa2012-04-171-35/+6
| | | | | | | | | | | Make freebsd-g++40 include gcc-base-unix.conf and g++-unix.conf and eliminate a lot of duplicate definitions. Cherry picked from 996672933a61016fdc0ec6d42d536986c5080ac5 to qt5/qtbase. Change-Id: Iae42f48b4f43e92567b30f340a25f0bd86c43463 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Do not define QT_AOUT_UNDERSCORE in freebsd-g++'s mkspec.Raphael Kubo da Costa2012-04-171-11/+0
| | | | | | | | | | | | | | According to FreeBSD svn r52802 from 1999 the -aout compiler option and the QT_AOUT_UNDERSCORE trick were already obsolete. Since the FreeBSD project itself only supports versions 7 and above these days, the definition can be safely removed. Cherry-picked from 874ebef4535e5ae43d917595f00edd365150cfd9 to qt5/qtbase. Change-Id: I93717e7c937f05b36580914608a3d2d1177ef7d6 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Remove the freebsd-g++34 mkspec.Raphael Kubo da Costa2012-04-172-129/+0
| | | | | | | | | | | | | | GCC 3.4 is older than the 4.2.1 in the base system, and should be removed from the ports tree. Besides, nobody in their sane mind would want to build Qt with such an old compiler. Cherry-picked from 0e8aabadf947926b78de140fabf8be789c96a9ac to qt5/qtbase. Change-Id: Ie739d839f1b621aeda693ae6f6a78909a557f3dd Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Do not redefine QT_SOCKLEN_T in freebsd-g++'s mkspec.Raphael Kubo da Costa2012-04-171-9/+0
| | | | | | | | | | | | | | | QT_SOCKLEN_T was being redefined depending on whether FreeBSD was < or >= 4, branched in early 1999. FreeBSD < 7 is not supported by the upstream project anymore, so we can simplify the code and rely on the QT_SOCKLEN_T definition in common/posix/qplatformdefs.h instead. Cherry-picked from 1afad60e6030064fee772c37e2647ae8c891ac2f to qt5/qtbase. Change-Id: I9883755070d2731b12b1113def17ca217d510d6a Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Enable stack smashing protection on Blackberry platformsSean Harmer2012-04-132-0/+6
| | | | | | | | | | | | | Backport of: 657ca81c910638128f533b7eb98edf187bd40a0c 1c20c3f29441a6856c6eb58dda40b86bdaac6a06 from qtbase. Change-Id: I2e30a16140eaf417a07674828642b74fc829bda8 Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Add new QSysInfo::symbianVersion() enumsPasi Pentikainen2012-04-131-25/+30
| | | | | | | | | | Add new enums for future Symbian platforms. Task-number: QT-4593 Change-Id: I23b616c6d62d9d56d2b8ec6ac7edb8f6a84211e8 Reviewed-by: Juha Kukkonen <ext-juha.kukkonen@nokia.com> Reviewed-by: Janne Anttila <janne.anttila@digia.com> Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
* Blackberry mkspecsRafael Roquetto2012-03-264-0/+102
| | | | | | | | | | | | | | Unlike QNX mkspecs, these mkspecs target more specific, BlackBerry-only devices. So far, the only difference is the definition of Q_OS_BLACKBERRY and linking with -lbps, but this will likely change with time. It will also allow conditional compilation to distinguish between qnx and blackberry devices. cherry-picked from qt5/qtbase: e1c22d426f8c5cdd9ad0e119d54cfa516d45f8c1 Change-Id: I607584a472ef636a6805502a725b42163b4070ae Reviewed-by: Sean Harmer <sh@theharmers.co.uk> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Disable the use of sed on native mingwHib Eris2012-03-211-1/+0
| | | | | | | | | | | | | | | | | | | | | | | Partially reverts 28f294e1e98f2437ce0d9614e698df7c8dc52dc6 Commit 28f294e1e98f2437ce0d9614e698df7c8dc52dc6 introduced the use of 'sed' to do replacements for mingw in pkgconfig files, similar to what is done for unix. However, this causes corrupted pkgconfig files when 'sed' is not available. While on Unix we can safely assume that 'sed' is always available, it appears that when building on Windows with mingw 'sed' might not be available. As it would be too complicated for the 4.8 branch to add support for automatic 'sed' detection, this patch chooses to completely disable the use of 'sed' for all mingw builds on Windows. For cross compiled builds 'sed' is still used. Change-Id: I8b6b3f52df6906cd087dd3eb417bdb5800e8eafc Reviewed-by: Andy Shaw <andy.shaw@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Silence warnings about va_list mangling for QNX toolchainSean Harmer2012-03-211-3/+4
| | | | | | | Backport of 2d5a4a5d3aae4efe7c17cadf03dfbb5cc4c36e86 from qtbase. Change-Id: Id8453fdd40c88acd27f2ddd932a5a410382e1b67 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Backported linux-g++-maemo mkspec changes from Qt5Gareth Stockwell2012-03-204-16/+71
| | | | | | | | | | This change factors out common configuration for Linux ARM targets into a subsiduary mkspec which is included by linux-g++-maemo. Cherry-picked from qtbase commit 3f09c6a1762db9ea05f3815235ac0937d004ee9e Change-Id: I9d7852e8b2e891217c3bee2964cddfef526d1d5f Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* mkspecs: don't forget to add 'qnx' when building for x86Marc Mutz2012-03-101-1/+1
| | | | | | | | | | | | | | | | When building for the QNX/x86 target, we forgot to add the 'qnx' tag to CONFIG. This causes failures when third-party libraries using qmake try to scope on qnx. This change mirrors what's in the ARM target. Change-Id: I28e1df4d8636385c5555a2bb4087d26a8a9b4220 Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com> Reviewed-by: Sean Harmer <sh@theharmers.co.uk> Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com> Reviewed-by: Mark Brand <mabrand@mabrand.nl> Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
* Renaming QNX mkspecsv4.8.1Rafael Roquetto2012-03-086-2/+2
| | | | | | | | | | Renamed from blackberry-* to qnx-* in order to match he <platform>-<compiler> pattern. cherry-picked from qt5/qtbase 6e58dd34ac96e2cf0807a227caaef74d15e272e7 Change-Id: I793af8d1a2053ccf37aaefd5849267797d0ee021 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Move qws/qnx-* mkspec files from unsupportedSamuli Piippo2012-03-0711-51/+51
| | | | | | | | As QNX in now a supported platform, move mkspec files away from unsupported folder. Change-Id: I31f806b5d5217cfb0420dc74dc7a5eea33c1598d Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Implement missing replacements when installing .pc files for win32Hib Eris2012-02-292-0/+2
| | | | | | | | | | | | | | | | | | | | This implements replacements for win32 makefile generators similar to the replacement functionality in unix makefile generators. To enable Makefile code generation for replacements in win32 makefile generators, you must set QMAKE_STREAM_EDITOR to e.g. sed. When building for win32, sed is normally only available in the mingw/msys build environment and when cross compiling on unix. In these cases QMAKE_STREAM_EDITOR is set to sed in qmake.conf. For other win32 build environments QMAKE_STREAM_EDITOR is not set in qmake.conf and the replacements Makefile code is not generated. (cherry picked from qtbase commit 78faefdbb1ccc296c967dde40e2a7a1c78e4cec2) Change-Id: Ie5de5d517eafaeaa2544f1e972aec3fe11d0a6f1 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* INTEGRITY mkspecs updateKalle Viironen2012-02-2311-105/+209
| | | | | | | | | | | Modifies existing structure of INTEGRITY mkspecs to be more clear and adds a new mkspec for INTEGRITY x86 target. This also moves mkspecs to supported folder as this is the case in 4.8.x. Task-number: QTBUG-24153 Change-Id: Iae893c20f88050040f7686ab2ab272c1d1af22bb Reviewed-by: Rolland Dudemaine <rolland@ghs.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Adds QT_NO_QWS_INPUTMETHODS to blackberry qcc mkspecsRafael Roquetto2012-02-032-0/+4
| | | | | | | | | | This prevents QApplication from setting a dummy input context, overriding the one set by the BB QPA plugin. Change-Id: Ie18e06d091d5d8748f3f253b0092ac725639cde1 Reviewed-by: Robin Burchell <robin+qt@viroteck.net> Reviewed-by: David Faure <david.faure@kdab.com> Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com>
* Enable basic gesture support for WEC7.Miikka Heikkinen2012-02-022-2/+2
| | | | | | | | | | | | | | This commit adds basic gesture support to WEC7 Qt builds, which enables developer to create custom gesture recognizers based on mouse events. Note that QTouchEvents are not yet generated in WEC7 Qt builds, so recognizers based on those cannot be created. Task-number: QTBUG-22517 Change-Id: I2588eabdaefc52123d579b47ebc9903d988c4b3a Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* Add support for XCode 4 into qmakeAndy Shaw2012-02-021-2/+0
| | | | | | | | | | This adds support for XCode 4 into qmake and also indirectly fixes a couple of problems that are relevant for XCode 3.2 too Task-number: QTBUG-17247 Change-Id: I722470ad1854bd740cbbd28ff4956057a0e1906b Reviewed-by: David Forstenlechner <dforsten@gmail.com> Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
* Symbian: clean deffiles for external projects using Qt infixPasi Pentikainen2012-02-011-1/+2
| | | | | | | | | | | When external projects use the infix configuration of Qt (QT_LIBINFIX), they can make their own library targets infixed. This fix cleans the infix from deffile names for such projects also, as long as the project defines variable QT_LIBINFIX_USED. Change-Id: Ifaf773c60d1ebe6f947f1cd44b76428de1c23dbf Reviewed-by: Gareth Stockwell <ext-gareth.stockwell@nokia.com> Reviewed-by: Shane Kearns <ext-shane.2.kearns@nokia.com>
* Fix DEPLOYMENT_PLUGIN for graphicssystem pluginsMiikka Heikkinen2012-01-311-1/+1
| | | | | | | | | ALLQTPLUGINS value had extra space in qt.prf, making graphicssystem plugins not have correct path when specified in DEPLOYMENT_PLUGIN. Task-number: QTBUG-23963 Change-Id: I67a36fa7fafd7ed0960e197fe3401fc6dd779578 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Added mkspecs for WEC7 platform builder and armv4i HW.Janne Anttila2012-01-306-0/+143
| | | | | | | | Task-number: QTBUG-22496 Change-Id: I502e654de7e03fbdbd22b609698d238f90d129a9 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com> (cherry picked from commit 2f20d5f23ac9fd838aff19c3139769bafa476fd8)
* Add mkspecs for Blackberry Playbook NDKRafael Roquetto2012-01-306-0/+357
| | | | | | | | | mkspecs for QNX qcc, armv7le and x86 targets cherry-picked from 43a48ad218fec43ef3c854cb4e215e7b372b23d4 Change-Id: Ic4bb8947aa4dd31a3ab6e23c36775f9c64d1443c Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* uikit: refactor the mkspecs and add armv6 and nothumb ones.Eike Ziller2012-01-258-98/+304
| | | | | Change-Id: I69ae8b40e3574039c8f9b0d88ecd55d16e830ac9 Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
* use "cp -R" instead of "cp -r" for *bsd compatibilityMark Brand2012-01-121-1/+1
| | | | | | Change-Id: Ib013e2d36645a782249b543ec9301902484a7708 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> (cherry picked from commit 584c9ca120da964323181c53ecfee2a17309b22f)
* Windows: Add gcc 4.6 for cross buildingMark Brand2012-01-122-0/+45
| | | | | | | Based on commit 1f2598b which did this for win32-g++-4.6 Change-Id: Icbeed880a6810f9e5a121d1b36ed194418b1633b Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Update year in Nokia copyright messages.Jason McDonald2012-01-11156-156/+156
| | | | | | | | | Simple search and replace. This commit doesn't touch 3rd-party files, nor translations (where the change is not so simple and will be handled in a separate commit). Change-Id: I4e48513b8078a44a8cd272326685b25338890148 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Symbian: Fix language mappings for localize_deploymentMiikka Heikkinen2011-12-072-4/+9
| | | | | | | | Some Qt language codes now map to two Symbian language codes. Also added the missing en_in mapping. Task-number: ou1cimx1#947060 Reviewed-by: Pasi Pentikainen
* Fix permission (no execute bit).Frederik Gladhorn2011-11-224-0/+0
|
* Merge remote-tracking branch 'mainline/4.8'Oswald Buddenhagen2011-11-162-2/+14
|\
| * Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2011-11-161-5/+6
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (24 commits) Amend qfiledialog INTEGRITY patch Update to latest INTEGRITY Framebuffer API. Remove support for tilde expansion as there is no home on INTEGRITY. Remove docs and translations generation for INTEGRITY. Add XPLATFORM_INTEGRITY to define defaults for INTEGRITY. Remove QT 3 API support by default for INTEGRITY. Disable some tests because INTEGRITY doesn't support shared libraries. Add specific INTEGRITY cases for autotests requiring a target path. Improve default mkspec for INTEGRITY. Use Q_FUNC_INFO without line number on GHS compiler. Add INTEGRITY gbuild.* files to qmake project. Use the project root from .gpj project files, instead of local path. Make sure QMAKE_CXX is defined to prevent crashing on some projects. Add support for .pro-type subdirectories. Add relative path to the work directory, to prevent filename clashes. Only call moc if the file needs it. Use outname to specify the output .gpj to generate. Use "dll" instead of "shared". Instead of translating / into _, check if subdir is a .pro. Do not generate -D defines for project types. ...
| * \ Merge branch 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration ↵Qt Continuous Integration System2011-11-161-0/+4
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into master-integration * 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration: tests: allow unstable tests to be marked with CONFIG+=insignificant_test Fix focusScopeItemChange setting crash Fix crash in QHttpNetworkReplyPrivate::gunzipBodyPartiallyEnd symbian - handle path being passed as part of filename in QTranslator Symbian - fix compile error when default configured Compile when -no-rtti is specified as a configure option Ensure that the RC_FILE is correctly handled in a single configuration
| | * \ Merge branch 4.7 into qt-4.8-from-4.7Sergio Ahumada2011-11-151-0/+4
| | |\ \
| | | * | tests: allow unstable tests to be marked with CONFIG+=insignificant_testRohan McGovern2011-11-151-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Marking a test with CONFIG+=insignificant_test will cause the exit code of the test to be discarded during `make check'. This is intended to be used for tests which are valuable to run, but are known to be unstable and are not feasible to immediately fix. Reviewed-by: Jason McDonald Change-Id: I50a712c33c2ebb0af39f1ea0bf2adef7f0936425 (cherry picked from commit b0a5a988900b777cb08012408eb108512a3e873b)
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-24 14:32:16 +0000