summaryrefslogtreecommitdiffstats
path: root/.qmake.conf
Commit message (Collapse)AuthorAgeFilesLines
* Bump versionKari Oikarinen2019-02-251-1/+1
| | | | Change-Id: I945e3f606c2dc1c72e9f8c38952274f90d60161e
* Bump versionOswald Buddenhagen2018-10-111-1/+1
| | | | Change-Id: I2d13fcbb87961d8c52190ef978f1fdc3c36acc12
* Bump versionOswald Buddenhagen2018-02-191-1/+1
| | | | Change-Id: I378de287933060ad84911286ca269675057eda8b
* Bump versionFrederik Gladhorn2017-09-041-1/+1
| | | | Change-Id: I8d5439ceeca957201f7074cb2d4ca9cc0fbdcd7b
* Bump versionOswald Buddenhagen2017-02-021-1/+1
| | | | Change-Id: I1ffbb56e768a3e5be72d0f51937400ea0e38aa44
* Bump versionOswald Buddenhagen2016-08-291-1/+1
| | | | Change-Id: I0bcdd0ff6c85af8a579f962343149b2ada9cba8a
* Merge remote-tracking branch 'origin/5.7' into devLiang Qi2016-06-131-1/+0
|\ | | | | | | | | | | | | Conflicts: src/plugins/qmltooling/qmldbg_profiler/qqmlprofilerservice.cpp Change-Id: I26d6435a29cac3840bb567ade5149c2562a94bf9
| * Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-06-101-1/+0
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Part of 0e053528 was reverted in the merge, about lastTimestamp. It will be applied later in separate commit. qmltest::shadersource-dynamic-sourceobject::test_endresult() was blacklisted on linux. Conflicts: .qmake.conf tests/auto/qml/debugger/qqmlprofilerservice/tst_qqmlprofilerservice.cpp tests/auto/qmltest/BLACKLIST tests/auto/qmltest/qmltest.pro Task-number: QTBUG-53590 Task-number: QTBUG-53971 Change-Id: I48af90b49a3c7b29de16f4178a04807f8bc05130
| | * do not enable example installs explicitly any moreOswald Buddenhagen2016-05-241-1/+0
| | | | | | | | | | | | | | | | | | | | | it's done centrally now. Change-Id: I4c0641f988da7c6bd0522453a2c7e10c8d640f02 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| | * Bump versionOswald Buddenhagen2016-05-191-1/+1
| | | | | | | | | | | | Change-Id: Id97d3672ea1bd153df57f8986994accd70ae798f
| | * Bump versionOswald Buddenhagen2016-02-081-1/+1
| | | | | | | | | | | | Change-Id: Ife0809638e3af50304c37931cae3c5d16906b936
* | | Bump versionOswald Buddenhagen2016-02-241-1/+1
|/ / | | | | | | Change-Id: Iddb9c8504c2d985dd13c471bd4a375e08c03c99e
* | Bump versionOswald Buddenhagen2015-09-101-1/+1
|/ | | | Change-Id: I4c5599953e0b12f7955513d38ccbf211889c54ab
* Bump versionOswald Buddenhagen2015-02-241-1/+1
| | | | Change-Id: I5b5e234edb901e7f38cdd21ac1148867b6f307f9
* Bump versionOswald Buddenhagen2014-08-091-1/+1
| | | | Change-Id: I439d6cbb0d5f67aad72ea3a5ed7a2c3db5119c2c
* Bump module version to 5.4.0Thiago Macieira2014-02-281-1/+1
| | | | | | Change-Id: Iba0502c83eb32f24691a4c0645ba1434033bfbc4 Reviewed-by: Sergio Ahumada <sahumada@blackberry.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Merge branch 'stable' into devSergio Ahumada2013-11-271-18/+0
|\ | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I10d4f9e993d23750a6e8ddc1291b79e47fc83c64
| * Bump MODULE_VERSION to 5.2.1Sergio Ahumada2013-11-201-1/+1
| | | | | | | | | | Change-Id: I211610ee4153fa1e24de085d64bd735ce3746ae0 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
| * Remove the last C++ exceptions from QtQmlLars Knoll2013-10-301-17/+0
| | | | | | | | | | | | | | | | Also clean up and compile the repository with exceptions disabled again. Change-Id: I653ae89353284b2f4ab884384f8ea6a5d100785d Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* | Bump qtdeclarative version to 5.3.0Thiago Macieira2013-09-241-1/+1
|/ | | | | Change-Id: I3eee67a18f24ac5b68e7cc9dc1ba256746dbbb9e Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* Enable -Werror for qtdeclarativeAlan Alpert2013-09-111-0/+1
| | | | | | | | | | | | This allows CI to screen for warnings in src and tools code. It does not apply to examples or tests. This is the same as commit 7012db159bc4196444ace26991b24a31e3fba495 in qtbase. Change-Id: I0ea00fbd4b45156dedabfd16a3cb3e5f6170f23f Reviewed-by: Alan Alpert <aalpert@blackberry.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Fix crashes in tst_qquickcanvasitem with older Ubuntu toolchainsSimon Hausmann2013-07-221-0/+5
| | | | | | | | | | | | | Older versions appear to be much more sensitive to missing unwind tables, and as it turns out: We were compiling QtQuick (not QtQml) with -fno-exceptions. Since the entire module has access to the private V4 API and may therefore be subject to exception traversal, make sure to compile the entire module with CONFIG += exceptions. Change-Id: If2d029879392c22af7da2f1bba94366d51518226 Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
* Fix JavaScript stack back trace generation in release builds on WindowsSimon Hausmann2013-07-171-0/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | We need to be able to reliably generate stack back traces for JavaScript calls, and since we use the C stack we therefore need to be able to reliably walk the stack. On most platforms the stack back trace generation is tied to the same mechanism that's used to unwind the stack during exception handling, which uses compiler generated per-function tables that allow the run-time to unwind the stack even when no regular stack frame was created. Unfortunately on i386 on Windows there are no unwinding tables in use (as opposed to all other architectures Windows runs on), and therefore we have no reliable way of generating a stack back trace if functions can omit the generation of a stack frame. Therefore we have to disable this compiler optimization, using -Oy- for MSVC (see http://msdn.microsoft.com/en-us/library/2kxx5t2c(v=vs.71).aspx ) and -fno-omit-frame-pointer for gcc. Technically this change needs to be done only in places where we support throwing or catching V4 exception as well as code that is traversed during the unwinding. Due to the use of internal V4 api throughout the entire module, this patch is applied to .qmake.conf. This also fixes tst_qqmlvaluetypes Change-Id: I21a9e5522741446de25a5d0046f7e34f741f7722 Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
* Update module version to 5.2.0Frederik Gladhorn2013-03-281-1/+1
| | | | | Change-Id: Iedf4bf32512c218e3ad9b89a1ad25b971b828b58 Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* Bump MODULE_VERSION to 5.1.0Sergio Ahumada2013-03-261-1/+1
| | | | | Change-Id: I3d794f16eb81634b9fe69d4fc9559be19cf3a998 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* define MODULE_VERSIONOswald Buddenhagen2013-02-271-0/+2
| | | | | | Task-number: QTBUG-29838 Change-Id: I03ce9975ede5cff53e976409e2fabff1f56e1ea9 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* centralize and fixup example sources install targetsOswald Buddenhagen2012-12-101-0/+1
| | | | | | | | follow respective change in qtbase Change-Id: I27502eb7ebea973e19ec5f7c3ec0e2338556f6e0 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Alan Alpert (Personal) <416365416c@gmail.com>
* centralize load(qt_build_config)s in .qmake.confOswald Buddenhagen2012-09-111-0/+1
Change-Id: Ide2e054e9b5b58976410d16ca4f76fd55e61676d Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>