summaryrefslogtreecommitdiffstats
path: root/mkspecs/common
Commit message (Collapse)AuthorAgeFilesLines
* Update licenseheader text in source files for qt4.8Jyri Tahtela2011-05-139-157/+157
| | | | | | | Updated version of LGPL and FDL licenseheaders. Apply release phase licenseheaders for all source files. Reviewed-by: Trust Me
* Merge branch 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration ↵Qt Continuous Integration System2011-05-051-0/+1
|\ | | | | | | | | | | | | | | | | | | into master-integration * 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration: QNAM HTTP: Fix bug with explicitly zero-length compressed responses. Add enablers for Symbian App Booster Don't rely on uninitialized data Don't realloc user-provided buffer
| * Merge branch 4.7 into qt-4.8-from-4.7Qt Continuous Integration System2011-05-041-0/+1
| |\
| | * Add enablers for Symbian App BoosterSimon Frost2011-05-031-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To use the Symbian App Booster, a registration file (matching the filename of the executable, eg helloworld.applite) must be copied to the import folder within QtAppBooster's private directory. The appropriate library (qdeclarativebooster) must also be linked against. With this change, the required actions are carried out by adding "CONFIG += symbian_appbooster" to the application's .pro file. Task-number: QT-4892 Reviewed-by: Miikka Heikkinen
* | | Merge remote-tracking branch 'qt/4.8'Sami Lempinen2011-04-281-24/+30
|\ \ \ | |/ /
| * | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-04-181-24/+30
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | Conflicts: qmake/generators/makefile.cpp qmake/generators/win32/msbuild_objectmodel.cpp qmake/generators/win32/msvc_vcxproj.cpp src/corelib/global/qnamespace.h src/gui/text/qtextcontrol.cpp
| | * Add new QSysInfo::symbianVersion() enumsMiikka Heikkinen2011-04-181-22/+27
| | | | | | | | | | | | | | | | | | | | | | | | Add new enums for future Symbian platforms and fix the docs of existing ones. Task-number: QT-4593 Reviewed-by: Sami Merila
| | * Trigger fullscreen transition effects properly on app exit.Laszlo Agocs2011-04-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Avkon calls BeginFullScreen() and EndFullScreen() to trigger the fullscreen system transition effects for application exit, however the calls are made too late for Qt apps because the widgets are already destroyed. Instead, the effects are triggered explicitly from Qt, before closing the widgets, or from aboutToQuit, whichever comes first. Task-number: QT-4718 Reviewed-by: Jani Hautakangas
| | * Support QMAKE_LFLAGS.ARMCC and QMAKE_LFLAGS.GCCE in makefile build systemLiang Qi2011-04-071-1/+2
| | | | | | | | | | | | Reviewed-by: axis
* | | Implement support for enable_backup CONFIG value.Miikka Heikkinen2011-04-261-0/+8
|/ / | | | | | | | | | | | | | | | | | | | | | | | | The enable_backup CONFIG value can be used to generate deployment for backup registration file for an application. BACKUP_REGISTRATION_FILE_SYMBIAN and BACKUP_REGISTRATION_FILE_MAEMO variables can be used to specify a custom backup registration files. Only works on Symbian and Maemo platforms. Task-number: QTBUG-17214 Reviewed-by: Oswald Buddenhagen
* | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-04-072-2/+16
|\ \ | |/ | | | | | | | | Conflicts: src/gui/text/qfontengine_mac.mm tests/auto/qdiriterator/tst_qdiriterator.cpp
| * Do not add project path to SYMBIAN_MATCHED_TRANSLATIONS if not neededMiikka Heikkinen2011-04-041-2/+5
| | | | | | | | | | | | | | | | If the path to translation file is already absolute, do not add the $$_PRO_FILE_PWD_ to it in symbian.conf Task-number: QT-4842 Reviewed-by: axis
| * Add the auto detection for OpenGL in configure for makefile build system on ↵Liang Qi2011-04-011-0/+11
| | | | | | | | | | | | | | | | Symbian. Task-number: QTBUG-18485 Reviewed-by: Miikka Heikkinen Reviewed-by: axis
* | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-03-311-25/+16
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/src/declarative/example-slideswitch.qdoc doc/src/development/qmake-manual.qdoc doc/src/snippets/code/doc_src_qmake-manual.pro doc/src/snippets/code/doc_src_qtscript.qdoc src/corelib/animation/qabstractanimation.cpp src/s60installs/bwins/QtOpenGLu.def src/s60installs/eabi/QtOpenGLu.def src/s60installs/eabi/QtOpenVGu.def tests/auto/qdir/qdir.pro tests/auto/qsslsocket/tst_qsslsocket.cpp tools/qdoc3/doc/qdoc-manual.qdocconf
| * QSysInfo support for next generation Symbian devices.Miikka Heikkinen2011-03-241-25/+16
| | | | | | | | | | | | | | | | | | | | | | A new QSysInfo::S60Version enum value SV_S60_5_3 is introduced. QSysInfo::symbianVersion still returns SV_SF_3 for the new platform. The official name of the platform is still pending, so documentation will be updated later. Task-number: QT-4593 Reviewed-by: Sami Merila
* | Merge branch 'qt-master-from-4.7' of ↵Qt Continuous Integration System2011-03-221-1/+1
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | scm.dev.nokia.troll.no:qt/qt-integration into master-integration * 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration: Add flag for forcibly propagating backing store alpha to framebuffer Fixed unmatched quotes in s60installs.pro Added setSwitchPolicy to MeeGo graphicssystem helper API. Add /q switch to QMAKE_DEL_FILE command in symbian
| * \ Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2011-03-191-1/+1
| |\ \ | | |/
| | * Add /q switch to QMAKE_DEL_FILE command in symbianMiikka Heikkinen2011-03-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Builds will otherwise halt without giving reason if a wildcard is given in QMAKE_CLEAN in symbian-abld. Task-number: QTBUG-18207 Reviewed-by: axis
* | | Merge remote-tracking branch 'origin/master' into lighthouse-masterJørgen Lind2011-03-173-5/+31
|\ \ \ | |/ / | | | | | | | | | Conflicts: mkspecs/qws/macx-nacl-g++/qplatformdefs.h
| * | Merge remote-tracking branch 'origin/4.7' into HEADThiago Macieira2011-03-161-1/+1
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure mkspecs/symbian-gcce/qmake.conf qmake/generators/metamakefile.cpp qmake/generators/win32/mingw_make.cpp src/corelib/global/global.pri src/corelib/global/qglobal.h src/opengl/qgl.cpp src/opengl/qwindowsurface_gl.cpp src/plugins/platforms/wayland/qwaylandbuffer.h tests/auto/qnetworkreply/tst_qnetworkreply.cpp tools/designer/src/components/formeditor/qdesigner_resource.cpp
| | * Merge branch 'backporting-symbian-armcc-to-4.7' into s60-4.7axis2011-03-144-9/+80
| | |\ | | | | | | | | | | | | | | | | Conflicts: mkspecs/common/symbian/symbian.conf
| | | * Fixed incorrect referral to an include file.axis2011-03-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Better to make it relative to the profile. That way it is always found, regardless of where Qt is located. RevBy: Liang Qi
| | | * Added object script support to RVCT when using MinGW qmake generator.axis2011-03-041-0/+2
| | | | | | | | | | | | | | | | RevBy: Oswald Buddenhagen
| | | * Added Symbian makefile building support using MinGW backend.axis2011-03-041-1/+5
| | | | | | | | | | | | | | | | RevBy: Oswald Buddenhagen
| | | * Fixed some tools definitions and properties in symbian profiles.axis2011-03-042-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | This is needed for Symbian development on Windows using makefiles. RevBy: Trust me
| | | * Added missing header.axis2011-03-041-0/+41
| | | |
| | | * Added Symbian deployment localization for makefile build system.axis2011-03-042-3/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a complement to the 16575f7aef840b6aae0dc767468ab713fbcfd7a6 commit, which adds localization based on TRANSLATIONS keywords for Raptor and abld. In addition, since the __PRODUCT_INCLUDE__ define was creating a lot of trouble regarding < and >, it was refactored into its own source file, which is automatically included before every source file. Task: QTBUG-15292 RevBy: Miikka Heikkinen
| | | * Made the translations dependency work for shadow builds.axis2011-03-041-1/+1
| | | | | | | | | | | | | | | | RevBy: Miikka Heikkinen
| | | * Fixed PREPEND_INCLUDEPATH being executed too early.axis2011-03-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It used to be carried out inside qt.prf, but was moved to default_post.prf. However, since qt.prf is executed after default_post.prf, it would still prepend its own include paths at the very front, which is wrong. Fixed by introducing a new feature profile for PREPEND_INCLUDEPATH, which is run after qt.prf (features in $$CONFIG are executed in reverse order). RevBy: Miikka Heikkinen
| | | * Fixed various quotation problems when porting to Windows.axis2011-02-181-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | These should work for both Windows and UNIX platforms. RevBy: Thomas Zander
| * | | Merge remote-tracking branch 'origin/master' into qt-master-from-4.7Thiago Macieira2011-03-112-2/+2
| |\ \ \ | | | | | | | | | | | | | | | | | | | | Conflicts: src/s60installs/eabi/QtOpenVGu.def
| | * | | Update copyright year to 2011.Rohan McGovern2011-03-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Trust Me (cherry picked from commit 774a3536b00c4d6e4c4c10b708e31b4373a338e3)
| | * | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt into earth-masteraxis2011-02-243-16/+11
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/network/access/qnetworkreplyimpl.cpp tests/auto/moc/tst_moc.cpp
| | * | | | Fixed incorrect referral to an include file.axis2011-02-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Better to make it relative to the profile. That way it is always found, regardless of where Qt is located. RevBy: Liang Qi
| * | | | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Thiago Macieira2011-03-111-3/+29
| |\ \ \ \ \ | | |_|/ / / | |/| | / / | | | |/ / | | |/| | | | | | | | | | | | Conflicts: mkspecs/common/symbian/symbian.conf src/s60installs/bwins/QtGuiu.def src/s60installs/eabi/QtGuiu.def
| | * | | Implement language fallback logic for localize_deploymentMiikka Heikkinen2011-03-091-3/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When querying system locale it does return both language and country, so sometimes users want to have both in their .ts file names (e.g. myapp_zh_CN.ts). This is bit problematic in Symbian, where there are separate language codes for only very few language + country combinations. Until now, the unsupported combinations were simply dropped from deployment localization. More proper way to handle these unknown language + country combinations is to fall back to using the plain language code for them instead of dropping them altogether. This is somewhat analogous to how QTranslator::load() loads .ts files if it can't find the file for specified language + country combination. E.g. User defines: TRANSLATIONS += myapp_zh_CN.ts myapp_zh_HK.ts myapp_zh_TW.ts There are separate Symbian language codes for HongKong Chinese (zh_HK = 30) and Taiwanese Chinese (zh_TW = 29), but rest of the world is expected to use just Chinese (zh = 31). This means "zh_CN" mapping is not provided as it would be same as plain "zh". With this fix, qmake will now automatically generate a fallback mapping from "zh_CN" to "31" for deployment localization purposes, and is able to read application captions and pkg names from myapp_zh_CN.ts. If there are multiple TRANSLATIONS defined that would result in same Symbian language code, only the first one is used. Task-number: QTBUG-17927 Reviewed-by: Oswald Buddenhagen
| | * | | QPixmap::to/fromSymbianCFbsBitmap() in OpenGL graphics system.Jani Hautakangas2011-02-251-5/+6
| | | |/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Implementation of Symbian specific conversion functions for converting Symbian native bitmap to QPixmap and QPixmap to Symbian native bitmap. Task-number: QTBUG-16977 Reviewed-by: Jason Barron
* | | | Lighthouse: Make sure we don't use xkbcommonJørgen Lind2011-03-161-1/+2
| | | | | | | | | | | | | | | | when we don't have it
* | | | posix platformdefs: Add QT_NO_SOCKET_H.Morten Johan Sørvig2011-03-161-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Prevents including <sys/socket.h> Reviewed-by: Jørgen Lind
* | | | Objective-c prf may not override OBJECTIVE_CFLAGS settings.con2011-03-101-4/+11
| | | | | | | | | | | | | | | | Reviewed-by: Morten Johan Sørvig
* | | | Build fixes for the Wayland pluginPaul Olav Tvete2011-03-021-0/+5
|/ / / | | | | | | | | | | | | | | | Add qmake.conf variables, and use the generic font plugin. Reviewed-by: Jørgen
* | | Merge branch earth-team/master into earth-stagingJoão Abecasis2011-02-164-7/+78
|\ \ \ | | |/ | |/| | | | | | | Conflicts: doc/src/development/qmake-manual.qdoc
| * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt into earth-masteraxis2011-01-3110-13/+13
| |\ \
| * \ \ Merge branch 'windowsMakefileBuildSupport' into earth-masteraxis2011-01-283-3/+10
| |\ \ \
| | * | | Added object script support to RVCT when using MinGW qmake generator.axis2011-01-281-0/+2
| | | | | | | | | | | | | | | | | | | | RevBy: Oswald Buddenhagen
| | * | | Added Symbian makefile building support using MinGW backend.axis2011-01-281-1/+5
| | | | | | | | | | | | | | | | | | | | RevBy: Oswald Buddenhagen
| | * | | Fixed some tools definitions and properties in symbian profiles.axis2010-12-232-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is needed for Symbian development on Windows using makefiles. RevBy: Trust me
| * | | | Added missing header.axis2011-01-281-0/+41
| | | | |
| * | | | Added Symbian deployment localization for makefile build system.axis2011-01-272-3/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a complement to the 16575f7aef840b6aae0dc767468ab713fbcfd7a6 commit, which adds localization based on TRANSLATIONS keywords for Raptor and abld. In addition, since the __PRODUCT_INCLUDE__ define was creating a lot of trouble regarding < and >, it was refactored into its own source file, which is automatically included before every source file. Task: QTBUG-15292 RevBy: Miikka Heikkinen
| * | | | Made the translations dependency work for shadow builds.axis2011-01-271-1/+1
| |/ / / | | | | | | | | | | | | RevBy: Miikka Heikkinen
generated by cgit v0.12 at 2025-08-27 10:28:31 (GMT)