summaryrefslogtreecommitdiffstats
path: root/libexec
Commit message (Collapse)AuthorAgeFilesLines
* Install 3rdparty headers for static buildsMichal Klocek2022-02-191-2/+10
| | | | | | | | | | | | | | | | | | | | | | | | | For static builds we need 3rdparty headers to be installed. Leaf modules like qtwebengine needs 3rdparty libs and header for zlib, freetype, harfbuzz, png, jpeg. Without those the Chromium bundled versions are used, however it might end up badly if qt has already bundled one. Introduce new header only modules with additional arguments for qt_internal_add_module: * EXTERNAL_HEADERS to pick exactly which headers are public * EXTERNAL_HEADERS_DIR to include whole directory preserving the files directory structure Fix qtsync so it keep directory structure for all non-qt modules when syncing headers and do not generate warnings for headers files. Task-number: QTBUG-87154 Task-number: QTBUG-88614 Change-Id: If1c27bf8608791cd4e0a21839d6316a445a96e9f Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> Reviewed-by: Alexey Edelev <alexey.edelev@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
* Fix various configure time warnings about missing QT_BEGIN_NAMESPACEKai Köhne2021-11-011-1/+1
| | | | | | | | | | | | | | | | | We now have a couple of global.h headers that do only start with 'q'. We can't change this anymore, so let's just accommodate for that. This fixes the following warnings qtserialport/src/serialport/qserialportglobal.h does not include QT_BEGIN_NAMESPACE qtwebsockets/src/websockets/qwebsockets_global.h does not include QT_BEGIN_NAMESPACE qtwebchannel/src/webchannel/qwebchannelglobal.h does not include QT_BEGIN_NAMESPACE Pick-to: 6.2 Fixes: QTBUG-97831 Change-Id: I12aae13eb0d782d366cb84999392a544c30cdd79 Reviewed-by: Alexey Edelev <alexey.edelev@qt.io> Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
* Teach syncqt to filter out QT_DEPRECATED_* macrosJoerg Bornemann2021-09-071-1/+28
| | | | | | | | | | | | | | | | | | | | | | We already had code that filtered out QT_DEPRECATED_X("text"). But that isn't enough, because, by now, we have a true cornucopia of QT_DEPRECATED_* macros. And only some are called with an argument list. Move the filtering code into the subroutine filterDeprecationMacros, because our filtering is slightly more complex now: - Try to match a QT_DEPRECATED_* macro call. - Try to match balanced parentheses with a recursive regular expression. - Check whether the found balanced parentheses are directly behind QT_DEPRECATED_*, because only then it is the argument list of that macro. - Filter out what we've found. With this patch, syncqt doesn't discard deprecated classes anymore. Task-number: QTBUG-80347 Change-Id: I7872159639be330d5a039c98eac0c5007d9acb93 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Fix global header exclusion regexAlexey Edelev2021-07-091-1/+1
| | | | | | | | | | | Make the dot explicit in global header exclusion regex. Ensure that '.h' states in the end of file name and support paths. Amends 50b55b89f30d559bc262c0e81ef8a6beea39d183 Change-Id: I25b3d2fb54ed606a0b0806a10dbcb4ce1c65d2d8 Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
* Exclude 'global' headers from QT_BEGIN_NAMESPACE check in syncqt.plAlexey Edelev2021-07-061-1/+2
| | | | | | | | | | | | | Add 'global' headers to the ignore list of the QT_BEGIN_NAMESPACE check. The QT_BEGIN/END_NAMESPACE use in some of global header files makes no sense. This will suppress warnings caused by migration to the generated cpp exports. Amends b10e4e846e7b1a7b4c9c7cb7b4ef1081e22f2354 Task-number: QTBUG-90492 Change-Id: Ic7e3f284263740021f86cade4dc19d810cb8fe02 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Fix invalid path to the qt-cmake.bat when calling ↵Alexey Edelev2021-06-231-1/+6
| | | | | | | | | | | | | | | | | | | | | qt-internal-configure-tests.bat Since qt-internal-configure-tests.bat is located in the same folder as qt-cmake.bat the relative_path_from_libexec_dir_to_bin_dir is empty. Passing doubled backslash in the windows path causes an issue for the cmd.exe batch interpreter. Extra backslashes are treated by %~dp0 as a start of the relative path. The following error appears: Could not find toolchain file: ...\install\bin\..\/../lib/cmake/Qt6/qt.toolchain.cmake This appends an extra backslash to relative_bin_dir only if relative_path_from_libexec_dir_to_bin_dir is not empty. Change-Id: Id2fd6c5fa9d73060350f298262c6e93a4887eeb3 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* CMake: Make qt-internal-configure-tests relocatableAlexandru Croitor2021-04-262-2/+13
| | | | | | | | | It's important for conan CI builds where the correct installation location of Qt should be used when configuring standalone tests. Task-number: QTBUG-93037 Change-Id: I2465a439aea6826dedfb3217d1c909ad639d4ac0 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* Move bin/qt-internal-configure-tests to libexecJoerg Bornemann2021-03-301-0/+3
| | | | | | | | Pick-to: 6.1 Task-number: QTBUG-88791 Change-Id: I78613128760b5820e6db17b0c09462e34f7c7bb2 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Move syncqt.pl to libexecJoerg Bornemann2021-03-041-0/+1266
To not disturb the qmake build we kept syncqt.pl in <src>/bin but installed it to libexec. This is not necessary anymore. This also removes the need for having syncqt.pl in both, bin and libexec in the build dir of qtbase. Pick-to: 6.1 Fixes: QTBUG-91076 Change-Id: I44b014ea41e3f00c420e02fd5c76f11169340b8c Reviewed-by: Kai Koehne <kai.koehne@qt.io>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-01 14:50:46 +0000