From 89b779d480225665b71d2675b52a8e04d1478cb7 Mon Sep 17 00:00:00 2001 From: Rusty Wagner Date: Mon, 4 Apr 2022 22:45:42 -0400 Subject: Update to Qt 6.2.4 --- README.md | 2 +- docs/about/open-source.md | 10 +++++----- ui/pane.h | 8 +++++++- 3 files changed, 13 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 4daaf497..7790f9f6 100644 --- a/README.md +++ b/README.md @@ -38,7 +38,7 @@ cmake --build build -j8 In addition to the default build setup, you may want to: - **Build examples.** To build the [API examples](#examples), pass `-DBN_API_BUILD_EXAMPLES=ON` to CMake when configuring the build. After the build succeeds, you can install the built plugins by running the `install` target. When using the "Unix Makefiles" build generator, this looks like: `make install`. -- **Build UI plugins.** You will need Qt 6.1.3 (as of writing) installed to build UI plugins. +- **Build UI plugins.** You will need Qt 6.2.4 (as of writing) installed to build UI plugins. - **Build headlessly.** If you are using a headless Binary Ninja distribution or you do not wish to build UI plugins, pass `-DHEADLESS=ON` to CMake when configuring the build. ### Troubleshooting diff --git a/docs/about/open-source.md b/docs/about/open-source.md index 3fff975b..3812612f 100644 --- a/docs/about/open-source.md +++ b/docs/about/open-source.md @@ -54,12 +54,12 @@ The previous tools are used in the generation of our documentation, but are not ## Building Qt -Binary Ninja uses [Qt 6.1] under an LGPLv3 license which requires that we host the original sources used to build Qt for our application along with instructions on how that source may be re-built and can replace the version of Qt shipped with Binary Ninja. +Binary Ninja uses [Qt 6.2] under an LGPLv3 license which requires that we host the original sources used to build Qt for our application along with instructions on how that source may be re-built and can replace the version of Qt shipped with Binary Ninja. Please note that we offer no support for running Binary Ninja with modified Qt libraries. 1. Follow the installation requirements on the [Building Qt 6 from Git] page. -2. Download the Qt 6.1.3 [tarball] from binary.ninja. The Qt code has a [patch] applied but is ABI compatible with the official Qt release. +2. Download the Qt 6.2.4 [tarball] from binary.ninja. The Qt code has a [patch] applied but is ABI compatible with the official Qt release. 3. Next, build QT using the aforementioned instructions. 4. On macOS, you will need to disable the code-signing signature since it would otherwise prevent changes to binaries or shared libraries. We recommend a tool such as [unsign]. 5. Finally, replace the built libraries: @@ -68,7 +68,7 @@ Please note that we offer no support for running Binary Ninja with modified Qt l - On Linux, replace the `libQt6Core.so.6`, `libQt6DBus.so.6`, `libQt6Gui.so.6`, `libQt6Network.so.6`, `libQt6Widgets.so.6`, `libQt6XcbQpa.so.6` files wherever Binary Ninja was extracted. [Building Qt 6 from Git]: https://wiki.qt.io/Building_Qt_6_from_Git -[Qt 6.1]: https://www.qt.io/qt-licensing-terms/ +[Qt 6.2]: https://www.qt.io/qt-licensing-terms/ [abseil-cpp]: https://github.com/abseil/abseil-cpp [abseil-cpp license]: https://github.com/abseil/abseil-cpp/blob/master/LICENSE [capstone]: https://github.com/aquynh/capstone @@ -112,8 +112,8 @@ Please note that we offer no support for running Binary Ninja with modified Qt l [sphinx]: http://www.sphinx-doc.org/en/stable/index.html [sqlite license]: https://www.sqlite.org/copyright.html [sqlite]: https://www.sqlite.org/index.html -[tarball]: https://binary.ninja/qt6.1.3.tar.xz -[patch]: https://binary.ninja/qt6.1.3.patch +[tarball]: https://binary.ninja/qt6.2.4.tar.xz +[patch]: https://binary.ninja/qt6.2.4.patch [tomcrypt license]: https://github.com/libtom/libtomcrypt/blob/develop/LICENSE [tomcrypt]: https://github.com/libtom/libtomcrypt [unsign]: https://github.com/steakknife/unsign diff --git a/ui/pane.h b/ui/pane.h index 5b02862d..d26eb046 100644 --- a/ui/pane.h +++ b/ui/pane.h @@ -145,7 +145,9 @@ class BINARYNINJAUIAPI ViewPane : public Pane virtual void focus() override; virtual QString title() override; +#ifndef BINARYNINJAUI_BINDINGS void recreateViewFrame(std::map& locations); +#endif void sendViewChange(); private Q_SLOTS: @@ -282,9 +284,11 @@ class BINARYNINJAUIAPI SplitPaneContainer : public QWidget void open(Pane* pane, Qt::Orientation primaryDirection = Qt::Vertical); +#ifndef BINARYNINJAUI_BINDINGS void recreateViewFrames(std::map& locations); +#endif - Q_SIGNALS: +Q_SIGNALS: void paneClosed(Pane* pane); void currentChanged(Pane* pane); void layoutChanged(); @@ -353,7 +357,9 @@ class BINARYNINJAUIAPI SplitPaneWidget : public QWidget bool closeRequest(); void closing(); +#ifndef BINARYNINJAUI_BINDINGS void recreateViewFrames(std::map& locations); +#endif static void registerActions(); -- cgit v1.3.1