Skip to content

fix(qt): fix 3 gui issues#5596

Merged
PastaPastaPasta merged 3 commits into
dashpay:developfrom
UdjinM6:fix_gui
Oct 4, 2023
Merged

fix(qt): fix 3 gui issues#5596
PastaPastaPasta merged 3 commits into
dashpay:developfrom
UdjinM6:fix_gui

Conversation

@UdjinM6

@UdjinM6 UdjinM6 commented Sep 29, 2023 •
edited
Loading

Copy link
Copy Markdown

Issue being fixed or feature implemented

fix 3 gui issues reported about beta2

What was done?

pls see individual commits

How Has This Been Tested?

to test ad0c0eb (there were no css issues on my machine with locally compiled binaries): compile, run

to test 09800cf: run beta2 guix compiled binaries with css from this PR e.g. on macos:
/path/to/Dash-Qt.app/Contents/MacOS/Dash-Qt --regtest --debug-ui --custom-css-dir=/path/to/dash/src/qt/res/css

before 139d707:
Screenshot 2023-09-30 at 22 02 32
after 139d707:
Screenshot 2023-09-30 at 22 02 59

Breaking Changes

n/a

Checklist:

  • I have performed a self-review of my own code
  • I have commented my code, particularly in hard-to-understand areas
  • I have added or updated relevant unit/integration/functional/e2e tests
  • I have made corresponding changes to the documentation
  • I have assigned this pull request to a milestone (for repository code-owners and collaborators only)

@UdjinM6 UdjinM6 added this to the 20 milestone Sep 29, 2023
@UdjinM6 UdjinM6 changed the title fix(qt): fix 2 gui issues fix(qt): fix 3 gui issues Sep 30, 2023
PastaPastaPasta
PastaPastaPasta approved these changes Oct 3, 2023
View reviewed changes

@PastaPastaPasta PastaPastaPasta left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

utACK for squash merge

@UdjinM6
UdjinM6 requested review from knst and ogabrielides October 4, 2023 11:28
ogabrielides
ogabrielides approved these changes Oct 4, 2023
View reviewed changes

@ogabrielides ogabrielides left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

utACK

