summaryrefslogtreecommitdiffstats
path: root/mkspecs
Commit message (Collapse)AuthorAgeFilesLines
* 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
* | Fixed package creation when shadow building.axis2010-07-261-3/+5
|/ | | | RevBy: Markus Goetz
* Updated WebKit to 669858f9bbd4913fd16c642090375c81acbfdb04Simon Hausmann2010-07-231-0/+1
|
* Added silent behavior to the most important Symbian build steps.axis2010-07-221-0/+5
| | | | | Task: QTBUG-11927 RevBy: Trust me
* Fixed compiling with symbian/linux-armcc and configure -silent optionaxis2010-07-221-1/+1
| | | | | Task: QTBUG-11927 RevBy: Trust me
* Removed some warnings from armcc that are unneeded.axis2010-07-221-1/+10
| | | | RevBy: Trust me
* Made the makefile build system use QMAKE_CFLAGS.xxx properly.axis2010-07-222-2/+10
| | | | | | | Previously, the variable would be appended too soon, so not all values would be included. Now it is one of the last steps. RevBy: Trust me
* Merge branch 'raptorConfigurePatches' into 4.7-s60axis2010-07-211-0/+1
|\ | | | | | | | | | | Conflicts: configure src/sql/drivers/drivers.pri
| * Fixed automatic sqlite extraction on Symbian makefile build system.axis2010-07-211-0/+1
| | | | | | | | | | | | | | | | Since we cannot extract to the epocroot (it is considered R/O), we extract the header and the dso to the temporary build directories and include them from there. RevBy: Trust me
* | Fixed a parsing error during sis and runonphone target creation.axis2010-07-212-2/+2
| | | | | | | | RevBy: Trust me
* | Revert BIC change "Build Qt with option -Zc:wchar_t under MSVC"Oswald Buddenhagen2010-07-153-3/+3
| | | | | | | | | | | | This reverts commit a9c8decc741d8c2b340f38d7a854ef206672ab3e. Postponed for Qt5. Or different makespecs.
* | Build Qt with option -Zc:wchar_t under MSVCliang jian2010-07-083-3/+3
| | | | | | | | | | | | | | | | | | This will make projects generated by visual studio being successfully linked to the Qt dlls if they use the QString::fromWCharArray() or QString::toWCharArray() methods. Merge-request: 727 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* | respect UI_DIR when creating image collectionsOswald Buddenhagen2010-07-081-6/+6
| | | | | | | | | | Reviewed-by: joerg Task-number: QTBUG-11752
* | Set QT_DEFAULT_TEXTURE_GLYPH_CACHE_WIDTH to default valueAdrian Constantin2010-07-071-3/+0
|/ | | | | | Remove workaround introduced in Qt 4.6 as not needed any more Reviewed-by: Adrian Constantin
* Fixed symbian/linux-armcc mkspec when configured with -qtlibinfix.axis2010-07-022-9/+17
| | | | | Task: QTBUG-11396 RevBy: Miikka Heikkinen
* Support for "deploy" make target in SymbianMiikka Heikkinen2010-07-021-0/+10
| | | | | | | | Executing "make deploy" will recreate project sis file and deploy it into a device. Task-number: QTBUG-5155 Reviewed-by: axis
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7mread2010-07-028-9/+11
|\ | | | | | | | | | | Conflicts fixed: src/s60installs/bwins/QtGuiu.def src/s60installs/eabi/QtGuiu.def
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-07-017-7/+7
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: QSslSocket::systemCaCertificates(): have one common case for all Unices Fixed QX11EmbedContainer. Improved a bit detection of a touch screen on Windows. qdoc: Fixed invalid format in the html header. link glu32 before opengl32 Stopped trying to output QML property list in 2 columns
| | * link glu32 before opengl32Oswald Buddenhagen2010-07-017-7/+7
| | | | | | | | | | | | | | | | | | | | | otherwise the build fails if the libraries are statically built, as glu depends on opengl. Task-number: QTBUG-11863
| * | Symbian on Linux: $QTDIR/bin is not necessarily in the path.Olivier Goffart2010-07-011-2/+4
| |/ | | | | | | | | | | | | | | | | | | | | So it would not find elf2e32_qtwrapper use the qtPrepareTool macro that does the right thing. But this macro need QT_BUILD_TREE to be defined, which is not defined yet early in the test process. So change the tests accordingly Reviewed-by: ossi
* | Avkon removal configured with -no-s60mread2010-07-011-2/+2
|/ | | | | | | | | | | | | | | | Avkon dependencies can be configured out with the -no-s60 configure flag, conversely Qt on Symbian will use Avkon if -s60 is configured. These changes are intended to keep or introduce binary compatibility between the s60 and no-s60 configurations. To do this, it has been necessary to introduce stub equivalents of the CAknAppUi related classes into the no-s60 configuration, and override all Avkon framework virtual functions in the QS60Main... classes. Other than that, these changes are mostly just correcting the use of the Q_WS_S60 flag so that it only refers to Avkon dependencies. Reviewed-by: Sami Merila
* Merge branch 'buildSystemFixes' into 4.7-s60axis2010-06-293-64/+68
|\ | | | | | | | | Conflicts: mkspecs/features/symbian/symbian_building.prf
| * Added the APP_PRIVATE_DIR_BASE variable.axis2010-06-291-1/+2
| | | | | | | | RevBy: Miikka Heikkinen
| * Fixed Symbian resources not honoring TARGET with a path.axis2010-06-292-63/+66
| | | | | | | | | | Task: QT-3540 RevBy: Thomas Zander
* | Removed useless comments.axis2010-06-291-4/+0
| | | | | | | | Not relevant anymore after 5b5ae51b22b.
* | Change the files to camelcase as avkon now does thatThomas Zander2010-06-257-0/+8
|/ | | | | | | In older avkon solutions all headers were lowercase in newer they are CamelCase... Reviewed-by: Axis
* Fixed incorrect parsing of TARGET.EPOCHEAPSIZE.axis2010-06-241-2/+4
| | | | RevBy: Trust me
generated by cgit v0.12 at 2024-07-16 17:10:56 (GMT)