summaryrefslogtreecommitdiffstats
path: root/mkspecs
Commit message (Collapse)AuthorAgeFilesLines
* 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-059-13/+84
|\|
| * Fixed hardcoded GL library names on WinCE.Trond Kjernåsen2009-11-041-2/+10
| | | | | | | | | | Task-number: QTBUG-5148 Reviewed-by: Tom Cooksey
| * Fixed compilation and linking of EGL on Windows CE.Trond Kjernåsen2009-11-042-3/+30
| | | | | | | | | | | | | | | | | | 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
| * Declarative building infrastructure.Warwick Allison2009-11-041-1/+2
| | | | | | | | Does nothing if no declarative directories installed.
| * Sanitize building Qt with OpenGL ES supportHarald Fernengel2009-11-023-4/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6axis2009-10-292-3/+3
| |\
| | * Make Qt on QNX compile againHarald Fernengel2009-10-282-3/+3
| | | | | | | | | | | | Fix a typo, update the tmp path to match current qws behavior.
| * | Build fix for QtXmlPatterns' examples on SymbianFrans Englich2009-10-271-0/+4
| |/ | | | | | | | | | | This is the same workaround as Janne did for QtWebkit. Reviewed-by: Janne Koskinen
* | Turns out 64-bit fseek/ftell are not available on VS 2003/2002...João Abecasis2009-10-291-2/+4
| | | | | | | | | | | | | | | | | | Not when linking dynamically to the CRT (/MT). So we can't rely on them. The declarations for those are also not on the standard headers. Reverts "(MSVC 2002/2003) Use 64-bit versions of ftell and fseek", fixes return type of QT_FTELL and skips known failures on large-file test case.
* | (MSVC 2002/2003) Use 64-bit versions of ftell and fseekJoão Abecasis2009-10-271-2/+2
| | | | | | | | | | | | MSDN documents these as being available since Windows 95. Reviewed-by: Marius Storm-Olsen
* | Define QT_OPEN_LARGEFILE on Symbian + WinCEJoão Abecasis2009-10-272-0/+2
| | | | | | | | Reviewed-by: Thiago Macieira
* | Introducing QT_MMAPJoão Abecasis2009-10-2151-0/+81
|/ | | | | | | 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
* Fixed .make.cache write collision on symbian-sbsv2 buildsMiikka Heikkinen2009-10-211-0/+9
| | | | | | | | | | If a project was built for more than one target with single sbs command, .make.cache generation could sometime fail because multiple jobs attempted to write into it simultaneously. Now only one of the specified targets will be used to generate .make.cache, making collisions impossible. Reviewed-by: Janne Anttila
* Fixed the build for people who only have emulator binaries installedaxis2009-10-191-1/+1
| | | | RevBy: mread
* Fixed uitools.prf to include QtUiTools.lib statically in SymbianMiikka Heikkinen2009-10-161-1/+3
| | | | | | | | | Using just -lQtUiTools instead of -lQtUiTools.lib will make qmake attempt to autodetect whether or not the lib is static or dynamic, which will not work since QtUiTools is not necessarily yet built. Task-number: QT-1018 Reviewed-by: Janne Koskinen
* Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6Janne Koskinen2009-10-141-0/+5
|\
| * Bump heap and stack size for Phonon plugins.Frans Englich2009-10-141-0/+5
| | | | | | | | | | | | This is required by the Helix plugin. As discussed with Dallas team/Fu Liz. Reviewed-by: Shane Kearns
* | QtWebkit demos&examples compilation fix for SymbianJanne Koskinen2009-10-141-3/+9
|/ | | | | | | | Fix for applications not compiling containing #include<QtWebkit> due to relative inclusion problem in Symbian build environment. Task-number: QTBUG-4846 Reviewed-by: Iain
* Add further documentation to scratchbox 2 mkspecDonald Carr2009-10-131-3/+5
| | | | | | | | Documented that pkg-config functionality must be forced if used in conjunction with this mkspec, and that PKG_CONFIG_PATH is a shell variable not a qmake variable. Reviewed-by: Anders Bakken <anders.bakken@nokia.com>
* Add unsupported mkspec for scratchbox 2 targetsDonald Carr2009-10-132-0/+74
| | | | | | | | | | Scratchbox 2 abstracts away toolchain considerations when cross compiling, allowing us to introduce a generic scratchbox 2 mkspec. See blog for more details: http://labs.trolltech.com/blogs/2009/09/10/cross-compiling-qtx11 Reviewed-by: Anders Bakken <anders.bakken@nokia.com>
* Avoid adding a debug library to the glue projects, when debug_and_releaseMarius Storm-Olsen2009-10-071-1/+1
| | | | | | | | | | | | | The VCPROJ/SLN generator generates dependencies on the glue project, so the glue must use the correct library for the dependencies to be correct. The qtAddLibrary() would add the project 'default' to the glue, which could end up adding a debug lib to the glue, so the dependency checker wouldn't find the proper project. We therefore force qtAddLibrary to only add d/_debug if we're not using debug_and_release, or not in the glue part Reviewed-by: Rohan McGovern
* 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
* Changed Qt package name in pkg and generated sis files for Symbian.Janne Anttila2009-10-051-4/+4
| | | | | | | | | It was decided on weekly telco that Symbian pkg and sis files can use plain Qt name, since it is already clear that user is installing "Qt for Symbian" version of Qt. Task-number: QT-772 Reviewed-by: Miikka Heikkinen
* renaming ppc mkspec to powerpcJørgen Lind2009-10-022-0/+0
| | | | Reviewed-by:paul
* Give the qws ppc mkspec usable default valuesJørgen Lind2009-10-021-0/+11
| | | | | | and keep ./configure -embedded still work on ppc platforms Reviewed-by:tom
* Merge branch '4.6' of git@scm.dev.troll.no:qt/qt into 4.6Miikka Heikkinen2009-09-30143-1650/+848
|\
| * Merge commit 'qt/4.6' into mmfphononFrans Englich2009-09-291-0/+4
| |\
| | * Webcore build break on Symbian fixJanne Koskinen2009-09-281-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | Prepending adds epoc32\include too early into generated systeminclude path search order causing Webcore build to break due to wrong animation.h header getting included. Reviewed-by: Jason Barron
| | * Fix compilation of files that #include <QtGui> on newer Symbian SDKs.Jason Barron2009-09-251-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The new public classes in the 's60framework' sub-directory of QtGui introduce a header file dependency to the middleware layer of the SDK by including 'aknapp.h'. Since the build system doesn't know if you have included QtGui or not, the closest approximation is to append the middleware layer include path in cases where the QT variable contains 'gui' Reviewed-by: axis
| * | Fixed build errors due to header filename clashes between epoc32/include and ↵Gareth Stockwell2009-09-281-0/+15
| |/ | | | | | | | | | | | | | | Phonon. Both epoc32/include and $QTDIR/include/Phonon contain a file called videoplayer.h. Both of these directories are listed as SYSTEMINCLUDE paths in the generated MMP file, with the Phonon path coming first. This means that '#include <videoplayer.h>' picks up the Phonon header rather than (as intended) the Symbian one. A new qmake variable, PREPEND_INCLUDEPATH, is defined, allowing the .pro file to specify that /epoc32/include should be the first SYSTEMINCLUDE.
| * Mac: remove visibility warnings when building in macRichard Moe Gustavsen2009-09-241-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | Some changes was done on Mac to support Qt building statically on Cocoa. Unfortunatly, the change lead to many visibility warnings because, with the change, src/tools/bootstrap was made with symbols hidden by default (-fvisibility=hidden). Then, when building the tools (moc, rcc etc), visibility was public by default (for internal classes used by Qt). This caused warnings. The change is now temporarily reverted until Morten get a second chance to look at it. Rev-By: prasanth
| * Try to support Qt 4.4-style Phonon includes in Qt.Thiago Macieira2009-09-231-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This introduces an undocumented "phonon_compat" subdir and also adds it to the INCLUDEPATH when QT += phonon is specified. With this, these styles of #includes should be supported: #include <Phonon> #include <Phonon/Phonon> #include <phonon> #include <phonon/phonon> #include <Phonon/MediaObject> #include <phonon/mediaobject.h> Still need to check if the headers get installed during "make install". I couldn't find where in our code that is done. BT: yes Reviewed-By: Trust Me
| * Fix "make sis" target for -xplatform symbian-sbsv2Shane Kearns2009-09-221-2/+3
| | | | | | | | | | | | | | | | CFG_PATH evaluates as "udeb", not "UDEB" when building the debug-armv5 target. So changed the FLM to check for that. Also changed the variable redefinition to ifeq/else/endif. Reviewed-by: Iain
| * Docs: Fix spelling and reword docs about S60 specifics.Daniel Molkentin2009-09-221-2/+3
| | | | | | | | Reviewed-By: TrustMe
| * Set maximum heap to 32MB for Symbian autotests.Miikka Heikkinen2009-09-221-1/+1
| | | | | | | | | | | | | | Several script and webkit tests require increased maximum heap in emulator, so just increase the maximum heap for all autotests. Reviewed-by: Janne Koskinen
| * 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
| * Remove remaining support for win32-mwc mkspecIain2009-09-182-274/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Qt 4.6 cannot be used with the win32-mwc makespec, as the Metrowerks compiler supplied with Symbian/S60 releases does not contain enough support to build the Qt host tools in a Unicode version, and ANSI support has been removed in 4.6. Alternative mkspecs are win32-g++, requiring mingw tools to be installed, or one of the win32-msvc.... mkspecs, requiring MS Visual Studio (Express edition is fine) The mwc makefile for qmake was already removed, so this just removes the remaining support. Reviewed-by: Jason Barron
| * Workaround for problems interworking RVCT-built s60main with GCCE appsIain2009-09-182-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * Remove unnecessary lines from MMP files when using libstdcppv5.dllIain2009-09-161-12/+1
| | | | | | | | | | | | | | SBSv1 has also been updated to define the appropriate macros and add the required library statements, so all that is needed is the STDCPP keyword Reviewed-by: mread
| * Make static builds work fot Qt/Cocoa.Morten Sorvig2009-09-102-0/+8
| | | | | | | | | | Add -all_load to make Objective-C categories work. Enable hide_symbols to remove visibility issues.
| * Add a mkspec for selecting gcc-4.0 on Mac OS X.Morten Sorvig2009-09-104-0/+190
| | | | | | | | This has one known use case: compiling with the 10.4u SDKi on 10.6.
| * Update license headers again.Jason McDonald2009-09-09119-476/+476
| | | | | | | | Reviewed-by: Trust Me
| * mkspec wince60standard-x86-msvc2005 addedJoerg Bornemann2009-09-083-73/+76
| | | | | | | | | | | | | | This is a mkspec template for creating x86 Windows CE 6 mkspecs. Task-number: 259850 Reviewed-by: mauricek
| * use a single qplatformdefs.h for all Windows CE mkspecsJoerg Bornemann2009-09-0830-908/+160
| | | | | | | | | | | | | | | | | | 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
* | Fixed symbian-sbsv2 build break in apps using debug_and_release.Miikka Heikkinen2009-09-041-1/+1
|/ | | | | | | Skipped addExclusiveBuilds function in debug_and_release.prf for all Symbian platforms, as it doesn't work with Symbian toolchain. Reviewed-by: Janne Anttila
* Merge branch 'minimizeWrapperApp' into 4.6axis2009-09-032-3/+3
|\
| * Move the S60/Avkon framework initialization into QtGui.axis2009-09-032-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-07 19:54:50 +0000