summaryrefslogtreecommitdiffstats
path: root/mkspecs/common
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into ↵Qt Continuous Integration System2010-02-261-0/+1
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/berlin-staging-1: (22 commits) fix "configure -fast" on Windows for other maketools than nmake Get qmake to add pdb files to install target in debug configuration. add TARGET_PLATFORM to qmakespecs with MAKEFILE_GENERATOR = UNIX give symbian an own platform mode deprecate -win32/-unix/-macx which set both host and target mode decouple host platform mode from target platform mode factor out applyHostMode() make QMAKE_QMAKE and QMAKE_EXT_OBJ magic builtins use QDir::separator() instead of Option::dir_sep where appropriate simplify string ops sanitize evaluation of OS scopes instead of hard-coding recursion for symbian, add it to the specs add possibility to request project recursion from within a pro file fix ts-assistant target use QList::reserve() as appropriate optimize appending of (empty) lists to (empty) lists suppress pointer aliasing warnings Fix compilation with namespace. Assistant: Make ~AbstractHelpViewer() virtual. Prepare German translations for 4.7 (except Quick). ...
| * add TARGET_PLATFORM to qmakespecs with MAKEFILE_GENERATOR = UNIXOswald Buddenhagen2010-02-261-0/+1
| | | | | | | | | | | | | | | | | | | | the unix makefile generator can make files for "regular" unixes and macos (the difference being the framework handling). so far, the output choice was hard-wired to the host platform. the previous commit made that soft-configurable, and this one exploits this capability to enable limited cross-building. Reviewed-by: mariusSO
* | Merge branch '4.6'Miikka Heikkinen2010-02-261-0/+1
|\ \ | | | | | | | | | | | | Conflicts: mkspecs/common/symbian/symbian.conf
| * | Added addMMPRules for adding conditional MMP_RULESMiikka Heikkinen2010-02-261-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Usage: # Set conditional libraries LIB.MARM = "LIBRARY myarm.lib" LIB.WINSCW = "LIBRARY mywinscw.lib" LIB.default = "LIBRARY mydefault.lib" # Set conditional Epoc Heap Size EHZ.WINSCW = "EPOCHEAPSIZE 0x2000 0x2000000" EHZ.default = "EPOCHEAPSIZE 0x40000 0x400000" # Add the conditional MMP rules MYCONDITIONS = MARM WINSCW MYVARIABLES = LIB EHZ addMMPRules(MYCONDITIONS, MYVARIABLES) This will generate the following in the mmp file: #if defined(MARM) LIBRARY myarm.lib EPOCHEAPSIZE 0x40000 0x400000 #elif defined(WINSCW) LIBRARY mywinscw.lib EPOCHEAPSIZE 0x2000 0x2000000 #else LIBRARY mydefault.lib EPOCHEAPSIZE 0x40000 0x400000 #endif Task-number: QT-2909 Reviewed-by: axis
* | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into master-s60axis2010-02-261-3/+3
|\ \ \ | |/ / | | / | |/ |/| | | Conflicts: qmake/generators/symbian/initprojectdeploy_symbian.cpp qmake/generators/symbian/symmake_abld.h
| * enable bytepair compression for S60 3.2 and newerLars Knoll2010-02-231-3/+3
| | | | | | | | | | | | | | Bytepair compression allows libraries to be paged properly and drastically reduces RAM consumption. Reviewed-By: Jason Barron
* | Merge remote branch 'origin/master' into qt-master-from-4.6Thiago Macieira2010-02-181-1/+3
|\ \ | | | | | | | | | | | | | | | Conflicts: src/corelib/codecs/qtextcodec.h tests/auto/gestures/tst_gestures.cpp
| * \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-02-131-1/+3
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (28 commits) Optimized QLocale to access system locale on demand. Fix QRegion under Mac OS X. update according to Thiago's comments. Changes: add functionality for dbus auto start to qt Add license header to this file readdir64 is not available on HP-UX Fix bug in QDirPrivate::setPath, affecting QDir::cd, cdUp and setPath qdoc3: Completed handling of the new \pagekeywords command. Wrong cursor shown by the parent window after setOverrideCursor(). Fixed Mac OS X compile time error by using GLint for temp. qdoc3: Added curly braces in switch statement for braindead compiler. qdoc: Added a build rule for the documentation - disabled by default. Doc: Added the qdoc manual to the repository for future maintenance. qdoc3: Fixed bug in creation of qt.pageindex. qdoc3: Added capability to create qt.pageindex. Incorrect property setter generated by dumpcpp for Microsoft Word 2007. Cocoa: Implement our own NSApplication subclass Cocoa: Menu in menubar stays highlighted qdoc: Made a temporary fix for comment highlighting. Doc: Tidied up the class layout and removed an unnecessary image. ...
| | * | readdir64 is not available on HP-UXJoão Abecasis2010-02-121-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead, 64-bit inode numbers in dirent are documented to be truncated. Oh, well. New define QT_NO_READDIR64 allows blacklisting other platforms that support open64 and friends, but not readdir64. Reviewed-by: Thiago Macieira
* | | | Merge branch '4.6' into qt-master-from-4.6Thiago Macieira2010-02-171-11/+11
|\ \ \ \ | |/ / / |/| | / | | |/ | |/| | | | | | | Conflicts: mkspecs/common/symbian/symbian.conf src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp tools/assistant/tools/assistant/helpviewer.cpp
| * | Only use unix-like tools when not building for Symbian in Windows.Miikka Heikkinen2010-02-161-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | Having sh.exe but not the other unix-like basic tools in the path made distclean break in Windows. Task-number: QTBUG-7883 Reviewed-by: axis
* | | add QMAKE_DEL_TREE (aka. rm -rf) to avoid more hard-coded platform ifdefsOswald Buddenhagen2010-02-121-0/+2
| | | | | | | | | | | | Reviewed-by: mariusSO
* | | move $(DEL_FILE) 2> NUL redirection into .conf fileOswald Buddenhagen2010-02-121-1/+1
| | | | | | | | | | | | | | | | | | | | | littering generic makefile generator code with it is both plain ugly and unnecessary. Reviewed-by: mariusSO
* | | fix host platform conditionalOswald Buddenhagen2010-02-121-1/+1
| |/ |/| | | | | Reviewed-by: mariusSO
* | Merge remote branch 'qt/4.6' into qt-master-from-4.6Qt Continuous Integration System2010-02-091-0/+16
|\ \ | |/ | | | | | | | | Conflicts: src/gui/kernel/qcocoapanel_mac.mm src/gui/kernel/qcocoasharedwindowmethods_mac_p.h
| * Enabling runfast mode when vfpv2 used.Aleksandar Sasha Babic2010-02-081-0/+16
| | | | | | | | | | | | | | The fpu flag is monitored and when either 'softvfp+vfpv2' or 'vfpv2' detected we are turning on RunFast mode (via --fpumode fast switch). Reviewed-by: Iain
* | Merge remote branch 'origin/4.6' into qt-master-from-4.6Olivier Goffart2010-02-041-1/+2
|\ \ | |/ | | | | | | | | | | | | | | Conflicts: examples/assistant/simpletextviewer/findfiledialog.cpp qmake/generators/symbian/symmake.cpp tools/assistant/lib/qhelpgenerator.cpp tools/assistant/lib/qhelpsearchquerywidget.cpp translations/translations.pri
| * Implementation for QVGPixmapData to/fromSymbianCFbsBitmapJani Hautakangas2010-02-031-1/+1
| | | | | | | | functions.
| * Revert "Using RunFast mode for RVCT" until compilationAleksandar Sasha Babic2010-02-021-16/+0
| | | | | | | | | | | | erro fixed. This reverts commit d43178ccaa38b87698e2f5a9fa0f2fb4e5f9f0ad.
| * Add visibility-inlines-hidden for GCCE on Symbian OSIain2010-02-011-0/+1
| | | | | | | | Reviewed-by: axis
| * Using RunFast mode for RVCTAleksandar Sasha Babic2010-01-281-0/+16
| | | | | | | | | | | | | | | | | | | | | | | | Now when we detect, by looking into ARMFPU, that either vfpv2 or softvfp+vfpv2 option is used, we will force using "-fpmode = fast" switch as well. This should give not just some performance improvement, but improve execution stability when vfpv2 used. Task-number: QTBUG-4893 Reviewed-by: Jason Barron
* | Remove obsolete OpenGL/ES CommonLite (fixed-point) supportRhys Weatherley2010-02-042-4/+0
| | | | | | | | | | Task-number: QTBUG-7683 Reviewed-by: Tom Cooksey
* | Merge commit 'oslo1/master' into oslo1-masterRohan McGovern2010-02-015-77/+356
|\ \ | |/ |/| | | | | | | | | | | Conflicts: doc/src/getting-started/installation.qdoc src/gui/dialogs/qfiledialog_win.cpp tools/assistant/tools/assistant/centralwidget.cpp tools/assistant/tools/assistant/helpviewer.cpp
| * Use X/Open LFS extensions for 64-bit support on directory iterationJoão Abecasis2010-01-292-0/+26
| | | | | | | | | | | | | | | | | | | | | | | | This boils down to using readdir64(_r) and struct dirent64 where available. I assumed these are available in the same platforms other such extensions are already being used. AIX uses the additional type DIR64 and opendir64/closedir64 to manipulate it. Task-number: QTBUG-2781 Reviewed-by: Thiago Macieira
| * Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Pulse Build System2010-01-251-7/+13
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-public: Fixed the host detection in qmake profiles. Improving parts of commit 2d8d855d. qmake: add Linux host support to Symbian generator Fixed indentation. Add Linux host support to Symbian mkspecs. Linux support for platform specific commands in .pro files. Add createpackage.bat equivalent for Unix systems. Make all Symbian #includes lower case. mkspecs: fix warning when calling qmake Fix portability problems in bin/createpackage.pl.
| | * Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Pulse Build System2010-01-221-7/+13
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-public: Fixed the host detection in qmake profiles. Improving parts of commit 2d8d855d. qmake: add Linux host support to Symbian generator Fixed indentation. Add Linux host support to Symbian mkspecs. Linux support for platform specific commands in .pro files. Add createpackage.bat equivalent for Unix systems. Make all Symbian #includes lower case. mkspecs: fix warning when calling qmake Fix portability problems in bin/createpackage.pl.
| | | * Fixed the host detection in qmake profiles.axis2010-01-051-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The previous tests were checking the target platform, but we need to check the host. RevBy: Trust me
| | | * Merge branch 'merge-request-1601' into master-s60axis2010-01-051-7/+13
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: bin/createpackage.pl mkspecs/features/symbian/application_icon.prf qmake/generators/symbian/symmake_abld.cpp src/gui/text/qfontdatabase_s60.cpp src/s60main/s60main.pro
| | | | * Fixed indentation.axis2009-11-171-6/+6
| | | | |
| | | | * Add Linux host support to Symbian mkspecs.Anderson Lizardo2009-11-171-3/+9
| | | | | | | | | | | | | | | | | | | | Signed-off-by: axis <qt-info@nokia.com>
| | | | * mkspecs: fix warning when calling qmakeAnderson Lizardo2009-10-231-1/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: axis <qt-info@nokia.com>
| * | | | Merged qplatformdefs.h for AIXJoão Abecasis2010-01-221-0/+110
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I don't think the differences warranted having to maintain 3 slightly differing copies. "Old" locations changed to a forwarding header to the merged one. Differences and how they were resolved in the merged file: - comment on a workaround for a potential issue when using g++ => comment kept - #ifdef's for xlc-64 had been simplified, because it is only supported on AIX 4.3 and above => versioned #ifdefs should still work on 64-bit platforms, so that was preferred; comment left for future reference - use of different condition in #if clause: (_XOPEN_SOURCE-0 >= 500) => verbosity preferred, since it is probably a workaround for a preprocessor or #define bug. Reviewed-by: Thiago Macieira
| * | | | Refactor common POSIX support out of individual qplatformdefs.hJoão Abecasis2010-01-222-46/+68
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | POSIX header incorporates previously refactored X/Open LFS extensions. Reviewed-by: Thiago Macieira
| * | | | Refactor common C89 support out of individual qplatformdefs.hJoão Abecasis2010-01-221-0/+56
| | | | | | | | | | | | | | | | | | | | Reviewed-by: Thiago Macieira
| * | | | Refactor common X/Open LFS support out of individual qplatformdefs.hJoão Abecasis2010-01-222-41/+100
| |/ / / | | | | | | | | | | | | Reviewed-by: Thiago Macieira
* | | | Fix for symbian dialog background transparency.Jani Hautakangas2010-01-221-1/+1
|/ / / | | | | | | | | | | | | | | | | | | If Avkon components support transparency then dialog background is transparent enabling rounded corners. Reviewed-by: Sami Merila
* | | Update copyright year to 2010Jason McDonald2010-01-062-2/+2
|/ / | | | | | | Reviewed-by: Trust Me
* | qreal-izationAleksandar Sasha Babic2009-12-021-1/+1
| | | | | | | | | | | | | | Defining QT_USE_MATH_H_FLOATS will enable single precision math functions that are called via Qt wrappers (qSin, qCos ...). Reviewed-by: axis
* | Merge branch '4.6-s60' into 4.6axis2009-11-061-10/+11
|\ \
| * | Initial LFLAGS support for qmake on Symbian OSIain2009-11-051-10/+11
| | | | | | | | | | | | Reviewed-by: Shane Kearns
* | | Merge commit 'origin/4.6' into large-file-supportJoão Abecasis2009-11-052-0/+14
|\ \ \ | |/ /
| * | Fixed compilation and linking of EGL on Windows CE.Trond Kjernåsen2009-11-041-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | Moved duplicated and broken code for setting up the include and library paths into the egl.prf feature file, which egl.pri and opengl.pro now includes using the qmake feature system. Task-number: QTBUG-5148 Reviewed-by: Tom Cooksey
| * | Sanitize building Qt with OpenGL ES supportHarald Fernengel2009-11-022-0/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | introduce QMAKE_LIBS_OPENGL_ES1, QMAKE_LIBS_OPENGL_ES1CL and QMAKE_LIBS_OPENGL_ES2 so we do not have to force users to copy/paste around entire mkspecs just to change the OpenGL backend. This should make the "-opengl es2" (and friends) configure option work out of the box with any mkspec on Linux+WinCE. Also removes a WinCE specific hack that is not required anymore. Reviewed-by: Tom Cooksey Reviewed-by: Trond Kjernåsen Approved-by: Lars Knoll
* | | Define QT_OPEN_LARGEFILE on Symbian + WinCEJoão Abecasis2009-10-272-0/+2
| | | | | | | | | | | | Reviewed-by: Thiago Macieira
* | | Introducing QT_MMAPJoão Abecasis2009-10-212-0/+3
|/ / | | | | | | | | | | | | In platforms with Large File Support, we use mmap64, to be able to handle offsets (and therefore files) larger than 2Gb. Reviewed-by: Thiago Macieira
* | Workaround for the problem with abld ignoring OPTION_REPLACEIain2009-10-051-1/+7
|/ | | | | | | | | abld in the S60 SDKs has a bug where OPTION_REPLACE cannot be used to remove options from the command line (ie. replace them with nothing), so this workaround introduces a macro definition (that should never be used) as a harmless replacement option. Reviewed-by: Aleksandar Sasha Babic
* Give the soft key functionality it's own macro.Jason Barron2009-09-211-1/+1
| | | | | | | | | Re-using QT_KEYPAD_NAVIGATION for soft keys is wrong since the two are independant concepts. This puts everything in a new macro called QT_SOFTKEYS_ENABLED. This will also insulate the embedded customers who use keypad navigation from the soft key changes. Reviewed-by: Alessandro Portale
* Adding support for symbian graphics resources.Aleksandar Sasha Babic2009-09-181-1/+1
| | | | | | | | | | | | | | This enables us to convert from and to new Symbian type of graphics resource, namely SgImage. This only supported with the OpenVG graphics system. On other graphics systems this will return null QPixmap. Conflicts: src/corelib/global/qglobal.h src/gui/image/qpixmap.h src/gui/image/qpixmap_s60.cpp Reviewed-by: Jason Barron
* Workaround for problems interworking RVCT-built s60main with GCCE appsIain2009-09-181-1/+2
| | | | | | | | | | | | | | | This is a workaround for the fact that removing --export_all_vtbl from the RVCT command line seems to cause problems when linking the static s60main lib with apps built with GCCE (at least 4.3, haven't tested earlier versions) The root cause still needs to be found and fixed, after which this workaround can hopefully be removed. Problem observed on Symbian^3 release, RVCT 2.2 build 686, GCC-E 2009q1-162 release from CodeSourcery. Reviewed-by: axis
* Make static builds work fot Qt/Cocoa.Morten Sorvig2009-09-101-0/+2
| | | | | Add -all_load to make Objective-C categories work. Enable hide_symbols to remove visibility issues.
generated by cgit v0.12 at 2025-01-14 20:13:01 (GMT)