Skip to content

Commit 269a584

Browse files
committed
Update to Qt 6.10.1
1 parent 0317c1a commit 269a584

File tree

4 files changed

+12
-10
lines changed

4 files changed

+12
-10
lines changed

docs/about/open-source.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -79,14 +79,14 @@ Due to its different document generation system, all our rust dependencies and t
7979

8080
## Building Qt
8181

82-
Binary Ninja uses [Qt 6.8] under an LGPLv3 license which requires that we host the original sources used to build Qt for
82+
Binary Ninja uses [Qt 6.10] under an LGPLv3 license which requires that we host the original sources used to build Qt for
8383
our application along with instructions on how that source may be re-built and can replace the version of Qt shipped
8484
with Binary Ninja.
8585

8686
Please note that we offer no support for running Binary Ninja with modified Qt libraries.
8787

8888
1. Follow the installation requirements on the [Building Qt 6 from Git] page.
89-
2. Download the Qt 6.8.2 [tarball] from binary.ninja. The Qt code has a [patch] applied but is ABI compatible with the
89+
2. Download the Qt 6.10.1 [tarball] from binary.ninja. The Qt code has a [patch] applied but is ABI compatible with the
9090
official Qt release.
9191
3. Next, build Qt with the [qt-build] repository. Alternatively, build Qt using the aforementioned instructions.
9292
4. On macOS, you will need to disable the code-signing signature since it would otherwise prevent changes to binaries or shared libraries.
@@ -96,7 +96,7 @@ Please note that we offer no support for running Binary Ninja with modified Qt l
9696
- 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.
9797

9898
[Building Qt 6 from Git]: https://wiki.qt.io/Building_Qt_6_from_Git
99-
[Qt 6.8]: https://www.qt.io/licensing/open-source-lgpl-obligations
99+
[Qt 6.10]: https://www.qt.io/licensing/open-source-lgpl-obligations
100100
[abseil-cpp]: https://github.com/abseil/abseil-cpp
101101
[abseil-cpp license]: https://github.com/abseil/abseil-cpp/blob/master/LICENSE
102102
[BinExport]: https://github.com/google/binexport
@@ -142,8 +142,8 @@ Please note that we offer no support for running Binary Ninja with modified Qt l
142142
[sphinx]: https://www.sphinx-doc.org/en/master/
143143
[sqlite license]: https://www.sqlite.org/copyright.html
144144
[sqlite]: https://www.sqlite.org/index.html
145-
[tarball]: https://binary.ninja/qt6.8.2.tar.xz
146-
[patch]: https://binary.ninja/qt6.8.2.patch
145+
[tarball]: https://binary.ninja/qt6.10.1.tar.xz
146+
[patch]: https://binary.ninja/qt6.10.1.patch
147147
[qt-build]: https://github.com/Vector35/qt-build
148148
[yasm license]: https://github.com/yasm/yasm/blob/master/BSD.txt
149149
[yasm]: https://github.com/yasm/yasm

docs/dev/plugins.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -290,7 +290,7 @@ automatically detect the plugin target and will compile and install correctly. H
290290
setup for building and live debugging your plugin:
291291

292292
1. If you installed Binary Ninja somewhere other than the default, add an environment variable in your CMake Profile pointing at the installation, e.g.: `BN_INSTALL_DIR=/Applications/Binary Ninja.app`
293-
2. If you are writing a UI plugin, you will need to include the directory containing `qmake` to the `PATH` Environment Variable in your CMake Profile, e.g.: `PATH=/usr/bin:/bin:/usr/sbin:/sbin:/Users/user/Qt/6.8.2/clang_64/bin`
293+
2. If you are writing a UI plugin, you will need to include the directory containing `qmake` to the `PATH` Environment Variable in your CMake Profile, e.g.: `PATH=/usr/bin:/bin:/usr/sbin:/sbin:/Users/user/Qt/6.10.1/clang_64/bin`
294294
3. In your Run Configuration's Before Launch steps, add an Install step. This will copy the updated version of your plugin before starting, so you don't have to run Install manually.
295295
4. Set the Executable of your Run Configuration to point to the Binary Ninja executable. This allows you to compile your plugin and start Binary Ninja automatically.
296296
i. On macOS, you will need the full path to /Applications/Binary Ninja.app/Contents/MacOS/binaryninja
@@ -320,7 +320,7 @@ You need to set up a task in `.vscode/tasks.json` to build and install your plug
320320
// You will need this if your Binary Ninja installation is not in the default location
321321
"BN_INSTALL_DIR": "C:\\Users\\User\\AppData\\Local\\Vector35\\BinaryNinja",
322322
// You will need this if you are writing a UI plugin
323-
"PATH": "C:\\Users\\User\\Qt\\6.8.2\\msvc2019_64\\bin"
323+
"PATH": "C:\\Users\\User\\Qt\\6.10.1\\msvc2019_64\\bin"
324324
}
325325
}
326326
}

ui/settingsview.h

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -105,16 +105,18 @@ class BINARYNINJAUIAPI SettingsFilterProxyModel : public QSortFilterProxyModel
105105
int scopeFilter() { return m_scopeFilter; }
106106
void setScopeFilter(int scope)
107107
{
108+
beginFilterChange();
108109
m_scopeFilter = scope;
109-
invalidateFilter();
110110
m_subgroupFilterCache.clear();
111+
endFilterChange();
111112
}
112113
int scopeForSchema() { return m_scopeForSchema; }
113114
void setScopeForSchema(int scope)
114115
{
115-
invalidateFilter();
116+
beginFilterChange();
116117
m_subgroupFilterCache.clear();
117118
m_scopeForSchema = scope;
119+
endFilterChange();
118120
}
119121

120122
QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const override;

view/sharedcache/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ if (NOT BN_INTERNAL_BUILD)
1616
if(WIN32)
1717
set(MSVC_VERSION msvc2022_64 CACHE STRING "Version of MSVC Qt is built with" )
1818
endif()
19-
set(QT_VERSION 6.8.2 CACHE STRING "Version of Qt to use")
19+
set(QT_VERSION 6.10.1 CACHE STRING "Version of Qt to use")
2020

2121
if(NOT CMAKE_PREFIX_PATH)
2222
if(APPLE)

0 commit comments

Comments
 (0)