summaryrefslogtreecommitdiffstats
path: root/.qmake.conf
Commit message (Collapse)AuthorAgeFilesLines
* Remove .qmake.conf from this repositoryJoerg Bornemann2021-09-201-8/+0
| | | | | | | | | | | | | | This file was necessary for the qmake build and the CI. The qmake build is history, and the CI does now read .cmake.conf (see QTQAINFRA-4392). In addition to being superfluous, the existence of .qmake.conf triggers QTBUG-76140 when building Qt examples with qmake. Removing the file alleviates the symptoms of this bug. Fixes: QTBUG-92271 Change-Id: I169796a041cf03fbbb4456839bdf45ff623a3639 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Bump versionJani Heikkinen2021-09-141-1/+1
| | | | Change-Id: Icd8250391057bfde5f221e34a3502ea7da3a0cc2
* Switch builds to cmakeMichal Klocek2021-05-221-1/+1
| | | | | | | | | | | | | | | | | * move the sync profile, so we can sync headers for the libs project * update dependencies * add coin module config * extend timeout for build * bump version to 6.2 * disable qmake build by deleting the main pro file * tweak product dependencies, cheat and point to even not merged change Task-number: QTBUG-91760 Change-Id: I02d6cda3a4ce09575ae993836b5089e1655401b9 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
* Merge remote-tracking branch 'origin/5.15' into devAllan Sandfeld Jensen2021-03-161-1/+1
|\ | | | | | | Change-Id: I0dd7c64669f4b130047a4a3836f62f7ee5b5f8d9
| * Bump version from 5.15.3 to 5.15.4Jani Heikkinen2021-03-051-1/+1
| | | | | | | | | | Change-Id: I3fc5bcd40a0b4b7dba88659a9171e93bb3c82f3a Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| * Bump versionJani Heikkinen2020-10-271-1/+1
| | | | | | | | Change-Id: I2078fd303183899ab215c9b627f47c75a9ad1a82
| * Bump versionJani Heikkinen2020-09-281-1/+1
| | | | | | | | Change-Id: I5dfb1db3a7d4ba825cf66c155af89252b60e6cdf
| * Bump versionAlexandru Croitor2020-07-301-1/+1
| | | | | | | | Change-Id: I1123d21fca65ea4daf84e1143032619ca18c51fa
| * Bump versionKari Oikarinen2019-08-271-1/+1
| | | | | | | | Change-Id: I182696c33f298e03d808e8fd3e30ed0754d74002
* | Fix Qt6 buildAlexandru Croitor2019-08-131-1/+1
|/ | | | | | | | | | | | Fix Qt 6 incompatible source usages. Also bump version. Also make sure in a framework build, the process executable is placed under the correct major version directory. Also remove the ABI compatibility fixes that we did for malloc symbols and friends. Change-Id: Ie26f660502a20afd2a79334c9b4f07d9a14a1ed3 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Bump versionKari Oikarinen2019-02-251-1/+1
| | | | Change-Id: I523e3b0b6929acac3bff58d7d44da2af46748ef3
* Bump versionOswald Buddenhagen2018-10-111-1/+1
| | | | Change-Id: Iac6ca7c8392fb87621dccbed257e4ace4038a88a
* Bump versionOswald Buddenhagen2018-02-191-1/+1
| | | | Change-Id: Ie42c87702e88b322ea01e34ea786d7ee0da66b0b
* Bump versionFrederik Gladhorn2017-09-041-1/+1
| | | | Change-Id: I701139c5bdbc463eebd4b1ef702e6ce226c9ba32
* Merge remote-tracking branch 'origin/5.9' into devAllan Sandfeld Jensen2017-05-301-2/+0
|\ | | | | | | Change-Id: I962033871a1ef624807a4e1869fe869406aa73f7
| * Bump versionOswald Buddenhagen2017-05-101-1/+1
| | | | | | | | Change-Id: I77ffe8325e30fdd09f76ade1dc002d9550a4e178
| * Move qmake files to standard locationsAllan Sandfeld Jensen2017-05-021-2/+0
| | | | | | | | | | | | | | | | | | | | The tools/qmake directory is a left over from webkit where qmake was but one of many buildsystems. This is not necessary for qtwebengine, so we can instead use the standard locations. Change-Id: I3d126d6627295b113b091f3eabeee25f1c1f6183 Reviewed-by: Kai Koehne <kai.koehne@qt.io> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
* | Bump versionOswald Buddenhagen2017-02-021-1/+1
|/ | | | Change-Id: I261a4b2055f441e25e22a24961b614ffaf20786a
* Merge remote-tracking branch 'origin/5.8' into devAllan Sandfeld Jensen2016-11-241-0/+5
|\ | | | | | | Change-Id: Ib2a1eb4dfae2fb5a98066d3d0f8f09f4e1d61d3f
| * Start using new config systemAllan Sandfeld Jensen2016-11-101-0/+1
| | | | | | | | | | | | | | | | | | | | Adds the optionproprietary codecs to configure.json, so it can be selected by the global configure, and is summarized there too. Keeps the old system for compat with building against older Qt. Change-Id: I5deba10f2e25445870cbdc7507155b0b76c307de Reviewed-by: Michael Brüning <michael.bruning@qt.io>
| * move setup of QTWEBENGINE_ROOT to .qmake confOswald Buddenhagen2016-11-071-0/+4
| | | | | | | | | | | | | | less effort, more standardized. Change-Id: Iee03d85b2d3fea2721a5271874b876f411ef8ce9 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* | Bump versionOswald Buddenhagen2016-08-291-1/+1
|/ | | | Change-Id: I8adcc49179cd03359e2f3810a29aa1610b6beecd
* Merge branch '5.7' into devAllan Sandfeld Jensen2016-06-141-1/+0
|\ | | | | | | Change-Id: I1ecb615b8df1303c27b6609970502920123b3610
| * Merge remote-tracking branch 'origin/5.6' into 5.7Allan Sandfeld Jensen2016-05-311-1/+0
| |\ | | | | | | | | | Change-Id: I561c00b3a844ab493a5bf0148a5923662842cf5d
| | * do not enable example installs explicitly any moreOswald Buddenhagen2016-05-241-1/+0
| | | | | | | | | | | | | | | | | | | | | it's done centrally now. Change-Id: Ifd2d67f4b921ea36221122243aa49e72b76b8e25 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* | | Merge remote-tracking branch 'origin/5.7' into devMichael Bruning2016-03-221-0/+1
|\| | | | | | | | | | | Change-Id: I8aff2a3d2d4ae9351dc65689a4db9d3ab0d017b3
| * | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-03-211-0/+1
| |\| | | | | | | | | | | | | | | | | | | | | | Conflicts: src/3rdparty src/webenginewidgets/doc/src/qwebenginepage_lgpl.qdoc Change-Id: I90728e965399e51b626d538924de955f9abab5fe
| | * Mark qtwebengine as warning_cleanKai Koehne2016-03-091-0/+1
| | | | | | | | | | | | | | | Change-Id: Idb378399db4136ae69a49c71d92b9e09afddc260 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
| | * Bump versionOswald Buddenhagen2016-02-171-1/+1
| | | | | | | | | | | | Change-Id: Idf342287876a876ae33807ff05eb218ce483f15a
* | | Bump versionOswald Buddenhagen2016-02-231-1/+1
|/ / | | | | | | Change-Id: I44b4b2da22f8362aec1cbe95754dfc51c73932f8
* / Bump versionOswald Buddenhagen2015-09-101-1/+1
|/ | | | Change-Id: I09a1063d86184d9fa8ed9cbf41269795d19c697e
* Bump versionOswald Buddenhagen2015-02-241-1/+1
| | | | Change-Id: I6e194ca21a8da991f5495156c95c12dc721ee158
* Update the version number to 5.5.0Jocelyn Turcotte2014-12-041-1/+1
| | | | | Change-Id: Ice525f351fab9db9208611a5b0efa04f5232365d Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
* Use the same version scheme as other Qt modulesJocelyn Turcotte2014-09-111-3/+1
| | | | | | | | | | | | | | | | After trying to get rid of all private header includes, the last standing one is qplatformnativeinterface.h even though its name previously suggested that it isn't private. This would be a complicated piece to expose publically in a way both flexible and binary compatible, and is a task heavy enough to justify committing to follow Qt's release cycle. The QML import version remains to 1.0 and will be incremented the same manner as QtQuick itself does. Change-Id: I6fab5f229d9f79dbc7a3e82d65ad324020929863 Reviewed-by: Michael Bruning <michael.bruning@digia.com>
* Hardcode the module version to not confuse syncqt.plMichael Brüning2014-09-031-5/+1
| | | | | | | | | syncqt.pl uses a combination of echo and sed to retrieve the module version. It cannot run qmake, which would be necessary for evaluating the version dynamically. Change-Id: Ibdd95da5dc26edf18f005ab7f82e83136acd795e Reviewed-by: Andras Becsi <andras.becsi@digia.com>
* Update the library and QML version to 1.0Jocelyn Turcotte2014-08-121-1/+7
| | | | | | | | Also update all the examples to use 1.0 as 0.9 shouldn't be publically recommended. Change-Id: Ic58e35bdfd3a0f3d5201fc069b7103027ba84574 Reviewed-by: Andras Becsi <andras.becsi@digia.com>
* Set the QtWebEngine modules version to 0.9.0Jocelyn Turcotte2014-05-161-2/+1
| | | | | | | | | | | | | | | | | | | | Also make sure that this version number appears in the user agent string and in the QML imports. The plan, unlike other Qt modules, is to keep our module and QML versions in sync to make it easy for developers to figure out what API is available in a given version. The QTWEBENGINECORE_VERSION_STR define is explicitly set in the .pro file since we don't call syncqt to generate a version header for the core module. The 0-major version currently causes the library name to start with libQt0 instead of libQt5, but this is something that we can fix in qtbase once we want to officially support linux desktop with QtWebEngine 1.0.0. Change-Id: I31915e84869b4db456416ef1f85a2296b8a06c99 Reviewed-by: Pierre Rossi <pierre.rossi@gmail.com> Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* Fix installation of most examplesSimon Hausmann2014-01-151-0/+1
| | | | | | | | | | * Make sure the example source code is installed * Make sure the installation path is consistent with the path within the module, to ensure that the sources end up next to the compiled binary. * Skip the widgets nano browser from the installation, as it's a developer tool. Change-Id: I35b421e12f8e6ddd3f2045e318b21543ff929cd8 Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
* Moving sources to src part 2: Adjust paths.Jocelyn Turcotte2013-11-281-1/+1
| | | | | | | | | | | | | | | | | | | NOTE: To build after this you should rerun init-repository.py or run $> git submodule sync $> git submodule update $> git config qtwebengine.chromiumsrcdir src/3rdparty This makes everything build by adjusting paths. Other mixed-in changes: - Rename qtwebengine_src variables in scripts to qtwebengine_root to avoid confusion. - Cleanup the release and debug extra targets that were in lib.pro. This file has also been split into src.pro and core.pro. Change-Id: Ieee9158a65f526b15244eaca59e779b7069d337e Reviewed-by: Zeno Albisser <zeno.albisser@digia.com> Reviewed-by: Pierre Rossi <pierre.rossi@gmail.com>
* Split out the Widgets and QtQuick integrationPierre Rossi2013-07-311-3/+2
| | | | | | | | | | | | | | | This is the first step to making proper Qt Modules out of QtWebEngine. The Widgets integration becomes a proper C++ Qt Module while we make the QtQuick side a QML plugin for now (could probably be promoted if the need arises). Code-wise, this means the introduction of a WebContentsAdapterClient interface that is subclassed by the private implementation of our API classes for delegation of things that are UI specific. Functionality from WebContents and the like is exposed via the WebContentsAdapter. Change-Id: I4ca3395b9fe8502a24e36002cfd5af44067bb6e8 Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
* New qmake approachPierre Rossi2013-04-291-0/+6
This should allow us to have much better integration by generating the necessary gyp files directly from qmake. Mostly works for now, though we will most likely need to build the gyp generation as we go. * Out dir logic is still crap and needs to be (re)worked. * In the same vein, we probably don't want the generated gyp content ending up in the source tree in the long run, which could prove tricky with relative paths to sources and all.
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-16 11:01:11 +0000