summaryrefslogtreecommitdiffstats
path: root/mkspecs
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'qt-master-from-4.7' of ↵Qt Continuous Integration System2011-03-221-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: Add flag for forcibly propagating backing store alpha to framebuffer Fixed unmatched quotes in s60installs.pro Added setSwitchPolicy to MeeGo graphicssystem helper API. Add /q switch to QMAKE_DEL_FILE command in symbian
| * Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2011-03-191-1/+1
| |\
| | * Add /q switch to QMAKE_DEL_FILE command in symbianMiikka Heikkinen2011-03-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Builds will otherwise halt without giving reason if a wildcard is given in QMAKE_CLEAN in symbian-abld. Task-number: QTBUG-18207 Reviewed-by: axis
* | | Merge remote-tracking branch 'origin/master' into lighthouse-masterJørgen Lind2011-03-1713-52/+87
|\ \ \ | |/ / | | | | | | | | | Conflicts: mkspecs/qws/macx-nacl-g++/qplatformdefs.h
| * | Merge remote-tracking branch 'origin/4.7' into HEADThiago Macieira2011-03-161-1/+1
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure mkspecs/symbian-gcce/qmake.conf qmake/generators/metamakefile.cpp qmake/generators/win32/mingw_make.cpp src/corelib/global/global.pri src/corelib/global/qglobal.h src/opengl/qgl.cpp src/opengl/qwindowsurface_gl.cpp src/plugins/platforms/wayland/qwaylandbuffer.h tests/auto/qnetworkreply/tst_qnetworkreply.cpp tools/designer/src/components/formeditor/qdesigner_resource.cpp
| | * Merge branch 'backporting-symbian-armcc-to-4.7' into s60-4.7axis2011-03-1418-162/+291
| | |\ | | | | | | | | | | | | | | | | Conflicts: mkspecs/common/symbian/symbian.conf
| | | * Removed reference to nonexistant profile.axis2011-03-041-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Probably this was a result of backporting symbian-gcce support from 4.8 to 4.7. RevBy: Liang Qi
| | | * Corrected a mismerge in GCCE link parameters.axis2011-03-041-1/+1
| | | | | | | | | | | | | | | | RevBy: Trust me
| | | * Fixed incorrect referral to an include file.axis2011-03-041-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
| | | * Fixed GCCE libdir handling if the paths have spaces in them.axis2011-03-041-9/+9
| | | | | | | | | | | | | | | | RevBy: Trust me
| | | * Added MinGW support for adding lib prefix and extension via profile.axis2011-03-041-0/+2
| | | | | | | | | | | | | | | | RevBy: Oswald Buddenhagen
| | | * Stopped honoring the RVCT22INC variable on symbian-armcc mkspec.axis2011-03-041-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-03-041-0/+2
| | | | | | | | | | | | | | | | RevBy: Oswald Buddenhagen
| | | * Added Symbian makefile building support using MinGW backend.axis2011-03-041-1/+5
| | | | | | | | | | | | | | | | RevBy: Oswald Buddenhagen
| | | * Fixed some tools definitions and properties in symbian profiles.axis2011-03-042-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | This is needed for Symbian development on Windows using makefiles. RevBy: Trust me
| | | * Added missing header.axis2011-03-041-0/+41
| | | |
| | | * Unified the usage of $${EPOCROOT} for symbian.axis2011-03-042-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | RevBy: Miikka Heikkinen Conflicts: mkspecs/symbian-gcce/qmake.conf
| | | * Added Symbian deployment localization for makefile build system.axis2011-03-044-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-03-041-1/+1
| | | | | | | | | | | | | | | | RevBy: Miikka Heikkinen
| | | * Fixed PREPEND_INCLUDEPATH being executed too early.axis2011-03-043-16/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It used to be carried out inside qt.prf, but was moved to default_post.prf. However, since qt.prf is executed after default_post.prf, it would still prepend its own include paths at the very front, which is wrong. Fixed by introducing a new feature profile for PREPEND_INCLUDEPATH, which is run after qt.prf (features in $$CONFIG are executed in reverse order). RevBy: Miikka Heikkinen
| | | * Moved the default dependency targets to default_post.prf.axis2011-03-042-47/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The file that they were in would not be parsed if CONFIG -= qt, but it always needs to be parsed, otherwise apps that don't use Qt will fail the sis file creation. RevBy: Miikka Heikkinen Conflicts: mkspecs/features/symbian/default_post.prf
| | | * Fix some build issues for building Qt for Symbian on Mac OS X.axis2011-02-211-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Need to add edllstub.lib and change a bit because some refactored work for mkspecs in 86636e0c4ab91bfb60be1e18d6daff34d41a5927. RevBy: axis Conflicts: mkspecs/symbian-gcce/qmake.conf
| | | * Got rid of some "duplicate library" warnings.axis2011-02-211-1/+1
| | | | | | | | | | | | | | | | RevBy: Trust me
| | | * Changed various qmake constructs to support Windows.axis2011-02-182-9/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | RevBy: Thomas Zander Conflicts: mkspecs/features/symbian/symbian_building.prf
| | | * Fixed various quotation problems when porting to Windows.axis2011-02-182-8/+13
| | | | | | | | | | | | | | | | | | | | | | | | These should work for both Windows and UNIX platforms. RevBy: Thomas Zander
| | | * Renamed the symbian/linux-* mkspecs to symbian-*.axis2011-02-188-18/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was done for a number of reasons: - In order to get better consistency with the other mkspecs, which have the target system name followed by a hyphen and the compiler name. - There is no real reason why we should have specific mkspecs for compiling Symbian under Linux, when it is equally likely to work under other operating systems. RevBy: Thomas Zander Conflicts: src/s60main/s60main.pro
| * | | 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
* | | | | | | | Lighthouse: Make sure we don't use xkbcommonJørgen Lind2011-03-161-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | when we don't have it
* | | | | | | | Rename qnaclunimplemented -> qfunctions_naclMorten Sorvig2011-03-162-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | (Match the existing files for wince and vxworks.)
* | | | | | | | posix platformdefs: Add QT_NO_SOCKET_H.Morten Johan Sørvig2011-03-161-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prevents including <sys/socket.h> Reviewed-by: Jørgen Lind
* | | | | | | | Update NaCl mkspecs.Morten Johan Sørvig2011-03-164-407/+79
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Less duplication, use the common unix and gcc conf files.
* | | | | | | | Do release build for devices and remove some warnings.con2011-03-112-2/+4
| | | | | | | |
* | | | | | | | Add proof-of-concept UIKit based lighthouse platform.con2011-03-106-0/+319
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | See the README in the uikit platform plugin for details.
* | | | | | | | Objective-c prf may not override OBJECTIVE_CFLAGS settings.con2011-03-102-13/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Morten Johan Sørvig
* | | | | | | | Merge remote-tracking branch 'origin/master' into lighthouse-masterJørgen Lind2011-03-034-5/+5
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | 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
* | | | | | | | Build fixes for the Wayland pluginPaul Olav Tvete2011-03-021-0/+5
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add qmake.conf variables, and use the generic font plugin. Reviewed-by: Jørgen
generated by cgit v0.12 at 2024-11-12 08:39:47 (GMT)