summaryrefslogtreecommitdiff
path: root/mkspecs
Commit message (Collapse)AuthorAgeFilesLines
* Fix `make check' for debug-and-release on Windows.Rohan McGovern2011-01-171-2/+16
| | | | (cherry picked from commit 012a777ecec0ca74cf95683f069cb79774b7093a)
* Move `check' target for autotests into testcase.prfRohan McGovern2011-01-172-35/+52
| | | | | | testcase.prf is installed, thus allowing `make check' to work outside of the Qt source tree. (cherry picked from commit d29e1dda8fbc24087b9cf0bf08d929bef74f5c96)
* Revert "Backporting TESTARGS feature from 4.7"João Abecasis2011-01-171-1/+0
| | | | This reverts commit 0336bc0cc8b4c0b0e75315594c1db83ee9b30f2e.
* Backporting TESTARGS feature from 4.7João Abecasis2011-01-121-0/+1
| | | | | | | | Originally introduced in d29e1dda8fbc24087b9cf0bf08d929bef74f5c96. This patch should be reverted when it reaches the 4.7 branch again. Reviewed-by: Sergio Ahumada
* Update copyright year to 2011.Jason McDonald2011-01-11130-130/+130
| | | | Reviewed-by: Trust Me
* Remove workarounds for -rpath-link optionsAdrian Constantin2010-06-011-3/+0
| | | | Reviewed-by: Stefano Pironato
* Fix WebKit version dependency in pkg filesSimon Hausmann2010-05-201-1/+8
| | | | | | | | | | | Default to the Qt major/minor/patch version for WebKit, but use them only if it wasn't specified in mkspecs/modules/qt_webkit.pri, which is read by qt.prf Task-number: QTBUG-10847 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> Reviewed-by: Janne Koskinen <janne.p.koskinen@digia.com>
* Add support for including module specific .pri files as part of qt.prf handlingSimon Hausmann2010-05-201-0/+3
| | | | | | | Task-number: QTBUG-10847 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> Reviewed-by: Janne Koskinen <janne.p.koskinen@digia.com>
* fix qmake -project once moreOswald Buddenhagen2010-05-183-0/+3
| | | | | | | | default_pre.prf adds "uic" and "resources" to CONFIG, but not "qt". as a consequence, the former do not find qtPrepareTool(), as nobody includes qt_functions.prf if no qmake spec is loaded. Reviewed-by: joerg
* fix regexpOswald Buddenhagen2010-05-141-1/+1
|
* fix QMAKE_QMAKE path separator under mingw+sh in the qmake specOswald Buddenhagen2010-05-141-0/+1
| | | | | | | | this would have been a problem if someone accessed QMAKE_QMAKE from within a pro file, as that would fix the separators to the native host platform separator (as QMAKE_DIR_SEP is not processed at that point). Reviewed-by: joerg
* define qtPrepareTool() function and use it throughoutOswald Buddenhagen2010-05-148-30/+20
| | | | | | | | | | | | | | | the function provides a cross-platform way to determine the exact pathname of our build tools (moc, etc.). use it in our .prf files, so we don't have to rely on qmake's unreliable path separator normalization magic in extra compiler commands, which broke on mingw+sh in silent mode. remove the bootstrap tool path setting from configure, as it is redundant now. Reviewed-by: joerg Task-number: QTBUG-10633
* Implement some changes to the AIX xlC mkspec suggested by IBM.Thiago Macieira2010-04-133-4/+10
| | | | | | | | | | | | | | Set -bmaxdata to 0x8000000 for normal 32-bit Qt programs, to allow them to access more memory. Increase that limit to the maximum allowed when linking to QtWebKit (even though we don't support WebKit with xlC, there are patches to do that). For 64-bit, simply add the "big TOC" flag, which enables accessing more symbols that cannot be reached by a 16-bit addressing. Only QtWebKit strictly needs it, but IBM suggests as a good flag for everyone. Reviewed-by: Thomas Zander
* 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-242-4/+14
| | | | | | | | | | | | | | | | | | | 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
* Useful support for -qtlibinfix configure parameter in SymbianMiikka Heikkinen2010-03-183-3/+3
| | | | | | | | | | | | | | | | | | | | | Configure parameter -qtlibinfix will now change also plugin names of plugins built and installed with Qt in Symbian. Default plugin path is changed to: /resource/qt<libinfix>/plugins. Other plugins besides the ones installed with Qt are not renamed. With infixed configuration, Qt can be installed on a phone that already has a Qt installed on ROM without interfering with the ROM version of Qt. Note that since s60main.rsc resource cannot deployed with infixed Qt, and infixing it is somewhat problematic, currently the phone needs to have proper Qt installation, too, for infixed Qt to work. It also means that any changes to Qt that would affect s60main.rsc cannot be tested on real device using infixed builds. Since this file is unlikely to need changing, this should not be a big problem. Task-number: QTBUG-9065 Reviewed-by: Jani Hautakangas
* Make sure target path exists in qmake_extra_pre_targetdep.flmMiikka Heikkinen2010-03-161-0/+2
| | | | | | | | | | Since newer versions of Raptor delete all empty parent directories when cleaning up the files, qmake created moc output directories get also deleted when sbs clean is invoked. Fixed by always creating the extra compiler target directory during build. Task-number: QTBUG-6795 Reviewed-by: Janne Koskinen
* Fixed RSS_RULES statement in application_icon.prfMiikka Heikkinen2010-03-111-1/+1
| | | | | | | RSS_RULES were being overwritten instead of being appended to in applicaton_icon.prf. Reviewed-by: Janne Anttila
* 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 forwarding headers for qplatformdefs.h in Symbian mkspecsMiikka Heikkinen2010-03-102-0/+86
| | | | | | | | | Missing qplatformdefs.h file caused configure to fail on Linux environments. Part of QtP delta reduction effort. Reviewed-by: axis
* Added some missing IBY export paths to platform_path.prfMiikka Heikkinen2010-03-101-54/+42
| | | | | | | | Also removed some IBY export paths that target layers below middleware, as those are not likely to be ever needed by Qt projects, since Qt itself is part of the middleware layer. Reviewed-by: Janne Anttila
* Make `make check' build the checked project.Rohan McGovern2010-03-042-1/+5
| | | | | | | | | | | The `check' rule ought to depend on the project being built, so one can simply do `make check' instead of `make && make check'. Note that there was already an attempt to do this for the autotests, but it did not work on non-Windows platforms, because $(DESTDIR_TARGET) is only used in the Windows makefile generators. Reviewed-By: Lincoln Ramsay
* Allow platform specific values for the double click radius.Raino Priha2010-03-021-0/+2
| | | | | Task-number: QT-2883 Reviewed-by: Volker Hilsheimer
* Added addMMPRules for adding conditional MMP_RULESMiikka Heikkinen2010-02-262-0/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 ↵Qt Continuous Integration System2010-02-255-13/+4
|\ | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public: Removed an export that shouldn't be exported. Reduced the code and memory footprint of the keymap. Enabled Qt key events to work also when native key code is missing. Crash in QGraphicsScenePrivate::setFocusItemHelper Improvements to itemview keypad navigation in S60. Fix SymbianMakefileGenerator::absolutizePath for clean builds Misc fixes to FLM files
| * Misc fixes to FLM filesMiikka Heikkinen2010-02-255-13/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 1) FLMs should not have more than one phase dependency -> removed extra dependencies, leaving only what is actually necessary. 2) -include $(FLMHOME)/metaflm.mk statements vere removed as obsolete 3) Added FORCESUCCESS to startrule call in qmake_extra_pre_targetdep.flm so that unrelated components can continue building instead of halting the whole build at EXPORT phase. 4) Added .export to qmake_extra_pre_targetdep interface so that it is actually executed in EXPORT phase where it should be. Task-number: QTBUG-8513 Reviewed-by: Janne Koskinen
* | Define a GNU-style `check' target for all projects.Rohan McGovern2010-02-251-0/+11
|/ | | | Reviewed-by: Marius Storm-Olsen
* 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
* Fixes: make check not checking that target is up to dateBill King2010-02-221-2/+22
| | | | | | | Builds the target executable if needed before running the test LR on BKing's machine. Reviewed-by: Lincoln Ramsay
* Fixed libstdcpp.dll version autodetection for SymbianMiikka Heikkinen2010-02-191-6/+13
| | | | | | | | | Libstdcpp.dll version autodetection was broken for clean builds, so made it default for new version when neither new or old can be detected. Task-number: QT-1171 Reviewed-by: Janne Anttila
* 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
* Removed dependency to moc.exe from Symbian buildsMiikka Heikkinen2010-02-101-1/+1
| | | | | | | | Having dependency to moc.exe makes no sense since we cannot build it anyway when building with Symbian toolchain. Task-number: QTBUG-7836 Reviewed-by: Janne Koskinen
* Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-02-081-15/+11
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Remove the installer from the Qt sources. Fixes qabstractslider autotest Add a recursive rule for running the auto-tests. Do not run the tests automatically during install. Fixes scrolling horizontally with a mouse wheel over sliders. Doc: Clarified ownership of custom buttons added to a QDialogButtonBox. Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( da5d96a26e80162027bc95ce7e5725fe4b277ff7 ) A fix for accidently reused variable names in nested iterations. Iain's changes for 4.6.2 Doc: Fixed typo.
| * Do not run the tests automatically during install.Janne Hämäläinen2010-02-081-15/+11
| | | | | | | | | | | | | | | | | | A separate "check" rule added for running the tests. Use "make check" to run the tests. Task-number: QTPROD-442 Reviewed-by: Harald Fernengel Reviewed-by: Rohan McGovern
* | 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
* Further bug fixes for enable/disables DEF files mechanism on SymbianIain2010-02-042-23/+37
| | | | | | | | | | | | | | | | | | | | Fix bug where all target types, including apps, plugins and static libraries were getting DEFFILE statements - now it's just libraries that get it. Fix bug where duplicate DEFFILE blocks were being added to projects that manually specified their own DEFFILE - this now tests for the qmake variable "defBlock" being set, and doesn't add additional DEFFILE statements if it is. NOTE: This means that adding DEFFILE statements to MMP_RULES manually should be done by creating a variable called defBlock, and adding that to the MMP_RULES (ie. MMP_RULES += defBlock) Fix bug in configure.exe, where using -nokia-developer for Windows builds would warn about Symbian DEF file usage (or lack thereof) Reviewed-by: Janne Koskinen Reviewed-by: Jason Barron
* 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
* Improve DEF file enable/disable mechanism on SymbianIain2010-01-222-0/+33
| | | | | | | | | | | | | | | | | | Provide configure flag to enable/disable the use of DEF files on Symbian. A useful side-effect was that it cleaned up how we control DEF files from qbase.pri and in WebKit. -nokia-developer still disables DEF files, as it triggers the autotest exports, which are not frozen into the DEF files. Disabling DEF files means that there is no BC with previously released versions of Qt, so this should only be used for development purposes. .pro files can specify custom locations for DEF files by setting defFilePath. Task-number: QTBUG-6556 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
* Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-01-181-1/+1
|\ | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public: Workaround for compiler error with MWCC (Symbian emulator) Describe patch-capabilities in the install instructions. Remove qmake warning by using appropriate variable. Symbian RnD SDK version pf_5250, wk48 and later (e.g., for ivalo target) has changed /epoc32/include layout, including a subdirectory called "platform".
| * Symbian RnD SDK version pf_5250, wk48 and later (e.g., for ivalo target) has ↵Norbert Leser2010-01-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | changed /epoc32/include layout, including a subdirectory called "platform". Since that particular directory is used as test for detecting SDKs with "New SF structure", the test returns with false result in case of pf_5250 (which has old SF structure). Change was made to test for a more obscure directory "mw" that appears the be present in new structure only. Merge-request: 2281 Signed-off-by: axis <qt-info@nokia.com>
* | Adding texture glyph cache default.Adrian Constantin2010-01-151-0/+2
|/ | | | | | | | In maemo mkspec added the definition QT_DEFAULT_TEXTURE_GLYPH_CACHE_WIDTH=1024. When sgx fix will be delivered remove from maemo mkspec that definition. Reviewed-by: Stefano Pironato Reviewed-by: Tom Cooksey
* Attempt at readding the capital P headers for PhononThiago Macieira2010-01-061-0/+1
|
* Remove special Phonon processing from syncqt.Thiago Macieira2010-01-061-3/+0
| | | | | | | | | | | Restore original Qt 4.4 behaviour. The capital P headers are not correct because of frameworks on Mac. More info, see thread: http://lists.kde.org/?l=kde-multimedia&m=126045273702498&w=2 Task-number: QTBUG-4685 Reviewed-by: Trust Me
* Update copyright year to 2010Jason McDonald2010-01-07128-128/+128
| | | | Reviewed-by: Trust Me
View Lorry Controller Status