| Commit message (Collapse) | Author | Age | Files | Lines |
|---|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Checking for android_app scope does not make sense in subdirs
projects, it's expected that it is explicitly set as CONFIG +=
android_app in a standalone executable project. When the config
is set, instead of creating an .so file, a true Android CLI
executable is created.
This is seemingly a relic from a time when there existed an
Android mkspec that allowed building Qt without the .so
requirement.
Thus remove the android_app scope.
Also exchange the static scope, with a contains(CONFIG, static)
scope, so that pro2cmake can deal with the condition better.
Keep the qmlcachegen target commented, due to it being built
in the src project.
Finally regenerate the CMake project, to exclude certain apps
being built by default, thus fixing failures when building a
simulator_and_device iOS configuration.
Task-number: QTBUG-80899
Change-Id: Ief89d85c3a238c4a002ab6d98ee2596508cf130b
Reviewed-by: Simon Hausmann <hausmann@gmail.com>
|
| |
|
|
|
|
|
|
|
|
| |
A slightly modified commit will-be relanded once a dependent
change in qtbase is merged and propagated to qtdeclarative.
This reverts commit e4f1c1068bccea38889ba1d66dfcecacbb9f6634.
Change-Id: Ia7ca2f5f3b7d2ad2d07e380b3853aca87d779d18
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
It would fail the iOS multi-arch build otherwise, at link time
with
Undefined symbols for architecture x86_64:
"_adler32", referenced from:
_png_icc_set_sRGB in libQt6BundledLibpng.a(png.c.o)<Paste>
....
This is due to us using system zlib instead of bundled zlib. Because
system zlib only has one slice of architectures (either device or
simulator), we get the above linker error.
Solution is not to link (build) the apps at all).
This is consistent with what qmake does.
Change-Id: Ief2e63a8da49f9daac4f5542e78b0f0b3d37ed93
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
|
| |
|
|
|
|
| |
Change-Id: If8daa6152a563d4309d7342414780ef75b9f5589
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
Reviewed-by: Leander Beernaert <leander.beernaert@qt.io>
|
| |
|
|
|
| |
Change-Id: Ie8aca222809f35174fb6c6488832ec3ff5432272
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
|
| |
|
|
|
|
|
|
| |
It is now done automatically in QtPostProcess.cmake.
Change-Id: Ib95d68adbbb29fff5896fd19c24597db4024807e
Reviewed-by: Qt CMake Build Bot
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
|
| |
|
|
|
|
|
|
|
|
|
| |
Make the qmlcachegen target visible in src. This will allow the use of
compiling .qml files such as src/imports/testlib/*.qml ahead of time.
We might move the sources over from tools/ in the future, but for cmake
this isn't necessary -- as long as the targets are defined.
Change-Id: I0755c6cb5c78fcb144c067d2b50092e42bb6f65a
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
|
| |
|
|
|
|
|
|
| |
Export all available Qml tools with an install. They were previously
missing.
Change-Id: Id054997ef17c14bd95c2f46ee01bc07493d2f90b
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
|
| |
|
|
| |
Change-Id: I2963c1209316fb6755f572969f368970450d7991
|
|
|
Also fix up QmlDevTools module to not depend on QtQml,
but instead make it include the headers / cpp files as it is done
in the qmake project.
Change-Id: I240c52d5357db150a7c0c819892fb0a3708ceee4
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
|
