| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
|
|
|
|
|
| |
On macOS, if pkg-config is not used, we modify
CMAKE_SYSTEM_FRAMEWORK_PATH and CMAKE_SYSTEM_PREFIX_PATH to avoid
picking up libs from homebrew or macports. This must be done in the
configure tests too. Otherwise the find_package commands may return
different things for configure tests and the Qt build itself.
Task-number: QTBUG-97076
Change-Id: I91d51aac46e2be73186b49bdcc54fb640e9b0691
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
On macOS, if pkg-config is not used, we modify
CMAKE_SYSTEM_FRAMEWORK_PATH and CMAKE_SYSTEM_PREFIX_PATH. This must be
done in the configure tests too. Otherwise the find_package commands
may return different things for configure tests and the Qt build itself.
In this case, assimp was picked up from brew in the configure test but
not in the Qt build.
Task-number: QTBUG-97076
Change-Id: Ib43ceebe78768267a60142c5a4235eab7ac18c81
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Needed for subsequent change that will check and error out if the
version is lower than 3.16. We do that to ensure all policies
introduced by CMake up to version 3.16 have their behavior set to
NEW.
Pick-to: 6.2
Task-number: QTBUG-95018
Change-Id: I29beb4b263c915d3ff5312a3b1ceb45e8fdc34e0
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
|
|
|
|
|
| |
Change-Id: If6c887c6356a160a5f3fb906d38a341fff0c7b29
Reviewed-by: Mike Krus <mike.krus@kdab.com>
|
|
|
|
|
|
|
| |
Use same submodule as QtQuick3D
Change-Id: I0c138d1cbf5ff545438a7673ccb71a2236729377
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
|
|
|
|
|
|
|
|
|
|
|
| |
Qt3D expects new version of assimp. Use new animation stuff to check new
version.
Task-number: QTBUG-59121
Change-Id: I3988beaab5b7dac825c67a225f785130be99aad6
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
|
|
|
|
|
|
|
| |
Tested on Linux, macOS and Windows
Change-Id: I4522e2c0ca07d7bbbf6e2918458b08be7e73c7e4
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
|
|
|
|
|
|
|
|
|
| |
Remove some duplicated code between the assimp test and
assimp_dependency.pri and do all pkg-config related tests
during config time.
Change-Id: If97c4cf53cd0356e7ee4e618a8d645ea697b3dfc
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
|
|
|
|
|
| |
Change-Id: Ic5b9447ef9ba54124553775b973d616af22b7032
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
|
|
|
|
|
|
|
|
| |
Updated license headers to use new GPL-EXCEPT header instead of LGPL3 one
(in those files which will be under GPL 3 with exceptions)
Change-Id: I930c6234bfe720d38c596bbc3d1f39be75a7328b
Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
|
|
|
|
|
|
|
|
|
|
|
|
| |
follow the foo.pri & foo_dependency.pri pattern found in qtbase to
de-duplicate the code (and thus implicitly make it consistent) and
synchronize the conditionals in the configure test.
also document why we still can't enable the assimp sceneparser in all
configurations.
Change-Id: I3bdc30e077b6c9c7027a9311195c08a6c5f1fcf4
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
|
|
|
|
|
|
|
| |
This can be reverted following the merge from dev -> 5.5.
Change-Id: I7b85e64aa91d9ed81e3ef4d866e531056314d72e
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
|
|
|
|
|
|
|
|
| |
As for preparation for Qt5.5 release the copyright header is
updated to correspond the current license requirements.
Change-Id: I36632918b66f455539453b42c369689fb11298ec
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
|
|
|
|
|
| |
Change-Id: I684fe8b5abb03a44aed49819d3bad96cc11188cf
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
|
|
|
|
|
|
|
|
| |
The AssimpParser is now a SceneParser plugin that is build if config tests for
assimp succeed.
Change-Id: I0e3f6a6ce2a43298b71b0261084f6c79521f214d
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
|
|
Change-Id: Iee429485135f186c183701bd2b4d5ce3d1b13c28
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
|