Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Re:#9966 Fix Crash in MZFlickable #9984

Merged
merged 2 commits into from
Oct 27, 2024
Merged

Re:#9966 Fix Crash in MZFlickable #9984

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
485a2ad
Re:#9966 Fix Crash in MZFlickable
strseb Oct 24, 2024
9057410
forgot about that
strseb Oct 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ nebula/nebula_autogen/
nebula/libnebula.a
src/mozillavpn_autogen/
/build-*/
/build/
/build*/
dummybuild

# Node (for functional tests)
Expand Down
1 change: 1 addition & 0 deletions extension/socks5proxy/bin/CMakeLists.txt
View file
Open in desktop
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Qt 6.8.0 no longer links to this it seems so we need to manually declare that :)

Copy link
Collaborator

@oskirby oskirby Oct 24, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

For windows at least, I think we tend to handle this using pragmas: #pragma comment(lib, "Iphlpapi")

Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ if(WIN32)
target_sources(socksproxy PRIVATE
windowsbypass.cpp
windowsbypass.h)
target_link_libraries(socksproxy PRIVATE Iphlpapi.lib)

install(FILES
${CMAKE_CURRENT_BINARY_DIR}/socksproxy.exe
Expand Down
12 changes: 4 additions & 8 deletions nebula/ui/components/MZFlickable.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,15 +22,11 @@ Flickable {
boundsBehavior: Flickable.StopAtBounds
opacity: 0

onFlickContentHeightChanged: {
recalculateContentHeight()
}

onHeightChanged: {
recalculateContentHeight()
}

Component.onCompleted: {
recalculateContentHeight()
this.onHeightChanged.connect(recalculateContentHeight)
this.onFlickContentHeightChanged.connect(recalculateContentHeight)

opacity = 1;
if (Qt.platform.os === "windows") {
maximumFlickVelocity = 700;
Expand Down
2 changes: 1 addition & 1 deletion src/commands/commandui.cpp
View file
Open in desktop
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This errored and i think noone is using it, so let's just remove it.

Original file line number Diff line number Diff line change
Expand Up @@ -207,7 +207,7 @@ int CommandUI::run(QStringList& tokens) {
EventListener eventListener;
#endif

#ifdef MZ_DEBUG
#ifdef false
// This enables the qt-creator qml debugger on debug builds.:
// Go to QtCreator: Debug->Start Debugging-> Attach to QML port
// Port is 1234.
Expand Down
3 changes: 2 additions & 1 deletion src/platforms/windows/daemon/windowsfirewall.cpp
View file
Open in desktop
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

qAsConst is depricated in 6.8.0

Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
#include <QObject>
#include <QScopeGuard>
#include <QtEndian>
#include <utility>

#include "ipaddress.h"
#include "leakdetector.h"
Expand Down Expand Up @@ -320,7 +321,7 @@ bool WindowsFirewall::disableKillSwitch() {
FwpmFilterDeleteById0(m_sessionHandle, filterID);
}

for (const auto& filterID : qAsConst(m_activeRules)) {
for (const auto& filterID : std::as_const(m_activeRules)) {
FwpmFilterDeleteById0(m_sessionHandle, filterID);
}

Expand Down
Loading