summaryrefslogtreecommitdiffstats
path: root/mkspecs
Commit message (Collapse)AuthorAgeFilesLines
* Add ".make.cache" to the files to be cleaned for symbian-abld.Miikka Heikkinen2011-03-171-0/+1
| | | | | | | | "make clean" will now delete any generated ".make.cache" files in symbian-abld builds. Task-number: QTBUG-15733 Reviewed-by: Janne Koskinen
* Fix mismatched $$translations handling after mergeMiikka Heikkinen2011-03-161-1/+1
| | | | | | | | One use of $$translations prepends "$$_PRO_FILE_PWD_/" to it in symbian.conf, while another identical use doesn't. This discrepancy was caused by merge from 4.7. Reviewed-by: Janne Koskinen
* Merge remote-tracking branch 'origin/master' into qt-master-from-4.7Thiago Macieira2011-03-1110-10/+10
|\ | | | | | | | | Conflicts: src/s60installs/eabi/QtOpenVGu.def
| * Update copyright year to 2011.Rohan McGovern2011-03-108-8/+8
| | | | | | | | | | Reviewed-by: Trust Me (cherry picked from commit 774a3536b00c4d6e4c4c10b708e31b4373a338e3)
| * Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into ↵Qt Continuous Integration System2011-03-042-2/+2
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging: (40 commits) Readded a ';;' that was removed by mistake. Fixed mkspec detection for Symbian. Removed javascript-jit from default symbian-gcce build. QAbstractSocket: Check for socket state on Unbuffered reads Corrected a mismerge in GCCE link parameters. QAbstractSocket: Check for engine validity on Unbuffered reads tst_qnetworkreply: fix the MiniHttpServer. tst_qnetworkProxyFactory: fix debug output. Fixed incorrect referral to an include file. tst_qnetworkreply: getErrors() only ignore warning for the specific test Check engine existence before increasing reference count Fixed library casing. Fix Q_INVOKABLE declared after Q_PROPERTY tst_qnetworkreply: small improvements QNAM: Add a warning for misuse of the file backend. Keep reference count for cached font engines in QTextEngine QNAM HTTP: Be more strict with HTTP channel state tst_qnetworkreply: Add a test for broken gzip encoding QNAM HTTP: Add qWarning() for double-finished() bug fix documentation typos in isLowSurrogate and requiresSurrogates ...
| | * Merge remote branch 'earth/master' into masterJoão Abecasis2011-02-282-2/+2
| | |\
| | | * Corrected a mismerge in GCCE link parameters.axis2011-02-241-1/+1
| | | | | | | | | | | | | | | | RevBy: Trust me
| | | * Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt into earth-masteraxis2011-02-2411-84/+93
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/network/access/qnetworkreplyimpl.cpp tests/auto/moc/tst_moc.cpp
| | | * | Fixed incorrect referral to an include file.axis2011-02-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Better to make it relative to the profile. That way it is always found, regardless of where Qt is located. RevBy: Liang Qi
* | | | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Thiago Macieira2011-03-113-4/+39
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | Conflicts: mkspecs/common/symbian/symbian.conf src/s60installs/bwins/QtGuiu.def src/s60installs/eabi/QtGuiu.def
| * | | | Implement language fallback logic for localize_deploymentMiikka Heikkinen2011-03-092-3/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When querying system locale it does return both language and country, so sometimes users want to have both in their .ts file names (e.g. myapp_zh_CN.ts). This is bit problematic in Symbian, where there are separate language codes for only very few language + country combinations. Until now, the unsupported combinations were simply dropped from deployment localization. More proper way to handle these unknown language + country combinations is to fall back to using the plain language code for them instead of dropping them altogether. This is somewhat analogous to how QTranslator::load() loads .ts files if it can't find the file for specified language + country combination. E.g. User defines: TRANSLATIONS += myapp_zh_CN.ts myapp_zh_HK.ts myapp_zh_TW.ts There are separate Symbian language codes for HongKong Chinese (zh_HK = 30) and Taiwanese Chinese (zh_TW = 29), but rest of the world is expected to use just Chinese (zh = 31). This means "zh_CN" mapping is not provided as it would be same as plain "zh". With this fix, qmake will now automatically generate a fallback mapping from "zh_CN" to "31" for deployment localization purposes, and is able to read application captions and pkg names from myapp_zh_CN.ts. If there are multiple TRANSLATIONS defined that would result in same Symbian language code, only the first one is used. Task-number: QTBUG-17927 Reviewed-by: Oswald Buddenhagen
| * | | | Adding quote around files in QMAKE_CLEAN to tackle wildcard issueGuoqing Zhang2011-03-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTPROD-875 Reviewed-by: Miikka Heikkinen
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2011-02-261-5/+6
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Update QtOpenGL def files Fix extern usage in qpixmapdata_gl.cpp Fix for loading QPixmaps from file in GL graphics system Fix code style in qgl_symbian.cpp QPixmap::to/fromSymbianCFbsBitmap() in OpenGL graphics system. Use the 'convertInPlace' versions of QImage in QGLPixmapData load. Recreate GL surface when native window is resized on Symbian
| | * | | | QPixmap::to/fromSymbianCFbsBitmap() in OpenGL graphics system.Jani Hautakangas2011-02-251-5/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Implementation of Symbian specific conversion functions for converting Symbian native bitmap to QPixmap and QPixmap to Symbian native bitmap. Task-number: QTBUG-16977 Reviewed-by: Jason Barron
* | | | | | don't add extraneous empty command linesOswald Buddenhagen2011-03-012-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: mariusSO
* | | | | | minor cleanup of the QMAKE_POST_LINK command line constructionOswald Buddenhagen2011-03-011-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | don't over-$$quote(), consistently use a single string instead of a string list Reviewed-by: mariusSO
* | | | | | silence qmake warning about unbalanced parenthesesOswald Buddenhagen2011-03-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | this is stupid, but i don't feel like fixing qmake now
* | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2011-02-286-0/+381
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (26 commits) fix autotest on windows (again) fix autotest on windows Ammend last INTEGRITY fix Fix qmake build on Windows fix test for QtLighthouse add test for suppressing warnings in moc Ammend INTEGRITY fixes Store property editor's column positions in settings add gsm to connectable bearer for networkmanager. Fix license headers add missing include Silence GHS compiler Run on INTEGRITY Fix compilation on INTEGRITY Do not link with libm on INTEGRITY Add a "-nn" option to moc Add Documentation about INTEGRITY RTOS List the INTEGRITY drivers as well Use TCP_LOCALSOCKET on INTEGRITY Compile for systems without mmap ...
| * | | | | Fix license headersHarald Fernengel2011-02-221-5/+33
| | | | | |
| * | | | | Add support for the INTEGRITY RTOS build systemRolland Dudemaine2011-02-226-0/+353
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds mkspecs and a qmake generator for Green Hills .gpj files Merge-request: 1101 Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
* | | | | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2011-02-251-0/+1
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2011-02-251-0/+1
| |\ \ \ \ | | | |/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Always prepend drive letter to $$EPOCROOT in Windows Symbian builds Add files deployed using qmake_emulator_deployment.flm to 'what' list
| | * | | Add files deployed using qmake_emulator_deployment.flm to 'what' listMiikka Heikkinen2011-02-241-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since anything copied using this flm is part of application deployment, those files should be present in the 'what' list. Task-number: QTBUG-17727 Reviewed-by: Janne Koskinen
* | | | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-02-233-3/+26
|\ \ \ \ \ | |/ / / / | | | / / | |_|/ / |/| | | | | | | | | | | | | | | Conflicts: src/gui/kernel/qcocoaview_mac.mm src/s60installs/bwins/QtGuiu.def src/s60installs/eabi/QtGuiu.def src/testlib/qtestcase.cpp
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2011-02-213-3/+26
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Added support for QMAKE_CLEAN in symbian-sbsv2 Only add NetworkServices capability automatically if no caps are set.
| | * | Added support for QMAKE_CLEAN in symbian-sbsv2Miikka Heikkinen2011-02-212-0/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Files specified in QMAKE_CLEAN variable will now be properly cleaned in symbian-sbsv2 builds. Task-number: QTBUG-17004 Reviewed-by: Janne Koskinen
| | * | Only add NetworkServices capability automatically if no caps are set.Miikka Heikkinen2011-02-211-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows overriding the NetworkServices capability for the applications that do not need the capability even though they link network, webkit, or declarative. It is also more intuitive as there are no magic additions to user defined capabilities. Task-number: QTBUG-17540 Reviewed-by: Janne Koskinen
* | | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-02-171-3/+3
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: mkspecs/features/symbian/symbian_building.prf mkspecs/symbian-gcce/qmake.conf src/corelib/global/qnamespace.h src/corelib/global/qnamespace.qdoc src/plugins/plugins.pro tests/auto/qstylesheetstyle/tst_qstylesheetstyle.cpp tools/designer/src/components/signalsloteditor/signalslot_utils.cpp tools/designer/src/components/signalsloteditor/signalsloteditorwindow.cpp
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2011-02-142-7/+4
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Worked around a SC issue in S60 3.x vs 5.0 versions. Apply the gcce link rules for LIBS_PRIVATE too. Build Qt with GCCE 4.4.1, Symbian^3 PDK on Linux and Mac OS X.
| | * | Apply the gcce link rules for LIBS_PRIVATE too.Liang Qi2011-02-111-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | It's needed by building QtOpenGL of Qt for Symbian on Linux and Mac with gcce at least. RevBy: axis
| | * | Build Qt with GCCE 4.4.1, Symbian^3 PDK on Linux and Mac OS X.Liang Qi2011-02-111-4/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove the define of _STLP_NO_EXCEPTION_HEADER after OpenC team's suggestion. Remove the hardcoded include path for openc, it is already provided by mkspecs/features/symbian/platform_paths.prf. RevBy: Miikka Heikkinen Backport from 7c12d841fb2e2963b506c1ffc857cdd88bf78f6c in master.
* | | | Merge branch earth-team/master into earth-stagingJoão Abecasis2011-02-1612-72/+334
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | Conflicts: doc/src/development/qmake-manual.qdoc
| * | | Add experimental support for armCC on LinuxHarald Fernengel2011-02-112-0/+132
| | | | | | | | | | | | | | | | Reviewed by our Anttis
| * | | Workaround public header depending on private in symbian^3Shane Kearns2011-02-081-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | f32file.h (public) depends on e32svr.h (private), and in symbian^3 the private headers have been moved to a different include path. Reviewed-by: axis
| * | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt into earth-masteraxis2011-01-31151-164/+171
| |\ \ \
| * \ \ \ Merge branch 'windowsMakefileBuildSupport' into earth-masteraxis2011-01-286-18/+27
| |\ \ \ \
| | * | | | Fixed GCCE libdir handling if the paths have spaces in them.axis2011-01-281-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | RevBy: Trust me
| | * | | | Added MinGW support for adding lib prefix and extension via profile.axis2011-01-281-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | RevBy: Oswald Buddenhagen
| | * | | | Stopped honoring the RVCT22INC variable on symbian-armcc mkspec.axis2011-01-281-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This usually points to the RVCT include directory, but those headers are not appropriate for Symbian. RevBy: Trust me
| | * | | | Added object script support to RVCT when using MinGW qmake generator.axis2011-01-281-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | RevBy: Oswald Buddenhagen
| | * | | | Added Symbian makefile building support using MinGW backend.axis2011-01-281-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | RevBy: Oswald Buddenhagen
| | * | | | Fixed some tools definitions and properties in symbian profiles.axis2010-12-232-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is needed for Symbian development on Windows using makefiles. RevBy: Trust me
| * | | | | Added missing header.axis2011-01-281-0/+41
| | | | | |
| * | | | | Added Symbian deployment localization for makefile build system.axis2011-01-274-51/+107
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a complement to the 16575f7aef840b6aae0dc767468ab713fbcfd7a6 commit, which adds localization based on TRANSLATIONS keywords for Raptor and abld. In addition, since the __PRODUCT_INCLUDE__ define was creating a lot of trouble regarding < and >, it was refactored into its own source file, which is automatically included before every source file. Task: QTBUG-15292 RevBy: Miikka Heikkinen
| * | | | | Made the translations dependency work for shadow builds.axis2011-01-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | RevBy: Miikka Heikkinen
| * | | | | Use packagesExist() macro to bail if a nonexistant package is requested.Robin Burchell2011-01-171-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will solve problematic cases with large projects, lots of required packages, and no configure scripts failing to build partway through. Previously, PKGCONFIG processing would error to stdout, but continue the compilation. This should not affect existing code overly much, apart from projects who added nonexistent packages they didn't use to PKGCONFIG (but let's face it, that's a bit of a stupid thing to do.) Task-number: QTBUG-11418 Merge-request: 1022 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
| * | | | | Add packagesExist() function to qmake.Robin Burchell2011-01-172-1/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This can be used to detect whether or not a given (set of) packages exist, which can be useful for compiling in or our extra functionality at build time. Merge-request: 1022 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* | | | | | Merge branch 'qt-master-from-4.7' of ↵Qt Continuous Integration System2011-02-141-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | scm.dev.nokia.troll.no:qt/qt-integration into master-integration * 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration: My 4.7.2 changes Fix QFileDialog Symbian native file dialog filename filtering. fix QMAKE_COPY_DIR for mingw+sh
| * \ \ \ \ \ Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2011-02-111-1/+1
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | |
| | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2011-02-101-1/+1
| | |\ \ \ \ \ | | | |_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: fix QMAKE_COPY_DIR for mingw+sh
generated by cgit v0.12 at 2024-11-27 13:42:16 (GMT)