mirror of
https://github.com/void-linux/void-packages.git
synced 2025-06-07 07:33:48 +02:00
qt6-tools: update to 6.8.1.
This commit is contained in:
parent
1815115309
commit
21e85d572d
2 changed files with 5 additions and 5 deletions
|
@ -54,16 +54,16 @@
|
||||||
|
|
||||||
--- a/tests/auto/linguist/lupdate/tst_lupdate.cpp
|
--- a/tests/auto/linguist/lupdate/tst_lupdate.cpp
|
||||||
+++ b/tests/auto/linguist/lupdate/tst_lupdate.cpp
|
+++ b/tests/auto/linguist/lupdate/tst_lupdate.cpp
|
||||||
@@ -44,7 +44,10 @@ private:
|
@@ -55,7 +55,10 @@
|
||||||
|
|
||||||
tst_lupdate::tst_lupdate()
|
tst_lupdate::tst_lupdate()
|
||||||
{
|
{
|
||||||
|
m_timer.start();
|
||||||
- QString binPath = QLibraryInfo::path(QLibraryInfo::BinariesPath);
|
- QString binPath = QLibraryInfo::path(QLibraryInfo::BinariesPath);
|
||||||
+ auto binPath = QLibraryInfo::path(QLibraryInfo::BinariesPath);
|
+ auto binPath = QLibraryInfo::path(QLibraryInfo::BinariesPath);
|
||||||
+ char *build_binpath = getenv("QT_BUILD_BIN_PATH");
|
+ char *build_binpath = getenv("QT_BUILD_BIN_PATH");
|
||||||
+ if (build_binpath && *build_binpath)
|
+ if (build_binpath && *build_binpath)
|
||||||
+ binPath = build_binpath;
|
+ binPath = build_binpath;
|
||||||
m_cmdLupdate = binPath + QLatin1String("/lupdate");
|
m_cmdLupdate = binPath + "/lupdate"_L1;
|
||||||
m_basePath = QFINDTESTDATA("testdata/");
|
m_basePath = QFINDTESTDATA("testdata/");
|
||||||
}
|
}
|
||||||
--- a/tests/auto/qtdiag/tst_qtdiag.cpp
|
--- a/tests/auto/qtdiag/tst_qtdiag.cpp
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
# Template file for 'qt6-tools'
|
# Template file for 'qt6-tools'
|
||||||
pkgname=qt6-tools
|
pkgname=qt6-tools
|
||||||
version=6.7.2
|
version=6.8.1
|
||||||
revision=1
|
revision=1
|
||||||
build_style=cmake
|
build_style=cmake
|
||||||
configure_args="-DEXTERNAL_GUMBO=ON -DLITEHTML_UTF8=ON -DUSE_ICU=ON
|
configure_args="-DEXTERNAL_GUMBO=ON -DLITEHTML_UTF8=ON -DUSE_ICU=ON
|
||||||
|
@ -16,7 +16,7 @@ maintainer="John <me@johnnynator.dev>"
|
||||||
license="custom:GPL-3.0-only-with-Qt-GPL-exception-1.0, LGPL-3.0-only, GPL-2.0-or-later"
|
license="custom:GPL-3.0-only-with-Qt-GPL-exception-1.0, LGPL-3.0-only, GPL-2.0-or-later"
|
||||||
homepage="https://qt.io/"
|
homepage="https://qt.io/"
|
||||||
distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qttools-everywhere-src-${version}.tar.xz"
|
distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qttools-everywhere-src-${version}.tar.xz"
|
||||||
checksum=58e855ad1b2533094726c8a425766b63a04a0eede2ed85086860e54593aa4b2a
|
checksum=9d43d409be08b8681a0155a9c65114b69c9a3fc11aef6487bb7fdc5b283c432d
|
||||||
|
|
||||||
if [ "$CROSS_BUILD" ]; then
|
if [ "$CROSS_BUILD" ]; then
|
||||||
configure_args+=" -DQT_FORCE_BUILD_TOOLS=TRUE"
|
configure_args+=" -DQT_FORCE_BUILD_TOOLS=TRUE"
|
||||||
|
|
Loading…
Add table
Reference in a new issue