summaryrefslogtreecommitdiff
path: root/mkspecs/common
Commit message (Collapse)AuthorAgeFilesLines
* Update copyright year to 2011.Jason McDonald2011-01-112-2/+2
| | | | Reviewed-by: Trust Me
* Improved support for OPTION and LINKEROPTION statements in MMP filesMiikka Heikkinen2010-04-121-1/+1
| | | | | | | | | | | | | | | VERSION_FLAGS.<keyword> can now be used for all compilers and not just armcc, and version flagging can now be used with QMAKE_LFLAGS as well as QMAKE_CXXFLAGS. Also, MMP_OPTION_KEYWORDS variable is used to define supported keywords for OPTION and LINKEROPTION statements, which are defined via QMAKE_CXXFLAGS.<keyword> and QMAKE_LFLAGS.<keyword> variables. This improves flexibility in the future if new keywords need to be supported. Task-number: QTBUG-8685 Reviewed-by: Janne Koskinen
* Enable armcc version specific compler options for SymbianMiikka Heikkinen2010-03-261-1/+4
| | | | | | | | | | | | | | | VERSION_FLAGS.ARMCC variable is used in symbian.conf to define supported armcc compiler version flags. Values given to this variable must be directly usable as ifdef flags in mmp. QMAKE_CXXFLAGS.<version flag> variables can now be used to add compiler options to specific compiler versions. Note that options added via QMAKE_CXXFLAGS.ARMCC flag will apply to all versions of armcc compiler. Task-number: QTBUG-8685 Reviewed-by: Iain
* Made it possible to define more than one language using pkg_prerulesMiikka Heikkinen2010-03-241-1/+7
| | | | | | | | | | | | | | | | | | | The pkg statements were generated in invalid order if user used pkg_prerules to redefine languages supported by the pkg file. Also made it possible to override dependency statements autogenerated for Qt and QtWebkit, as these statements need to be user defined in case of multiple languages. Defining the following in .pro removes all dependencies from pkg rules: default_deployment.pkg_prerules -= \ pkg_depends_webkit \ pkg_depends_qt \ pkg_platform_dependencies Task-number: QTBUG-9279 Reviewed-by: Janne Anttila
* Change fromSymbianRSgImage() to use the newer version of RSgImageJason Barron2010-03-191-1/+5
| | | | | | | | | Symbian have changed the implementation of RSgImage to be more lightweight and have moved it to a new library. This patch changes Qt's usage of RSgImage to the new version and fixes some minor code style issues. Reviewed-by: Aleksandar Sasha Babic
* Add '.' dir as the first include directory in SymbianMiikka Heikkinen2010-03-101-2/+5
| | | | | | | | | | RVCT seems to use '.' directory implictly as the first include path, but WINSCW compiler doesn't do this, so add it explicitly to make sure both builds have similar include order. Part of QtP delta reduction effort. Reviewed-by: Janne Anttila
* 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
* 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
* 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
* 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
* 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
* 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-072-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.
* Update license headers again.Jason McDonald2009-09-092-8/+8
| | | | Reviewed-by: Trust Me
* use a single qplatformdefs.h for all Windows CE mkspecsJoerg Bornemann2009-09-082-0/+131
| | | | | | | | | Additionally, mkspecs/wince.conf was moved to mkspecs/common/wince/qmake.conf The common qplatformdefs.h is also in that directory. Task-number: 259850 Reviewed-by: mauricek
* Merge branch 'minimizeWrapperApp' into 4.6axis2009-09-031-2/+2
|\
| * Move the S60/Avkon framework initialization into QtGui.axis2009-09-031-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This way we avoid having a lot of code in a static (and unmaintainable) library. The s60main static library now currently has only one task: to call main(). To move the initialization into QtGui also meant a change in how the S60 framework is created, because we can no longer use the trick where we create and start the the S60 event loop and then have the framework call us back to start main(). The initialization now follows the creation and destruction of QApplication, which is a lot more in line with how other platforms do it. Since S60 doesn't support creating the environment, and *then* starting it (both are executed by the same call), we had to open up the S60 framework construction classes and just mirror what they do. This means that after QApplication construction is done, the S60 framework is initialized, but nothing will run yet and control will return to main(), where the user can start the event loop himself. One of the quirks of this approach is that the construction of the S60 framework makes a new cleanup stack. This means that any active traps will not be active anymore, and leaving without setting a new trap will most likely panic. This shouldn't be a problem for us, since Qt is never supposed to leave, but it means that if anyone uses the cleanup stack without setting a new trap, they will receive a panic. It was considered to add a trap mark in QApplication construction and then removing it on destruction, but it was dropped because leaving from main() is still undefined (even if the old cleanup stack would be restored in the destructor, we wouldn't be able to stop the exception from unwinding the stack, and the cleanup stack would then be unbalanced). RevBy: Jason Barron RevBy: Janne Anttila AutoTest: QWidget passed with same failure count
* | Removed stale fixed_stdlib.h file.Janne Anttila2009-09-021-64/+0
| | | | | | | | Reviewed-by: TrustMe
* | Update tech preview license header for files that are new in 4.6.Jason McDonald2009-08-312-26/+26
|/ | | | Reviewed-by: Trust Me
* Merge commit 'origin/master' into symbolVisibilityIain2009-08-203-7/+7
|\
| * Changed a define to comply to Qt naming conventions.Miikka Heikkinen2009-08-201-4/+4
| | | | | | | | | | | | Prepended QT_ to a define we use internally in fixed_stdlib.h Reviewed-by: Janne Anttila
| * Comment clarifications based on mkspecs review.Miikka Heikkinen2009-08-201-1/+1
| | | | | | | | Reviewed-by: TrustMe
| * Changed names and URLs to reflect name change.axis2009-08-192-2/+2
| | | | | | | | RevBy: Trust me
* | Ensure the correct set of symbols are exported in the DEF files (part 1)Iain2009-08-191-1/+2
|/ | | | | | | | For DLLs using Qt-style class level exports, ensure that only public symbols are exported For static libraries (static, staticlib configs) we don't want/need/ can't have a DEF file
* Merge commit 'qt/master-stable'Jason Barron2009-08-101-3/+2
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/corelib/kernel/qobject.cpp src/corelib/tools/qsharedpointer_impl.h src/gui/widgets/qdatetimeedit.cpp src/gui/widgets/qlinecontrol.cpp src/gui/widgets/qlineedit.cpp tests/auto/qcssparser/qcssparser.pro tests/auto/qicoimageformat/tst_qicoimageformat.cpp tests/auto/qmultiscreen/qmultiscreen.pro tests/auto/qresourceengine/qresourceengine.pro tests/auto/qresourceengine/tst_qresourceengine.cpp tests/auto/qscriptv8testsuite/tst_qscriptv8testsuite.cpp
| * Replace instances of weak linking for 10.3 with 10.4.Morten Sorvig2009-08-061-3/+2
| |
* | Enable symbol visibility when compiling with RVCT.axis2009-08-061-1/+1
| | | | | | | | | | This takes advantage of new functionality in RVCT 2.2, and requires build 683 beta or later.
* | Update license headers according to commit 858c70f768e.axis2009-08-062-5/+5
| | | | | | | | RevBy: Trust me
* | Replaced $MODULE$ with hardcoded module names.axis2009-08-061-2/+2
| | | | | | | | RevBy: Trust me
* | Fix extern WebKit build that uses qmake generators.Simon Hausmann2009-08-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | WebCore.pro's generators use QMAKE_DEL, which when used with del.exe works if the file is present or not. In the QMAKE_SH branch QMAKE_DEL is mapped to rm, which complaints if the file to delete doesn't exist. Similar to del.exe and unix.conf use rm -f instead of rm for QMAKE_DEL in the QMAKE_SH branch. Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* | Squashed commit of the topic/exceptions branch.Harald Fernengel2009-08-031-3/+3
| | | | | | | | | | Contains some smaller fixes and renaming of macros. Looks big, but isn't scary at all ;)
* | Added some spaces to pkg_prerules statements to make output more readable.Janne Anttila2009-07-301-1/+2
| |
* | Extended PKG customization possibilities via qmake.Janne Anttila2009-07-291-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task: 242139 This commit replaces Symbian specific 'depends' keyword in qmake DEPLOYMENT variable with two more generic ones. The new keywords are 'pkg_prerules' and 'pkg_postrules', and they allow developer to pass raw data to PKG file. The strings in 'pkg_prerules' are added before PKG file package-body headers and 'pkg_postrules' after them. Correspondingly as old 'depends' keyword, the new keywords are not parsed by qmake, so they must be in a format understood by Symbian package generation tools. Note that 'pkg_prerules' can also replace default language, package-header and vendor statements in pkg file. If you decide to override any of these statements, you need to pay attention that also other statements stay valid.
* | Make S60 integration optional.Jason Barron2009-07-151-4/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This is more a cleanup of the usage of Q_WS_S60 vs. Q_OS_SYMBIAN than anything else. One of the side effects of this work was that it was relatively little work to get QtGui compiling when Q_WS_S60 is not defined. Based on this we introduce two new configure options that control S60 integration. Currently the -no-s60 option will not work entirely because the 's60main' module has not yet been refactored and still has a dependancy on the S60 libraries. Reviewed-by: axis <qt-info@nokia.com>
View Lorry Controller Status