summaryrefslogtreecommitdiffstats
path: root/mkspecs
Commit message (Collapse)AuthorAgeFilesLines
* Call createpackage without the explicit .bat suffixMartin Storsjo2010-09-281-4/+4
| | | | | | | | | | On windows, the .bat file is implicitly called, on unix the "createpackage" shell script wrapper is called instead. The symbian-sbsv2 mkspec already calls createpackage without any suffix. Merge-request: 823 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Improve Qt/Symbian compatibility with unix shellsMartin Storsjo2010-09-281-1/+0
| | | | | | | | | Remove an "echo." call that doesn't work on unix, and make the create_temps target work with unix shell syntax (QMAKE_CHK_DIR_EXISTS requires an || before the command to execute on unix shells). Merge-request: 823 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* fix moc argument quoting on mingwOswald Buddenhagen2010-09-281-5/+5
| | | | | | | | for some bizarre reason, mingw doesn't like double quotes. so instead of building some more elaborate custom quoting, just let qmake do it for us. Reviewed-by: mariusSO
* Improved Symbian4 platform detectionMiikka Heikkinen2010-09-231-26/+36
| | | | | | | | | | Now returns correct value for Symbian4 platforms with QSysInfo::symbianVersion(). SYMBIAN_VERSION .pro file variable should also return correct value even if it doesn't get set in environment.prf. Task-number: QTBUG-13802 Reviewed-by: Shane Kearns Reviewed-by: Janne Anttila
* Qmake: Fix wrong path in the breakpad post link stepMarco Bubke2010-09-221-10/+9
| | | | Reviewed-By: Oswald Buddenhagen
* Update the ICC mkspec: keep the stack aligned to 16-byteThiago Macieira2010-09-221-1/+1
| | | | | | | | | | | | After discussing with Intel, turns out that ICC defaults to aligning the stack when it needs to (e.g., when issuing aligned operations), but doesn't care otherwise. GCC, on the other hand, expects the stack to always be aligned and will issue instructions without checking. We'll probably add __attribute__((force_align_arg_pointer)) to some functions in our code, but we won't be able to catch everything. Reviewed-By: Bradley T. Hughes
* qmake: fix quoting of moc callsJoerg Bornemann2010-09-211-2/+2
| | | | | Task-number: QTBUG-13782 Reviewed-by: ossi
* Add breakpad supportMarco Bubke2010-09-207-0/+105
| | | | | | | | | | Breakpad is a portable crash handler. It sends the raw crash information to a server for analysis. This analysis needs debug information. Consequently, we compile with debug info even in release mode if qt-breakpad integration is requested (via an environment variable). Reviewed-by: ossi
* Load environment.prf from Symbian SDK if it exists thereMiikka Heikkinen2010-09-171-22/+33
| | | | | | | | Environment.prf can contain SDK specific variable settings such as SYMBIAN_VERSION. Task-number: QT-3949 Reviewed-by: Janne Koskinen
* QTBUG-4852 Turning on runtime nested exception support where availablemread2010-09-162-0/+9
| | | | | | | | | | | | | | | | | | | | | Added nested_exceptions.prf to the symbian mkspecs features, and used it from the stl.prf config. nested_exceptions.prf adds the .mmp flag to use the nested exceptions runtime support library for apps. stl.prf will add nested_exceptions to the config when the support library is present. Since this check depends on the existence of the runtime support library when qmake is run, qtp will have to add nested_exceptions to their config when building with nested exception support. This change means that, where nested exceptions are supported on Symbian, apps will no longer crash if a nested exception is encountered at runtime. Task-number: QTBUG-4852 Reviewed-by: Miikka Heikkinen
* Merge branch 'buildSystemFixes' into 4.7-s60axis2010-09-142-16/+16
|\
| * Added support for using -L notation in the LIBS variable.axis2010-09-141-4/+10
| | | | | | | | | | Task: QTBUG-13523 RevBy: Thomas Zander
| * Eliminated duplicated code from library handling.axis2010-09-141-16/+10
| | | | | | | | RevBy: Trust me
| * Moved the sis_targets feature profile to the correct directory.axis2010-09-101-0/+0
| | | | | | | | RevBy: Trust me
* | Added meego graphics system helper to features/qt.prf and syncqt.Samuel Rødal2010-09-101-1/+2
|/ | | | | | MeeGo graphics system helper headers are now synced and the correct include path and libraries are added to an application by doing QT += meegographicssystem helper in the .pro file.
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-09-063-0/+6
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (33 commits) make shadow builds not write into the source dir Fix failing tst_qmdisubwindow test after 71a3b1a0d3 Doc: update the documentation of QUrl about HTML Form encoding search translator comments Install translators earlier in assistant Fix compilation on ARM: don't include kernel headers Fix compilation of qmake with MSVC Doc: Updating known-issues page. Recognize @, #, $ and ` as word separators rebuild configure.exe Fix dependencies so JOM will handle parallellization properly Symbian: Disable IPv6 for now Doc: Fixed namespaced Qt build breakage in the model/view tutorial. Doc: Fixing links on index page and corecting HTML in the template. Accept empty authority segments in QUrl as different from not-present Doc: Adds line about non-support for Webkit on Solaris protect nil dictionary from release. Fix potential KERN-EXEC 0 on Symbian. Ukrainian translation updated Fix remote crash in delivering D-Bus calls with too few arguments ...
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-09-033-0/+6
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (24 commits) rebuild configure.exe Fix dependencies so JOM will handle parallellization properly Symbian: Disable IPv6 for now Doc: Fixed namespaced Qt build breakage in the model/view tutorial. Doc: Fixing links on index page and corecting HTML in the template. Accept empty authority segments in QUrl as different from not-present Doc: Adds line about non-support for Webkit on Solaris protect nil dictionary from release. Fix potential KERN-EXEC 0 on Symbian. Ukrainian translation updated Fix remote crash in delivering D-Bus calls with too few arguments Ensure that OpenGL contexts are attached to an NSView before first paint Doc: Updating the 3rd party lib used in Qt - including JQuery Doc: Changed the default URL to avoid a Flash plugin crash on x86-64. Reduce memory consumption of QtScript/JSC on Symbian Doc: Updated Supported Platforms page. Finished New binary of configure.exe with -mp/-no-mp option Turn Makefile.win32 into batch-mode, enable /MP and PCH Add option to enable -MP compile option for MSVC Rewrite ucstrcmp in terms of ucstrncmp ...
| | * Add option to enable -MP compile option for MSVCMarius Storm-Olsen2010-09-023-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The option is on when building Qt, but off by default for other projects, due to potential incompatible compile options in other projects. (/E, /EP, /Gm, /Yc, /showIncludes, #import preprocessor directive) Reviewed-by: bhughes Reviewed-by: ossi
* | | Fixes for QMAKE_EXTRA_* variable handling in symbian-sbsv2Miikka Heikkinen2010-09-061-0/+12
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | - No longer require PRE_TARGETDEPS items to be absolute, which was difficult to achieve sometimes as qmake doesn't provide method for absolutizing paths. - Do smart command replacement for commands containing $$QMAKE_* command variables, such as $$QMAKE_COPY, when generating bld.inf extensions for QMAKE_EXTRA_* variables. $$QMAKE_* command variables cannot be passed to sbsv2 toolchain directly, as it uses cygwin in windows, and they can't simply be replaced to use sbsv2 equivalents in symbian.conf, because generated wrapper makefiles need them to be Windows compatible. Reviewed-by: axis
* | Fix Symbian handling of projects with special characters in TARGETMiikka Heikkinen2010-09-035-63/+70
|/ | | | | | | | | Plenty of filenames got generated with spaces which didn't work as that was not taken into account. Harmonized TARGET fixing across prf files and qmake Symbian generator code. Task-number: QTBUG-13363 Reviewed-by: Thomas Zander
* QT_PLUGINS_BASE_DIR needs to be defined after load(qt_config)Miikka Heikkinen2010-09-011-1/+2
| | | | | | | QT_LIBINFIX is defined in qconfig.pri, so qt_config needs to be loaded before that is used. Reviewed-by: TrustMe
* make various POST_LINK steps nicerOswald Buddenhagen2010-08-315-23/+14
| | | | | | | put each step into a separate make command. that makes for cleaner output and less troubles with command separators. Reviewed-by: mariusSO
* Fix gcce building of apps using static libraries in symbian-sbsv2Miikka Heikkinen2010-08-313-4/+9
| | | | | | | | | Removed usage of buggy .release_gcce target from symbian-sbsv2 generated makefiles. Now gcce builds like armv5 as it is supposed to when using Raptor. Task-number: QTBUG-13307 Reviewed-by: axis
* let WebKit inject itself into the qt configurationOswald Buddenhagen2010-08-232-4/+3
| | | | | | | | i.e., don't explicitly deal with qt_webkit_version.pri outside of the webkit source directory. Task-number: QTBUG-12379 Reviewed-by: Simon Hausmann
* Introduce QtOpenGL module for Symbian.Jani Hautakangas2010-08-202-1/+27
| | | | | Task-number: QT-2139 Reviewed-by: Gunnar Sletta
* use intel linker and librarian with iccOswald Buddenhagen2010-08-181-2/+2
| | | | | Reviewed-by: thiago Task-number: QTBUG-12937
* Fix "installer_sis" and "deploy" targets when TARGET has pathMiikka Heikkinen2010-08-131-3/+2
| | | | | | | | | Dependencies got generated wrong in Makefile because sis is always created in the .pro file directory but dependency included path that was in TARGET. Task-number: QTBUG-12884 Reviewed-by: Shane Kearns
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-08-122-1/+2
|\ | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Added documentation for Spectrum Analyzer demo Do not include Spectrum Analyzer demo in static builds Gcce building support for symbian-sbsv2
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-08-112-1/+2
| |\ | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Added documentation for Spectrum Analyzer demo Do not include Spectrum Analyzer demo in static builds Gcce building support for symbian-sbsv2
| | * Gcce building support for symbian-sbsv2Miikka Heikkinen2010-08-112-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | It is now possible to use "release-gcce" and "debug-gcce" targets in symbian-sbsv2 mkspec. Exports and cleans should also now work properly for all target platforms under symbian-sbsv2. Task-number: QTBUG-12762 Reviewed-by: Jason Barron
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-08-111-1/+0
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: (27 commits) Disable minRightBearing optimization in QTextLayout on Mac Added one test for QRegExp QMetaObject::normalizeSignature avoid reading past the string in case of invalid signature given. Add text decoration support to QStaticText Fix QString::arg: When specifying %L1, the group separator would be added even if the local specify QLocale::OmitGroupSeparator QtDeclarative: get rid of warnings in public header doc: Clarify documentation of QStaticText Fix scrollbar randomly popping up in QPlainTextEdit Remove the definition of QT_HAVE_NEON from qt.prf Use the fast Neon conversion for converting colors of jpeg images. Do the conversion from RGB888 to RGB32 using Neon Move the build of Neon file from painting.pri to gui.pro QSharedPointer documentation: specify that it is not safe to operate on the same object in different threads compilation with QT_NO_DEPRECATED Test we do not have compiler warnings in our headers with more options QStyleSheet documentation: QMenu's tear-off is styled with ::tearoff Doc: Fixed qdoc warnings. Fix QTextEngine overflow caused by extremely long text Replace the SSE prologues by a macro QDom: Do not crash on "<a:>text</a:>" ...
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-08-101-1/+0
| |\ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: (24 commits) Add text decoration support to QStaticText Fix QString::arg: When specifying %L1, the group separator would be added even if the local specify QLocale::OmitGroupSeparator QtDeclarative: get rid of warnings in public header doc: Clarify documentation of QStaticText Fix scrollbar randomly popping up in QPlainTextEdit Remove the definition of QT_HAVE_NEON from qt.prf Use the fast Neon conversion for converting colors of jpeg images. Do the conversion from RGB888 to RGB32 using Neon Move the build of Neon file from painting.pri to gui.pro QSharedPointer documentation: specify that it is not safe to operate on the same object in different threads compilation with QT_NO_DEPRECATED Test we do not have compiler warnings in our headers with more options QStyleSheet documentation: QMenu's tear-off is styled with ::tearoff Doc: Fixed qdoc warnings. Fix QTextEngine overflow caused by extremely long text Replace the SSE prologues by a macro QDom: Do not crash on "<a:>text</a:>" Doc: Fixed typo. Doc: Fixed QML documentation errors. Doc: Merged in some of Thomas Zander's suggestions. ...
| | * Remove the definition of QT_HAVE_NEON from qt.prfBenjamin Poulain2010-08-061-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | Since we cannot use NEON and VFP concurrently, it is better not to force neon all over the place :) Reviewed-by: Andreas Kling Reviewed-by: Thiago Macieira
* | | fix loading of module configsOswald Buddenhagen2010-08-111-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | do it in qt_config.prf instead of in the autogenerated qconfig.pri files. this is waaaay more elegant, and allows us to easily use the magic in that file which avoids loading qt configuration from the qt install dir while building qt itself. Reviewed-by: joerg Reviewed-by: Simon Hausmann Task-number: QTBUG-12698
* | | don't load modules from qt.prfOswald Buddenhagen2010-08-111-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | they are already loaded in qconfig.pri, which is loaded from qt_config.prf, which is explicitly loaded by every qmake spec. Reviewed-by: Simon Hausmann Reviewed-by: joerg
* | | add comment explaining why this file does magic instead of just voodooOswald Buddenhagen2010-08-111-0/+3
|/ / | | | | | | | | Reviewed-by: joerg Reviewed-by: Simon Hausmann
* | Fix run and runonphone targets for projects that have TARGET with pathMiikka Heikkinen2010-08-061-3/+5
|/ | | | | | | Sis files are always generated in the pro file directory even if TARGET indicates another target directory. Reviewed-by: axis
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-08-031-0/+13
|\ | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Use the fast conversion from RGB888 to RGB32 for Jpeg images Move the SIMD defines to the common declaration of Qt symbols Fixed: QT_DEPRECATED_WARNINGS defines QT3_SUPPORT
| * Move the SIMD defines to the common declaration of Qt symbolsBenjamin Poulain2010-08-031-0/+13
| | | | | | | | | | | | | | | | Move the #defines for the SIMD extension to the common code in order to be able to use them from any module without copying their definition. Reviewed-by: Andreas Kling
* | Switched from using hardlinks to copies in Symbian building.axis2010-08-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | The problem with hardlinks is that things start to behave funny when you build several times, because on the next compile, the target from armlink is moved to the .sym file location, and in this case it will be hardlinked too. In the end you have all three files (bare, .exe and .sym) being hardlinked together, when the .sym should be an ELF file and the other two should be an E32 image. RevBy: Trust me
* | Added SYMBIAN_VERSION variable to qmake.axis2010-08-031-3/+17
| | | | | | | | | | | | | | In addition, made Symbian^3 detection depend on libstdcppv5, which seems like the only option in the public Symbian^3 PDK. RevBy: Miikka Heikkinen
* | Moved the S60 version detection to the common symbian profile.axis2010-08-032-18/+19
| | | | | | | | RevBy: Trust me
* | Fixed rvct.h header inclusion on Symbian^3.axis2010-08-031-2/+11
| | | | | | | | RevBy: Trust me
* | Included libstdcppv5 support for the makefile build system.axis2010-08-031-7/+13
| | | | | | | | RevBy: Miikka Heikkinen
* | Prevented makefile build system from using platform provided paths.axis2010-08-031-2/+5
| | | | | | | | | | | | | | | | | | Platform paths provided by Symbian do not provide the full path to headers. Ideally they should be used, by looking for and replacing /epoc32 with the correct path. However, for now this is a good enough solution. RevBy: Miikka Heikkinen
* | Fixed additional case differences between Gnupoc and Symbian^3.axis2010-07-307-1/+12
|/ | | | RevBy: Trust me
* Fixed a problem with dso dependencies.axis2010-07-291-19/+21
| | | | | | | | | | | Dependencies to dso files were not generated correctly, both because the PRE_TARGETDEPS variable seems to be local to the function it was in, and also because the regular expression was wrong (it has to match the whole string). Also switched to qt_ style variable names to avoid clashes. RevBy: Trust me
* Revert "Fixed a parsing error during sis and runonphone target creation."axis2010-07-282-2/+2
| | | | This reverts commit ebe6a5238947c30a613b61b521cb0d094efa2d02.
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integrationQt Continuous Integration System2010-07-281-1/+0
|\ | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit: Make it possible again to build Qt without webkit
| * Make it possible again to build Qt without webkitSimon Hausmann2010-07-271-1/+0
| | | | | | | | | | | | | | | | | | | | | | Remove the QT_CONFIG line from the qt_webkit_version.pri file in Qt, because it is only meaningful for separate builds of WebKit. (Real fix is in the import script that takes care of always removing that line) Task-number: QTBUG-12456 Discussed-with: axis
generated by cgit v0.12 at 2024-09-05 04:41:13 (GMT)