Skip to content

Commit 50f5deb

Browse files
committed
[squashme]Restore text editing functionality
1 parent 8ddc8ec commit 50f5deb

File tree

2 files changed

+3
-15
lines changed

2 files changed

+3
-15
lines changed

build-qt.sh

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,15 +45,16 @@ INSTALL_DIR="${WORK_DIR}/qt_${sysname}"
4545
#FIXME bad warning in qtdeclarative-everywhere-src-6.8.3/src/quickwidgets/qquickwidget.cpp
4646

4747
common_options_cmake="
48-
-DFEATURE_accessibility=OFF
4948
-DQT_GENERATE_SBOM=OFF
5049
${BUILDQT_CMAKE_ARGS:-}
5150
"
5251

5352
base_features='
53+
-DFEATURE_accessibility=OFF
5454
-DFEATURE_androiddeployqt=OFF
5555
-DFEATURE_animation=ON
5656
-DFEATURE_cborstreamwriter=OFF
57+
-DFEATURE_clipboard=ON
5758
-DFEATURE_columnview=OFF
5859
-DFEATURE_commandlinkbutton=OFF
5960
-DFEATURE_completer=OFF
@@ -128,7 +129,7 @@ base_features='
128129
-DFEATURE_scroller=OFF
129130
-DFEATURE_sessionmanager=OFF
130131
-DFEATURE_settings=ON
131-
-DFEATURE_shortcut=OFF
132+
-DFEATURE_shortcut=ON
132133
-DFEATURE_sizegrip=OFF
133134
-DFEATURE_slider=OFF
134135
-DFEATURE_socks5=OFF

qtbase.patch

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -21,19 +21,6 @@ diff -u -r qtbase.old/cmake/QtBuildHelpers.cmake qtbase.new/cmake/QtBuildHelpers
2121
qt_internal_set_link_depends_no_shared()
2222
qt_internal_setup_default_install_prefix()
2323
qt_internal_set_qt_source_tree_var()
24-
diff -u -r qtbase.old/src/plugins/platforms/windows/qwindowsmenu.h qtbase.new/src/plugins/platforms/windows/qwindowsmenu.h
25-
--- qtbase.old/src/plugins/platforms/windows/qwindowsmenu.h 2025-02-13 11:45:28.000000000 -0600
26-
+++ qtbase.new/src/plugins/platforms/windows/qwindowsmenu.h 2025-11-17 03:52:17.033997423 -0600
27-
@@ -76,7 +76,9 @@
28-
bool m_checkable = false;
29-
bool m_checked = false;
30-
bool m_enabled = true;
31-
+#ifndef QT_NO_SHORTCUT
32-
QKeySequence m_shortcut;
33-
+#endif
34-
};
35-
36-
class QWindowsMenu : public QPlatformMenu
3724
diff -u -r qtbase.old/src/tools/rcc/rcc.cpp qtbase.new/src/tools/rcc/rcc.cpp
3825
--- qtbase.old/src/tools/rcc/rcc.cpp 2025-02-13 11:45:28.000000000 -0600
3926
+++ qtbase.new/src/tools/rcc/rcc.cpp 2025-11-14 00:12:48.076214506 -0600

0 commit comments

Comments
 (0)