summaryrefslogtreecommitdiffstats
path: root/mkspecs
Commit message (Collapse)AuthorAgeFilesLines
* Symbian: Parse ts filenames case-insensitively for localize_deploymentMiikka Heikkinen2011-09-302-25/+26
| | | | | | | | | | A lot of platform applications have all-lowercase translation files due to file naming policies. This makes no difference for runtime translation, so removed unnecessary case sensitivity when parsing ts filenames for localization deployment. Task-number: QT-5305 Reviewed-by: Sami Merila
* Improve sbsv2 whatlog support.Miikka Heikkinen2011-09-221-0/+1
| | | | | | | | | All builds will now add anything generated via QMAKE_EXTRA_COMPILERS to whatlog. In addition, platform builds will now add to whatlog the exported mkspecs and qmake_clean.flm that were missing. Task-number: QTBUG-21591 Reviewed-by: Sami Merila
* Merge remote-tracking branch 'qt/4.8'Sami Lempinen2011-09-203-9/+29
|\
| * Fixed automatic plugin path resolving for predefined Qt plugins.Janne Anttila2011-09-191-7/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | When Qt is configured for static build, importing static plugins is supposed to work as described in docs: http://doc.qt.nokia.com/latest/qtplugin.html#Q_IMPORT_PLUGIN This commit updates the qmake mapping for predefined Qt plugins, so that Qt plugins are automatically found when QTPLUGIN keyword is used. Task-number: QTBUG-18609 Merge-request: 1391 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
| * Resolve a number of compilation issues with INTEGRITYRolland Dudemaine2011-09-191-0/+1
| | | | | | | | | | | | | | | | | | | | | | First, #ifdef'ed out getpwuid_r() and getpwgid_r() usage since users/groups support is not in in single-process Posix mode. Also, correct a typo and add missing files to io.pri. Update documentation to disable libtiff which won't compile until ibtiff itself is updated, and add back -no-exceptions in the sample command line. And add a line to compile host tools. Add a dummy QT_OPEN_LARGEFILE definition in qplatformdefs.h since there is code that requires it. Move definition of getGlyph() after the definition of qHash(GlyphAndSubPixelPosition). Merge-request: 2686 Reviewed-by: ossi
| * Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2011-09-081-2/+15
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Split CFLAGS from pkg-config properly Ensure that the proxystyle is used over the style's own functions runonphone: Add a missing space between a message and the file name Perl check for windows configure. QSettings: don't assume XDG_CONFIG_HOME is latin1-encoded QSettings: use the common appdata dir when bootstrapping qmake on win Replace explicit surrogate handlers by inline methods of QChar class
| | * Split CFLAGS from pkg-config properlyJan Arne Petersen2011-09-071-2/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | Add support for DEFINES and INCLUDEPATH to link_pkgconfig so moc uses the cflags properly. Task-number: QTBUG-19922 Merge-request: 2674 Reviewed-by: ossi
* | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-flexPasi Pentikainen2011-09-131-0/+1
|\ \ \ | |/ / |/| |
| * | Mark binaries as SMPSAFE in SymbianPasi Pentikainen2011-09-121-0/+1
| | | | | | | | | | | | | | | Task-number: QTBUG-11769 Reviewed-by: Laszlo Agocs
* | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2011-09-051-1/+1
|\ \ \ | |/ / |/| / | |/ | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Removed the unnecessary dependency of the QtHelp module on the QtXml one
| * Removed the unnecessary dependency of the QtHelp module on the QtXml oneConstantin Makshin2011-09-051-1/+1
| | | | | | | | | | Merge-request: 2669 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* | Fix incorrect Symbian version check.Miikka Heikkinen2011-08-241-3/+1
| | | | | | | | | | | | This check is unnecessary and doesn't work post-Symbian3 SDKs. Reviewed-by: Sami Merila
* | Fix BLD_INF_RULES.prj_exports statements in Qt libs for shadow builds.Miikka Heikkinen2011-08-241-0/+7
| | | | | | | | | | | | Task-number: QTBUG-10432 Rubber-stamped-by: ossi Reviewed-by: TrustMe
* | Improved support for shadow builds in Symbian.Miikka Heikkinen2011-08-241-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | It is now possible to make shadow builds in Symbian. Note that any relative host side paths specified via BLD_INF_RULES, MMP_RULES, or DEPLOYMENT pkg_*rules are NOT automatically converted to point to build directory. Task-number: QTBUG-10432 Rubber-stamped-by: ossi Reviewed-by: TrustMe
* | Fix def file paths for Symbian shadow buildsMiikka Heikkinen2011-08-241-6/+10
|/ | | | | | | Def file paths are now generated absolute Task-number: QTBUG-10703 Reviewed-by: Sami Merila
* Merge remote-tracking branch 'qt/4.8'Sami Lempinen2011-08-234-6/+10
|\
| * Use thumb instructions for uikitEike Ziller2011-08-171-3/+3
| |
| * Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7Liang Qi2011-08-152-2/+6
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: examples/webkit/fancybrowser/fancybrowser.pro src/3rdparty/libpng/ANNOUNCE src/3rdparty/libpng/CHANGES src/3rdparty/libpng/CMakeLists.txt src/3rdparty/libpng/LICENSE src/3rdparty/libpng/README src/3rdparty/libpng/configure.ac src/3rdparty/libpng/example.c src/3rdparty/libpng/libpng-manual.txt src/3rdparty/libpng/libpng.3 src/3rdparty/libpng/libpngpf.3 src/3rdparty/libpng/png.5 src/3rdparty/libpng/png.c src/3rdparty/libpng/png.h src/3rdparty/libpng/pngconf.h src/3rdparty/libpng/pngerror.c src/3rdparty/libpng/pnginfo.h src/3rdparty/libpng/pnglibconf.h src/3rdparty/libpng/pngmem.c src/3rdparty/libpng/pngpread.c src/3rdparty/libpng/pngpriv.h src/3rdparty/libpng/pngread.c src/3rdparty/libpng/pngrtran.c src/3rdparty/libpng/pngrutil.c src/3rdparty/libpng/pngset.c src/3rdparty/libpng/pngstruct.h src/3rdparty/libpng/pngtest.c src/3rdparty/libpng/pngtrans.c src/3rdparty/libpng/pngvalid.c src/3rdparty/libpng/pngwrite.c src/3rdparty/libpng/pngwtran.c src/3rdparty/libpng/pngwutil.c src/gui/dialogs/qfiledialog_symbian.cpp src/gui/kernel/qsoftkeymanager.cpp src/s60installs/s60installs.pro
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2011-08-051-1/+5
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Fix compile errors on S60 3.2 Fix to QGLWidget rendering with VG graphics system
| | | * Fix compile errors on S60 3.2Shane Kearns2011-08-051-1/+5
| | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-20743 Reviewed-by: Liang Qi
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2011-08-041-1/+1
| | |\ \ | | | |/ | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Symbian/gcce: Remove the useless -T flag
| | | * Symbian/gcce: Remove the useless -T flagMartin Storsjo2011-08-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The -T flag is a linker flag, not a compiler flag, and does nothing. If specified as a linker flag, this even yields errors (since there is no linker script file named 'script'). Merge-request: 1302 Reviewed-by: Liang Qi <liang.qi@nokia.com>
| * | | uikit: update SDK setting for the simulatorEike Ziller2011-08-051-1/+1
| | | |
* | | | Default graphics memory quota for Symbian applicationsMiikka Heikkinen2011-08-181-0/+12
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The graphics memory quota, which is a new feature in S60 5.4, now gets default value of 24MB. User can override the default value using RSS_RULES: RSS_RULES += "graphics_memory=<# of kB>;" Task-number: QT-4963 Reviewed-by: Sami Merila
* | | Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7Liang Qi2011-08-032-0/+7
|\ \ \ | |/ /
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2011-08-022-0/+7
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Support debuggable in the makefile build system Mark all Symbian debug binaries debuggable by default
| | * Support debuggable in the makefile build systemLiang Qi2011-08-021-0/+5
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-20697 Reviewed-by: Shane Kearns Reviewed-by: Miikka Heikkinen
| | * Mark all Symbian debug binaries debuggable by defaultMiikka Heikkinen2011-08-021-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CODA 4.1.* cannot be used to debug binaries that do not have DEBUGGABLE_UDEBONLY keyword specified, so add this keyword to all projects by default. Adding this keyword has no impact for previous versions of CODA or TRK. Task-number: QTBUG-20669 Reviewed-by: Shane Kearns
* | | Fix uikit simulator build.Eike Ziller2011-07-251-2/+2
| | |
* | | Merge branch 4.7 into qt-4.8-from-4.7Qt Continuous Integration System2011-07-091-0/+2
|\ \ \ | |/ /
| * | sync win32-g++-cross with win32-g++ (lib prefix and extension)Mark Brand2011-07-081-0/+2
| |/ | | | | | | | | | | | | | | | | | | qmake now needs library prefix and extension to be supplied. This was added to plain win32-g++ in dbbf06e. Now added to win32-g++-cross. Without this, static libraries get named 'X.lib' instead of 'libX.a'. Merge-request: 1283 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* | Merge remote branch 'origin/4.7' into qt-4.8-from-4.7Jani Hautakangas2011-07-041-0/+3
|\ \ | |/ | | | | | | | | | | Conflicts: doc/src/external-resources.qdoc src/gui/text/qtextlayout.cpp src/opengl/qwindowsurface_gl.cpp
| * Introduce QPixmap::fromSymbianRSgImage(RSgImage*) to GL engineJani Hautakangas2011-06-301-0/+3
| | | | | | | | | | | | | | | | Initial implementation of QPixmap::fromSymbianRSgImage(RSgImage*) on OpenGL graphics system. Task-number: QTBUG-15254 Reviewed-by: Laszlo Agocs
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into ↵Qt Continuous Integration System2011-06-298-133/+123
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging: Fix vertical positioning of glyphs in raster engine with FreeType Ensure a small event check interval on uikit platform. Change default application font for uikit platform. Use the QPoint memory layout change only on Desktop Mac Fix 2cb398e1d901e62384bb2b388761cfd18fc8804a in case of no coreservices Add IPHONEOS deployment vars to makespec Post key events via QWindowSystemInterface, don't post events direcly Use nicer fonts and a few little patches to uikit platform. Update README and qmlapplicationviewer to suit 4.8. Updated proof-of-concept UIKit mkspecs
| * | Add IPHONEOS deployment vars to makespecIan2011-06-272-2/+4
| | | | | | | | | | | | | | | Merge-request: 1275 Reviewed-by: con
| * | Updated proof-of-concept UIKit mkspecsIan2011-06-278-133/+121
| | | | | | | | | | | | | | | Merge-request: 1275 Reviewed-by: con
* | | Re-apply licenseheader text in source files for qt4.8Jyri Tahtela2011-06-273-53/+53
|/ / | | | | | | | | | | New files after previous license change round. Reviewed-by: Trust Me
* | a major refactoring of the mkspecs tree for QNXRitt Konstantin2011-06-2116-381/+334
| | | | | | | | | | | | | | | | | | the common parts were moved into mkspecs/common/qnx/qmake.conf and the redefinitions only were left in the target qmake.conf files. this makes a customization process really-really easy now Merge-request: 1259 Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
* | Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7Olivier Goffart2011-05-311-1/+1
|\ \ | |/ | | | | | | | | | | | | | | | | Conflicts: src/gui/text/qtextengine.cpp src/gui/text/qtextengine_p.h src/gui/text/qtextlayout.cpp src/plugins/phonon/mmf/mmf.pro src/plugins/s60/5_0/5_0.pro tests/auto/qtextlayout/tst_qtextlayout.cpp
| * Fixing Linux compatibility issues for SymbianTomi Vihria2011-05-251-2/+2
| | | | | | | | | | | | | | | | The patch applies everything from the original, except for the filename case changes in LIBS which are handled differently based on the auto-detected is_using_gnupoc CONFIG value. Reviewed-by: Laszlo Agocs
| * Update the detection of is_using_gnupoc for S3.Liang Qi2011-05-251-1/+1
| | | | | | | | | | | | The akndoc.h was moved to epoc32/include/mw. Reviewed-By: axis
| * Revert "Fixing Linux compatibility issues for Symbian"Laszlo Agocs2011-05-251-2/+2
| | | | | | | | | | | | | | | | | | | | Changing the library names to lowercase breaks 5.0-based Linux builds. It will be investigated if it is possible to change the SDKs instead. If not, the patch will have to be extended to use the original names for 5.0 and the lowercased ones otherwise. This reverts commit 5933d4e4fb8b48ebed641e7f6b1d032df253df30.
* | Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7Olivier Goffart2011-05-241-2/+2
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gui/text/qfontengine_ft.cpp src/gui/text/qtextlayout.cpp src/plugins/phonon/mmf/mmf.pro src/plugins/s60/5_0/5_0.pro src/s60installs/bwins/QtCoreu.def src/s60installs/bwins/QtDeclarativeu.def src/s60installs/bwins/QtGuiu.def src/s60installs/bwins/QtMultimediau.def src/s60installs/bwins/QtNetworku.def src/s60installs/bwins/QtScriptu.def src/s60installs/bwins/QtSqlu.def src/s60installs/bwins/QtTestu.def src/s60installs/bwins/QtXmlPatternsu.def src/s60installs/bwins/QtXmlu.def src/s60installs/bwins/phononu.def src/s60installs/s60installs.pro tests/auto/qcssparser/qcssparser.pro tests/auto/qtextlayout/tst_qtextlayout.cpp Changes in qtextlayout.cpp and tst_qtextlayout.cpp and qfontengine_ft.cpp are not merged because they will have other fixes in 4.8
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2011-05-181-2/+2
| |\ | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Fixing Linux compatibility issues for Symbian
| | * Fixing Linux compatibility issues for SymbianTomi Vihria2011-05-181-2/+2
| | | | | | | | | | | | Reviewed-by: Laszlo Agocs
* | | Merge remote branch 'origin/4.8' into 4.8-from-4.7Rohan McGovern2011-05-2012-207/+207
|\ \ \
| * | | Update licenseheader text in source files for qt4.8Jyri Tahtela2011-05-13146-2571/+2571
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Updated version of LGPL and FDL licenseheaders. Apply release phase licenseheaders for all source files. Reviewed-by: Trust Me
* | | | Merge remote branch 'origin/4.7' into 4.8-from-4.7Rohan McGovern2011-05-17135-2366/+2365
|\ \ \ \ | |/ / / |/| / / | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/corelib/io/qfsfileengine_iterator_unix.cpp src/corelib/io/qfsfileengine_iterator_win.cpp src/network/access/qnetworkaccessdatabackend.cpp src/xmlpatterns/expr/qevaluationcache_p.h tests/auto/declarative/qdeclarativewebview/tst_qdeclarativewebview.cpp tools/assistant/tools/assistant/helpviewer_qwv.h tools/qtconfig/mainwindowbase.cpp tools/qtconfig/paletteeditoradvancedbase.cpp tools/qtconfig/paletteeditoradvancedbase.ui tools/qtconfig/previewwidgetbase.ui
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2011-05-17135-2361/+2360
| |\ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Updating file with CRLF line endings for the updated header Fix a regression in QList::mid() update gitignore remove -fno-stack-protector Fix make confclean Update licenseheader text in source files
| | * remove -fno-stack-protectorOswald Buddenhagen2011-05-131-2/+1
| | | | | | | | | | | | | | | | | | there is no need to disable stack protector unless one uses an ancient version of gcc. taken from kubuntu.
generated by cgit v0.12 at 2024-12-29 05:54:16 (GMT)