Skip to content

Commit

Permalink
Update to v6.7.3
Browse files Browse the repository at this point in the history
  • Loading branch information
Tereius committed Oct 3, 2024
1 parent 7a0b79c commit 822c269
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion info.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"version": "6.7.2",
"version": "6.7.3",
"projectName": "qt",
"projectDescription": "A cross-platform software for creating graphical user interfaces as well as cross-platform applications that run on various software and hardware platforms.",
"vendor": "Björn Stresing",
Expand Down
4 changes: 2 additions & 2 deletions patches/disable_test_qtlocation.patch
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index f979951..94c7cce 100644
index f979951b..94c7cce2 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -27,7 +27,7 @@ endif()
Expand All @@ -20,7 +20,7 @@ index f979951..94c7cce 100644

qt_build_repo()
diff --git a/tests/auto/CMakeLists.txt b/tests/auto/CMakeLists.txt
index af91607..72d5076 100644
index af916073..72d50764 100644
--- a/tests/auto/CMakeLists.txt
+++ b/tests/auto/CMakeLists.txt
@@ -2,7 +2,6 @@
Expand Down
10 changes: 5 additions & 5 deletions patches/linguist.patch
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
diff --git a/configure.cmake b/configure.cmake
index 9fbbe2c..afd5982 100644
index 7e5cf30e2..aebe0e37d 100644
--- a/configure.cmake
+++ b/configure.cmake
@@ -17,7 +17,7 @@
Expand All @@ -12,7 +12,7 @@ index 9fbbe2c..afd5982 100644

if(TARGET WrapLibClang::WrapLibClang)
diff --git a/src/linguist/CMakeLists.txt b/src/linguist/CMakeLists.txt
index ab2169dec..992399c4e 100644
index 20ec24733..edda919ad 100644
--- a/src/linguist/CMakeLists.txt
+++ b/src/linguist/CMakeLists.txt
@@ -5,16 +5,13 @@ qt_exclude_tool_directories_from_default_target(
Expand All @@ -28,8 +28,8 @@ index ab2169dec..992399c4e 100644
add_subdirectory(lrelease-pro)
add_subdirectory(lupdate)
add_subdirectory(lupdate-pro)
-if(QT_FEATURE_process AND QT_FEATURE_pushbutton AND QT_FEATURE_toolbutton AND TARGET Qt::Widgets AND NOT no-png)
+if(QT_FEATURE_linguist AND QT_FEATURE_printsupport AND QT_FEATURE_process AND QT_FEATURE_pushbutton AND QT_FEATURE_toolbutton AND TARGET Qt::Widgets AND NOT no-png)
-if(QT_FEATURE_process AND QT_FEATURE_pushbutton AND QT_FEATURE_toolbutton
+if(QT_FEATURE_linguist AND QT_FEATURE_process AND QT_FEATURE_pushbutton AND QT_FEATURE_toolbutton
AND QT_FEATURE_png AND QT_FEATURE_printsupport AND TARGET Qt::Widgets)
add_subdirectory(linguist)
endif()

0 comments on commit 822c269

Please sign in to comment.