summaryrefslogtreecommitdiffstats
path: root/mkspecs/features
Commit message (Collapse)AuthorAgeFilesLines
* gdb_dwarf_index: Use a sed call that's more POSIX-compliant.Raphael Kubo da Costa2013-08-131-1/+1
| | | | | | | | | | | | | | sed versions other than the GNU one often default to being POSIX-compliant, in which case "+" (with and without escaping) is always an ordinary character. Achieve the same functionality in a way that works with both GNU and BSD seds by using "xx*" insted of "x\+". Cherry-picked from qtbase/faea8d1056e4b034404febd0ef44a00e7784018d. Change-Id: I462e070992ff214a7261d45c208f2e5f3e962e8f Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Don't overwrite QMAKE_QT_CONFIG with empty valueJonathan Liu2013-06-061-1/+5
| | | | | | | | | | | | If the mkspec sets QMAKE_QT_CONFIG, QMAKE_QT_CONFIG may be overwritten with an empty value from .qmake.cache. Avoid this by first checking if the value from .qmake.cache is not empty before assigning it to QMAKE_QT_CONFIG. This was already addressed differently in Qt 5. Change-Id: I95fa630139b8798156a2fb15d0dde630a0a53a0a Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* qmake: increase .pro-file compatibility between Qt 4 and 5Marc Mutz2013-04-051-1/+12
| | | | | | | | | | | | | This patch makes qt.prf not warn about libraries in QT that are separate modules in Qt 5, but exist as part of some larger library in Qt 4. With this change, both Qt 4.8 and Qt 5 projects can use QT += widgets concurrent to continue compiling unchanged under either Qt version. Change-Id: I6f7c6a913377d7b44263c8ed152b272aa7ed9aa2 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* QNX: adjust settings for separate debug info featurePeter Hartmann2012-12-151-3/+10
| | | | | | | | | | | Patch-by: Greg Bentz Task-number: QTBUG-28247 (backport of commit b6250913be2fecedbc61738a47ff147f0a4ea240, Id Ibd1f959969a8678b828c8e8de8be0a200a632b22) Change-Id: I5e5b85fb0fce52ba50a1600bf91212f46b2597c8 Reviewed-by: Greg Bentz <gbentz@rim.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* don't set QT_BUILD_DIR as a side effectOswald Buddenhagen2012-10-302-7/+10
| | | | | | | | | | | | | we would be setting QT_BUILD_DIR to $$[QT_INSTALL_DATA] as a fallback, which would make qtPrepareTool() believe we were doing a qt build despite actually trying to build something against an installed qt. this would become apparent only when using a non-default directory layout, as is the case in our mac packages. Change-Id: I4f27e9427222ad3b9bb83fcc625bab19e00db9be Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com> Reviewed-by: Teemu Katajisto <teemu.katajisto@digia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* optimize loading of qconfig.pri & qdevice.pri somewhatOswald Buddenhagen2012-10-172-5/+5
| | | | | | | | | avoid some expensive operations. note that this uses exists() where !isEmpty() would be more intuitive, but isEmpty() does not work on magic variables in qt4. Change-Id: I904463eb1021d208c21fc602af3228350756ed4b Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* QNX: change suffix for separate debug filesPeter Hartmann2012-10-021-7/+9
| | | | | | | | | | | QNX uses .sym for files containing debug symbols. Patch-by: Greg Bentz (cherry picked from commit 291e1a9e67499f6fa8285a1d4ed1ea6e8297dd5f) Change-Id: I03202da79de0f606c7c99a2db986d2343e51663d Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* find qdevice.pri even for installed qt buildsOswald Buddenhagen2012-09-101-1/+1
| | | | | Change-Id: Ife18068974227d70c52e7cb0d06e6136827ac562 Reviewed-by: Mark Brand <mabrand@mabrand.nl>
* Minimal backport of --device-option support in configurePeter Kümmel2012-09-071-0/+14
| | | | | | | | | | This parial backport only adds the --device-option so it becomes possible to set and cache additional qmake variables. Partial cherry pick from qtbase/84e98fd9d2594637e928096c8fcb19d52e5e2676 Change-Id: I96636766aec7e12bfb1d377c8a607301a325a46c Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Fix vcproj file generation for incredibuild handling of moc etc targetsAndy Shaw2012-08-141-1/+2
| | | | | | | | | | | | | | | When incredibuild-xge had been turned on by configure then it was not ensuring that the generated vcproj files had the right extra comments needed to make incredibuild run moc and other tools in parallel. By fixing the prf file to get around a problem in the parser this is now respected. Task-number: QTBUG-14482 Change-Id: Ifd24bde2db7d80d3a52719c733d15f228c7b3534 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com> (cherry picked from commit fb3c850581953983588d49391f40f03cc7e61e62)
* Symbian: clean deffiles for external projects using Qt infixPasi Pentikainen2012-02-011-1/+2
| | | | | | | | | | | When external projects use the infix configuration of Qt (QT_LIBINFIX), they can make their own library targets infixed. This fix cleans the infix from deffile names for such projects also, as long as the project defines variable QT_LIBINFIX_USED. Change-Id: Ifaf773c60d1ebe6f947f1cd44b76428de1c23dbf Reviewed-by: Gareth Stockwell <ext-gareth.stockwell@nokia.com> Reviewed-by: Shane Kearns <ext-shane.2.kearns@nokia.com>
* Fix DEPLOYMENT_PLUGIN for graphicssystem pluginsMiikka Heikkinen2012-01-311-1/+1
| | | | | | | | | ALLQTPLUGINS value had extra space in qt.prf, making graphicssystem plugins not have correct path when specified in DEPLOYMENT_PLUGIN. Task-number: QTBUG-23963 Change-Id: I67a36fa7fafd7ed0960e197fe3401fc6dd779578 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Symbian: Fix language mappings for localize_deploymentMiikka Heikkinen2011-12-071-2/+3
| | | | | | | | Some Qt language codes now map to two Symbian language codes. Also added the missing en_in mapping. Task-number: ou1cimx1#947060 Reviewed-by: Pasi Pentikainen
* Merge branch 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration ↵Qt Continuous Integration System2011-11-151-0/+4
|\ | | | | | | | | | | | | | | | | | | | | | | | | into master-integration * 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration: tests: allow unstable tests to be marked with CONFIG+=insignificant_test Fix focusScopeItemChange setting crash Fix crash in QHttpNetworkReplyPrivate::gunzipBodyPartiallyEnd symbian - handle path being passed as part of filename in QTranslator Symbian - fix compile error when default configured Compile when -no-rtti is specified as a configure option Ensure that the RC_FILE is correctly handled in a single configuration
| * Merge branch 4.7 into qt-4.8-from-4.7Sergio Ahumada2011-11-151-0/+4
| |\
| | * tests: allow unstable tests to be marked with CONFIG+=insignificant_testRohan McGovern2011-11-151-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Marking a test with CONFIG+=insignificant_test will cause the exit code of the test to be discarded during `make check'. This is intended to be used for tests which are valuable to run, but are known to be unstable and are not feasible to immediately fix. Reviewed-by: Jason McDonald Change-Id: I50a712c33c2ebb0af39f1ea0bf2adef7f0936425 (cherry picked from commit b0a5a988900b777cb08012408eb108512a3e873b)
* | | fix gdb_dwarf_index.prf for applications, take twoJoerg Bornemann2011-11-101-2/+3
| | | | | | | | | | | | | | | | | | Handle the case of an empty DESTDIR. Done-with: ossi
* | | fix gdb_dwarf_index.prf for executablesJoerg Bornemann2011-11-091-2/+9
|/ / | | | | | | | | | | | | Unlike for libraries, $(TARGET) already contains $(DESTDIR). Changing to $(DESTDIR) does break the command in that case. Reviewed-by: ossi
* | Symbian: Parse ts filenames case-insensitively for localize_deploymentMiikka Heikkinen2011-09-301-19/+19
| | | | | | | | | | | | | | | | | | | | 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
* | Merge remote-tracking branch 'qt/4.8'Sami Lempinen2011-09-202-9/+28
|\ \
| * | 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>
| * | 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
* | | 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
* | 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.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
generated by cgit v0.12 at 2025-09-26 19:48:43 (GMT)