Qt Base (Core, Gui, Widgets, Network, ...)
Go to file
Alexandru Croitor 659d8cf3e5 Fix add_qt_resource to handle resources in static builds properly
Whenever the qml compiler is used to process qml files from a
resource, and there are no resources left after all qml files have
been processed, make sure to propagate the created resource target
to add_qt_resource, so that the target is associated properly with
an export name.

Additionally the generated qml cache loader file uses private Qml
headers. Thus the object library that contains the cpp file should
have qml as a dependency (and not the target that will link to the
object library).

Change-Id: Ib385a900823df3e015492cdd06acd8a0cb9f8e9a
Reviewed-by: Leander Beernaert <leander.beernaert@qt.io>
Reviewed-by: Qt CMake Build Bot
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2019-08-30 19:02:52 +00:00
bin Merge branch 'wip/qt6' into wip/cmake 2019-08-15 16:53:19 +02:00
cmake Fix add_qt_resource to handle resources in static builds properly 2019-08-30 19:02:52 +00:00
coin Share most common part of module_config.yaml 2019-08-30 08:40:02 +00:00
config.tests Merge branch 'wip/qt6' into wip/cmake 2019-08-15 16:53:19 +02:00
dist
doc Merge remote-tracking branch 'origin/wip/qt6' into wip/cmake 2019-07-11 17:17:51 +02:00
examples Update public CMake macros' version 2019-08-23 10:04:30 +00:00
lib
mkspecs Merge remote-tracking branch 'origin/5.13' into dev 2019-08-01 01:00:10 +02:00
qmake Merge branch 'wip/qt6' into wip/cmake 2019-08-15 16:53:19 +02:00
src Fix default platform plugin choice for WASM 2019-08-30 13:21:44 +00:00
tests Regenerate tests that use helper processes 2019-08-23 09:25:27 +00:00
util Fix Harfbuzz detection 2019-08-30 13:21:32 +00:00
.gitattributes
.gitignore Merge remote-tracking branch 'origin/wip/qt6' into wip/cmake 2019-07-11 17:17:51 +02:00
.qmake.conf Merge remote-tracking branch 'origin/dev' into wip/qt6 2019-08-06 12:24:37 +02:00
.tag
CMakeLists.txt Fix exporting of Core tools 2019-07-24 09:01:24 +00:00
INSTALL
LICENSE.FDL
LICENSE.GPL2
LICENSE.GPL3
LICENSE.GPL3-EXCEPT
LICENSE.LGPL3
LICENSE.LGPLv3
LICENSE.QT-LICENSE-AGREEMENT-4.0
config_help.txt
configure Merge branch 'wip/qt6' into wip/cmake 2019-08-15 16:53:19 +02:00
configure.bat
configure.cmake Fix mapping of features to private features 2019-07-22 08:29:33 +00:00
configure.json Merge branch 'wip/qt6' into wip/cmake 2019-08-15 16:53:19 +02:00
configure.pri Merge remote-tracking branch 'origin/5.12' into 5.13 2019-07-12 12:23:29 +02:00
header.BSD
header.COMM
header.FDL
header.GPL
header.GPL-EXCEPT
header.LGPL
header.LGPL-NOGPL2
header.LGPL-ONLY
header.LGPL3
header.LGPL3-COMM
header.MIT
qtbase.pro
sync.profile