@PastaPastaPasta
PastaPastaPasta merged commit 1dd4b09 into dashpay:develop Oct 4, 2023
gades pushed a commit to cosanta/cosanta-core that referenced this pull request Dec 2, 2023
@UdjinM6 @gades
fix(qt): fix 3 gui issues (dashpay#5596)
99e30a9 
## Issue being fixed or feature implemented
fix 3 gui issues reported about beta2

## What was done?
pls see individual commits

## How Has This Been Tested?
to test ad0c0eb (there were no css
issues on my machine with locally compiled binaries): compile, run

to test 09800cf: run beta2 guix
compiled binaries with css from this PR e.g. on macos:
`/path/to/Dash-Qt.app/Contents/MacOS/Dash-Qt --regtest --debug-ui
--custom-css-dir=/path/to/dash/src/qt/res/css`

before 139d707:
<img width="224" alt="Screenshot 2023-09-30 at 22 02 32"
src="https://github.com/dashpay/dash/assets/1935069/b7a26ae9-f87f-4dde-b1f6-9eb796c22495">
after 139d707:
<img width="229" alt="Screenshot 2023-09-30 at 22 02 59"
src="https://github.com/dashpay/dash/assets/1935069/57d92e97-b25d-4035-9d1b-da373e51a574">

## Breaking Changes
n/a

## Checklist:
- [x] I have performed a self-review of my own code
- [ ] I have commented my code, particularly in hard-to-understand areas
- [ ] I have added or updated relevant unit/integration/functional/e2e
tests
- [ ] I have made corresponding changes to the documentation
- [x] I have assigned this pull request to a milestone _(for repository
code-owners and collaborators only)_
gades pushed a commit to piratecash/pirate that referenced this pull request Dec 9, 2023
@UdjinM6 @gades
fix(qt): fix 3 gui issues (dashpay#5596)
7b443ea 
## Issue being fixed or feature implemented
fix 3 gui issues reported about beta2

## What was done?
pls see individual commits

## How Has This Been Tested?
to test ad0c0eb (there were no css
issues on my machine with locally compiled binaries): compile, run

to test 09800cf: run beta2 guix
compiled binaries with css from this PR e.g. on macos:
`/path/to/Dash-Qt.app/Contents/MacOS/Dash-Qt --regtest --debug-ui
--custom-css-dir=/path/to/dash/src/qt/res/css`

before 139d707:
<img width="224" alt="Screenshot 2023-09-30 at 22 02 32"
src="https://github.com/dashpay/dash/assets/1935069/b7a26ae9-f87f-4dde-b1f6-9eb796c22495">
after 139d707:
<img width="229" alt="Screenshot 2023-09-30 at 22 02 59"
src="https://github.com/dashpay/dash/assets/1935069/57d92e97-b25d-4035-9d1b-da373e51a574">

## Breaking Changes
n/a

## Checklist:
- [x] I have performed a self-review of my own code
- [ ] I have commented my code, particularly in hard-to-understand areas
- [ ] I have added or updated relevant unit/integration/functional/e2e
tests
- [ ] I have made corresponding changes to the documentation
- [x] I have assigned this pull request to a milestone _(for repository
code-owners and collaborators only)_
@kwvg kwvg mentioned this pull request Nov 15, 2024
Merged
5 tasks
PastaPastaPasta added a commit that referenced this pull request Nov 17, 2024
@PastaPastaPasta
Merge #6385: backport: merge bitcoin#24241, bitcoin#24534, bitcoin#24948
6a51ab2 
, bitcoin#28622, bitcoin#28880, bitcoin#29185, bitcoin#29170, bitcoin#29233, bitcoin#29298, bitcoin#29598, bitcoin#29732, bitcoin#29890, bitcoin#29739, bitcoin#30074, bitcoin#30198, bitcoin#29072 (toolchain backports: part 2)

1506d9d merge bitcoin#29072: use `-no_exported_symbols` on macOS (Kittywhiskers Van Gogh)
9247960 merge bitcoin#30198: qt 5.15.14 and fix macOS build with Clang 18 (Kittywhiskers Van Gogh)
5585e7a merge bitcoin#30074: use ENV flags in get_arch (Kittywhiskers Van Gogh)
decd420 merge bitcoin#29739: swap cctools otool for llvm-objdump (Kittywhiskers Van Gogh)
0f8c420 merge bitcoin#29890: remove some tools when cross-compiling for macOS (Kittywhiskers Van Gogh)
936da1a merge bitcoin#29732: qt 5.15.13 (Kittywhiskers Van Gogh)
c294b47 revert: patch qt to make placeholders differ from actual text (Kittywhiskers Van Gogh)
af7090c merge bitcoin#29598: don't use -h with touch on OpenBSD (Kittywhiskers Van Gogh)
ebf8ff2 merge bitcoin#29298: patch libtool out of libnatpmp/miniupnpc (Kittywhiskers Van Gogh)
070b876 merge bitcoin#29233: depends move macOS C(XX) FLAGS out of C & CXX (Kittywhiskers Van Gogh)
d838481 revert dash#2398: Force fvisibility=hidden when compiling on macos (Kittywhiskers Van Gogh)
59a18f9 merge bitcoin#29170: add macho branch protection check (Kittywhiskers Van Gogh)
cb024d9 merge bitcoin#29185: remove `--enable-lto` (Kittywhiskers Van Gogh)
6d75a81 merge bitcoin#28880: switch to using LLVM 17.x for macOS builds (Kittywhiskers Van Gogh)
7b0a1f2 merge bitcoin#28622: use macOS 14 SDK (Xcode 15.0) (Kittywhiskers Van Gogh)
02eb735 merge bitcoin#24948: fix typo in permissions (Kittywhiskers Van Gogh)
2739107 merge bitcoin#24534: make gen-sdk deterministic (Kittywhiskers Van Gogh)
ab10bf9 merge bitcoin#24241: cleanup doc on need of Developer Account to obtain macOS SDK (Kittywhiskers Van Gogh)

Pull request description:

  ## Additional Information

  * Dependent on #6384
  * Dependency for #6389
  * The Qt patch introduced in [dash#5596](#5596), `fix_qt_placeholders.patch`, was a portion of a suggested workaround for QTBUG-92199 ([source](https://bugreports.qt.io/browse/QTBUG-92199?focusedId=669719&page=com.atlassian.jira.plugin.system.issuetabpanels%3Acomment-tabpanel#comment-669719)) but since then, a fix ([here](https://codereview.qt-project.org/c/qt/qtbase/+/434310)) has made its way to 5.15.12 and we are upgrading to 5.15.14 from 5.15.11.

    So we can safely remove this patch.

  ## Breaking Changes

  None expected

  ## Checklist

  - [x] I have performed a self-review of my own code
  - [x] I have commented my code, particularly in hard-to-understand areas **(note: N/A)**
  - [x] I have added or updated relevant unit/integration/functional/e2e tests
  - [x] I have made corresponding changes to the documentation **(note: N/A)**
  - [x] I have assigned this pull request to a milestone _(for repository code-owners and collaborators only)_

ACKs for top commit:
  UdjinM6:
    utACK 1506d9d
  PastaPastaPasta:
    utACK 1506d9d

Tree-SHA512: df8e4ea0ce9e7b269d248518698f0566b5eca1a54cdfb53f5b213b90fb5177e5a5df44eaeb6f3fc014cd93351c9245736bb2fd52bc2af4ae274d8fa93e601b07
ab4cus pushed a commit to ab4cus/e4Coin-core that referenced this pull request Jul 8, 2026
@PastaPastaPasta
Merge #6385: backport: merge bitcoin#24241, #24534, #24948, #28622, #…
09c1d72 
…28880, #29185, #29170, #29233, #29298, #29598, #29732, #29890, #29739, #30074, #30198, #29072 (toolchain backports: part 2)

a05f6a0 merge bitcoin#29072: use `-no_exported_symbols` on macOS (Kittywhiskers Van Gogh)
64894fe merge bitcoin#30198: qt 5.15.14 and fix macOS build with Clang 18 (Kittywhiskers Van Gogh)
10cd8cb merge bitcoin#30074: use ENV flags in get_arch (Kittywhiskers Van Gogh)
bfaf448 merge bitcoin#29739: swap cctools otool for llvm-objdump (Kittywhiskers Van Gogh)
ba349d1 merge bitcoin#29890: remove some tools when cross-compiling for macOS (Kittywhiskers Van Gogh)
bb953b7 merge bitcoin#29732: qt 5.15.13 (Kittywhiskers Van Gogh)
01ee7ec revert: patch qt to make placeholders differ from actual text (Kittywhiskers Van Gogh)
e2bcbe1 merge bitcoin#29598: don't use -h with touch on OpenBSD (Kittywhiskers Van Gogh)
bca65bb merge bitcoin#29298: patch libtool out of libnatpmp/miniupnpc (Kittywhiskers Van Gogh)
45c76d2 merge bitcoin#29233: depends move macOS C(XX) FLAGS out of C & CXX (Kittywhiskers Van Gogh)
51637da revert dash#2398: Force fvisibility=hidden when compiling on macos (Kittywhiskers Van Gogh)
fe10f94 merge bitcoin#29170: add macho branch protection check (Kittywhiskers Van Gogh)
e97f1d1 merge bitcoin#29185: remove `--enable-lto` (Kittywhiskers Van Gogh)
2bae487 merge bitcoin#28880: switch to using LLVM 17.x for macOS builds (Kittywhiskers Van Gogh)
c1f7f91 merge bitcoin#28622: use macOS 14 SDK (Xcode 15.0) (Kittywhiskers Van Gogh)
4b1eede merge bitcoin#24948: fix typo in permissions (Kittywhiskers Van Gogh)
3945a41 merge bitcoin#24534: make gen-sdk deterministic (Kittywhiskers Van Gogh)
2be5828 merge bitcoin#24241: cleanup doc on need of Developer Account to obtain macOS SDK (Kittywhiskers Van Gogh)

Pull request description:

  ## Additional Information

  * Dependent on dashpay/dash#6384
  * Dependency for dashpay/dash#6389
  * The Qt patch introduced in [dash#5596](dashpay/dash#5596), `fix_qt_placeholders.patch`, was a portion of a suggested workaround for QTBUG-92199 ([source](https://bugreports.qt.io/browse/QTBUG-92199?focusedId=669719&page=com.atlassian.jira.plugin.system.issuetabpanels%3Acomment-tabpanel#comment-669719)) but since then, a fix ([here](https://codereview.qt-project.org/c/qt/qtbase/+/434310)) has made its way to 5.15.12 and we are upgrading to 5.15.14 from 5.15.11.

    So we can safely remove this patch.

  ## Breaking Changes

  None expected

  ## Checklist

  - [x] I have performed a self-review of my own code
  - [x] I have commented my code, particularly in hard-to-understand areas **(note: N/A)**
  - [x] I have added or updated relevant unit/integration/functional/e2e tests
  - [x] I have made corresponding changes to the documentation **(note: N/A)**
  - [x] I have assigned this pull request to a milestone _(for repository code-owners and collaborators only)_

ACKs for top commit:
  UdjinM6:
    utACK a05f6a0
  PastaPastaPasta:
    utACK a05f6a0

Tree-SHA512: df8e4ea0ce9e7b269d248518698f0566b5eca1a54cdfb53f5b213b90fb5177e5a5df44eaeb6f3fc014cd93351c9245736bb2fd52bc2af4ae274d8fa93e601b07
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@PastaPastaPasta PastaPastaPasta PastaPastaPasta approved these changes
@knst knst Awaiting requested review from knst
+1 more reviewer
@ogabrielides ogabrielides ogabrielides approved these changes
Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

20

Development

Successfully merging this pull request may close these issues.

3 participants

@UdjinM6 @ogabrielides @PastaPastaPasta