From 39857cd7a2f5d819b100e8839b0f6d5d1b2d9cdd Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Thu, 17 Sep 2020 18:08:28 +0200 Subject: Do not pass a native keycode matching the menu key when it is remapped MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Chromium will recreate the original mapping based on the native keycode, breaking any remapping. Fixes: QTBUG-86672 Change-Id: I4b7e6f7434049cdf7250bee1ef759a9df4d4987c Reviewed-by: Jüri Valdmann --- src/core/web_event_factory.cpp | 3 +++ 1 file changed, 3 insertions(+) (limited to 'src') diff --git a/src/core/web_event_factory.cpp b/src/core/web_event_factory.cpp index 08f0bf2c6..798ee9633 100644 --- a/src/core/web_event_factory.cpp +++ b/src/core/web_event_factory.cpp @@ -216,6 +216,9 @@ static quint32 nativeKeyCodeForKeyEvent(const QKeyEvent *ev) #elif defined(Q_OS_MACOS) return keyboardDriver() == KeyboardDriver::Cocoa ? ev->nativeVirtualKey() : 0; #elif defined(Q_OS_LINUX) + // Do not set native code to menu key if it was mapped to something else. + if (ev->nativeScanCode() == 135 && ev->key() != Qt::Key_Menu) + return 0; return keyboardDriver() == KeyboardDriver::Xkb ? ev->nativeScanCode() : 0; #else return 0; // 0 means unknown, KeyboardEvent.code will be empty string. -- cgit v1.2.3 From b50465bfa2b94aee497ecc66b2ddb02fa64d2357 Mon Sep 17 00:00:00 2001 From: Andy Shaw Date: Wed, 23 Sep 2020 12:45:40 +0200 Subject: PDF: Load the PDF when jumping to the image otherwise it will fail If the PDF is not loaded before it jumps to the image then it fails to jump to the specified page and ends up showing the first one. Change-Id: I6061431e1fd9b743afaca3df0aec03dc6a1144bf Reviewed-by: Shawn Rutledge (cherry picked from commit e2e249b8bb399ef7bcf6fe3be0b4f2fc9fa18182) Reviewed-by: Qt Cherry-pick Bot --- src/plugins/imageformats/pdf/qpdfiohandler.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') diff --git a/src/plugins/imageformats/pdf/qpdfiohandler.cpp b/src/plugins/imageformats/pdf/qpdfiohandler.cpp index 98e4f4663..4f610935c 100644 --- a/src/plugins/imageformats/pdf/qpdfiohandler.cpp +++ b/src/plugins/imageformats/pdf/qpdfiohandler.cpp @@ -211,7 +211,7 @@ bool QPdfIOHandler::supportsOption(ImageOption option) const bool QPdfIOHandler::jumpToImage(int frame) { qCDebug(qLcPdf) << Q_FUNC_INFO << frame; - if (frame < 0 || frame >= m_doc.pageCount()) + if (frame < 0 || frame >= imageCount()) return false; m_page = frame; return true; -- cgit v1.2.3 From c0a1d2b8354d213a2d43f1782533ac2716ca860f Mon Sep 17 00:00:00 2001 From: Michal Klocek Date: Tue, 22 Sep 2020 16:18:37 +0200 Subject: Fix typo for static linking with no rsp files Fix typo which surprisingly gives no errors with archiver, however generated archives are bogus (at lest with lld) Change-Id: Iea1e22c66eb99a720b398c5903b56938b309905f Reviewed-by: Allan Sandfeld Jensen --- src/buildtools/config/linking.pri | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') diff --git a/src/buildtools/config/linking.pri b/src/buildtools/config/linking.pri index e76f6ef10..f295e2c66 100644 --- a/src/buildtools/config/linking.pri +++ b/src/buildtools/config/linking.pri @@ -40,7 +40,7 @@ linux { QMAKE_LFLAGS += -Wl,--start-group @$${RSP_ARCHIVE_FILE} -Wl,--end-group } else { OBJECTS += $$NINJA_OBJECTS - LIBS_PRIVATE += -Wl,--start-group @$${NINJA_ARCHIVES} -Wl,--end-group + LIBS_PRIVATE += -Wl,--start-group $${NINJA_ARCHIVES} -Wl,--end-group } } -- cgit v1.2.3