summaryrefslogtreecommitdiffstats
path: root/mkspecs/features
Commit message (Collapse)AuthorAgeFilesLines
* 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
| * Fixing Linux compatibility issues for SymbianTomi Vihria2011-05-181-2/+2
| | | | | | | | Reviewed-by: Laszlo Agocs
* | Merge remote branch 'qt/4.8' into master-qml-stagingKai Koehne2011-05-1011-16/+97
|\ \ | | | | | | | | | | | | | | | Conflicts: src/declarative/debugger/qdeclarativedebugserver.cpp src/plugins/qmltooling/qmltooling.pro
| * \ Merge branch 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration ↵Qt Continuous Integration System2011-05-051-0/+32
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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/+32
| | |\ \ | | | |/
| | | * Add enablers for Symbian App BoosterSimon Frost2011-05-031-0/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-288-15/+17
| |\ \ \ | | |/ /
| | * | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-04-188-15/+17
| | |\ \ | | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2011-04-132-0/+7
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: (21 commits) Have the backing store destroyed also in special Symbian scenarios. Use FixNativeOrientation on Symbian when the application wants it. QS60Style: itemview item with checkbox and text is drawn incorrectly Revert "Have the backing store destroyed also in special Symbian scenarios." Add focus frame support in style sheet Two QListView autotests do not pass on Symbian^3 releases tst_QStyle::drawItemPixmap test case fails on Symbian^3 Add the auto detection for OpenVG in configure Add focus frame support in stylesheet Make QS60Style to support new Tab graphics in new Symbian releases GraphicsView is not reset if focusItem is not set when keyboard closes Check the validity of qt_desktopWidget before dereferencing Labels are not visible in dialogs with all themes (part2) Labels are not visible in dialogs with all themes Enable webkit for symbian-gcce in configure Enable webkit build for the makefile build system with gcce Add the rules for gcce in do_not_build_as_thumb.prf Correct some parameters for the makefile build sytem, armcc and gcce Support QMAKE_LFLAGS.ARMCC and QMAKE_LFLAGS.GCCE in makefile build system Do not unnecessarily draw application twice in landscape ...
| | | | * Add the rules for gcce in do_not_build_as_thumb.prfLiang Qi2011-04-071-0/+5
| | | | | | | | | | | | | | | | | | | | Reviewed-by: axis
| | | | * Support QMAKE_LFLAGS.ARMCC and QMAKE_LFLAGS.GCCE in makefile build systemLiang Qi2011-04-071-0/+2
| | | | | | | | | | | | | | | | | | | | Reviewed-by: axis
| | | * | make uic3-generated moc files depend on mocinclude.tmpOswald Buddenhagen2011-04-121-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-16951 Reviewed-by: mariusSO
| | | * | clean up visual studio identification codeOswald Buddenhagen2011-04-125-15/+9
| | | |/ | | | | | | | | | | | | | | | | | | | | | | | | TEMPLATE is (now) reliably prefixed with "vc" when a vs generator is used. Reviewed-by: mariusSO
| * | | Implement support for enable_backup CONFIG value.Miikka Heikkinen2011-04-261-0/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | Fix "make sis" for projects that have empty OBJECTS_DIRMiikka Heikkinen2011-04-121-1/+5
| |/ / | | | | | | | | | | | | | | | | | | Temp directory for packagaging got created to system root if OBJECTS_DIR was empty. Fixed it to use '.' instead in those cases. Reviewed-by: Janne Koskinen
* | | Introduced a CONFIG option that enables declarative debug servicesThorbjørn Lindeijer2011-05-041-0/+1
|/ / | | | | | | | | | | | | | | | | | | | | This replaces the need for applications to explicitly make a call to enable the debug services, and rather does it in declarative.h when the 'declarative_debug' CONFIG option is used. Done-with: Kai Koehne Change-Id: I817f22a4ec9226a1ee2d080c1f5bb75d8599a06e Reviewed-by: Martin Jones Reviewed-by: Michael Brasser
* | Merge remote branch 'qt-mainline/master'aavit2011-04-071-9/+13
|\ \
| * \ Merge remote branch 'qt-master/master'Guoqing Zhang2011-04-053-14/+5
| |\ \
| * | | Make createpackage and patch_capabilties scripts use tmp dirMiikka Heikkinen2011-03-221-9/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Temporary files created by these two scripts will now be created under a separate directory, contents of which is also added to cleanup. Task-number: QTBUG-11394 Reviewed-by: axis
| * | | Add ".make.cache" to the files to be cleaned for symbian-abld.Miikka Heikkinen2011-03-171-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "make clean" will now delete any generated ".make.cache" files in symbian-abld builds. Task-number: QTBUG-15733 Reviewed-by: Janne Koskinen
* | | | Fixes: The "test: too many arguments" error after every makeaavit2011-04-071-1/+1
| |/ / |/| | | | | | | | | | | | | | | | | | | | | | | If the gdb version string was not matched, it would be passed in full to test. This new regexp matches the different kinds of gdb version string observed in the wild, as listed in qtcreator/tests/auto/debugger/tst_version.cpp Reviewed-by: aep <arvid.picciani@nokia.com>
* | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-03-311-2/+2
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 'backporting-symbian-armcc-to-4.7' into s60-4.7axis2011-03-147-123/+182
| |\ \ | | | | | | | | | | | | | | | | Conflicts: mkspecs/common/symbian/symbian.conf
| | * | Stopped honoring the RVCT22INC variable on symbian-armcc mkspec.axis2011-03-041-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This usually points to the RVCT include directory, but those headers are not appropriate for Symbian. RevBy: Trust me
| | * | Unified the usage of $${EPOCROOT} for symbian.axis2011-03-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | RevBy: Miikka Heikkinen Conflicts: mkspecs/symbian-gcce/qmake.conf
| | * | Added Symbian deployment localization for makefile build system.axis2011-03-041-44/+80
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * | Fixed PREPEND_INCLUDEPATH being executed too early.axis2011-03-042-15/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * | Moved the default dependency targets to default_post.prf.axis2011-03-042-47/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The file that they were in would not be parsed if CONFIG -= qt, but it always needs to be parsed, otherwise apps that don't use Qt will fail the sis file creation. RevBy: Miikka Heikkinen Conflicts: mkspecs/features/symbian/default_post.prf
| | * | Got rid of some "duplicate library" warnings.axis2011-02-211-1/+1
| | | | | | | | | | | | | | | | RevBy: Trust me
| | * | Changed various qmake constructs to support Windows.axis2011-02-182-9/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | RevBy: Thomas Zander Conflicts: mkspecs/features/symbian/symbian_building.prf
| | * | Fixed various quotation problems when porting to Windows.axis2011-02-181-6/+11
| | | | | | | | | | | | | | | | | | | | | | | | These should work for both Windows and UNIX platforms. RevBy: Thomas Zander
| | * | Renamed the symbian/linux-* mkspecs to symbian-*.axis2011-02-182-10/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was done for a number of reasons: - In order to get better consistency with the other mkspecs, which have the target system name followed by a hyphen and the compiler name. - There is no real reason why we should have specific mkspecs for compiling Symbian under Linux, when it is equally likely to work under other operating systems. RevBy: Thomas Zander Conflicts: src/s60main/s60main.pro
* | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-tools-staging into ↵Qt Continuous Integration System2011-03-281-3/+3
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-tools-staging: Designer: Fix tab order in action editor dialog. Make QtUiTools use the lib-infix passed to configure.
| * | | | Make QtUiTools use the lib-infix passed to configure.Friedemann Kleint2011-03-251-3/+3
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | Patch contributed by OpenEmbedded project. Reviewed-by: hjk Task-number: QTBUG-7169
* | | | Merge remote-tracking branch 'origin/master' into lighthouse-masterJørgen Lind2011-03-171-0/+9
|\ \ \ \ | |/ / / | | | | | | | | | | | | Conflicts: mkspecs/qws/macx-nacl-g++/qplatformdefs.h
| * | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Thiago Macieira2011-03-111-0/+9
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | 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-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | Objective-c prf may not override OBJECTIVE_CFLAGS settings.con2011-03-101-9/+0
|/ / / | | | | | | | | | Reviewed-by: Morten Johan Sørvig
* | | don't add extraneous empty command linesOswald Buddenhagen2011-03-012-2/+2
| | | | | | | | | | | | Reviewed-by: mariusSO
* | | minor cleanup of the QMAKE_POST_LINK command line constructionOswald Buddenhagen2011-03-011-2/+2
| | | | | | | | | | | | | | | | | | | | | don't over-$$quote(), consistently use a single string instead of a string list Reviewed-by: mariusSO
* | | silence qmake warning about unbalanced parenthesesOswald Buddenhagen2011-03-011-1/+1
| | | | | | | | | | | | this is stupid, but i don't feel like fixing qmake now
* | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-02-231-3/+3
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | Conflicts: src/gui/kernel/qcocoaview_mac.mm src/s60installs/bwins/QtGuiu.def src/s60installs/eabi/QtGuiu.def src/testlib/qtestcase.cpp
| * | Only add NetworkServices capability automatically if no caps are set.Miikka Heikkinen2011-02-211-3/+3
| |/ | | | | | | | | | | | | | | | | | | This allows overriding the NetworkServices capability for the applications that do not need the capability even though they link network, webkit, or declarative. It is also more intuitive as there are no magic additions to user defined capabilities. Task-number: QTBUG-17540 Reviewed-by: Janne Koskinen
* | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-02-171-3/+3
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | Conflicts: mkspecs/features/symbian/symbian_building.prf mkspecs/symbian-gcce/qmake.conf src/corelib/global/qnamespace.h src/corelib/global/qnamespace.qdoc src/plugins/plugins.pro tests/auto/qstylesheetstyle/tst_qstylesheetstyle.cpp tools/designer/src/components/signalsloteditor/signalslot_utils.cpp tools/designer/src/components/signalsloteditor/signalsloteditorwindow.cpp
| * Apply the gcce link rules for LIBS_PRIVATE too.Liang Qi2011-02-111-3/+3
| | | | | | | | | | | | It's needed by building QtOpenGL of Qt for Symbian on Linux and Mac with gcce at least. RevBy: axis
generated by cgit v0.12 at 2025-01-16 10:48:08 (GMT)