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.

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

Windows: use winqtdeploy instead of DeplyQt4 from CMake #3025

Merged
merged 1 commit into from Apr 20, 2019

Conversation

3 participants
@droidmonkey
Copy link
Member

commented Apr 17, 2019

Type of change

  • Bug fix (non-breaking change which fixes an issue)

Description and Context

  • Ensure Qt dlls find plugins in bundled directory
  • Reduce complexity of deployment code
  • Standardize use of CMAKE_BUILD_TYPE_LOWER for more robust comparisons

Fixes #3023
Fixes part of #1535

Testing strategy

Tested on Windows using CPack and make install.

Checklist:

  • I have read the CONTRIBUTING document. [REQUIRED]
  • My code follows the code style of this project. [REQUIRED]
  • All new and existing tests passed. [REQUIRED]
  • I have compiled and verified my code with -DWITH_ASAN=ON. [REQUIRED]
  • My change requires a change to the documentation, and I have updated it accordingly.
  • I have added tests to cover my changes.
Windows: use winqtdeploy instead of DeplyQt4 from CMake
* Ensure Qt dlls find plugins in bundled directory
* Reduce complexity of deployment code
* Standardize use of CMAKE_BUILD_TYPE_LOWER for more robust comparisons

@droidmonkey droidmonkey added this to the v2.4.2 milestone Apr 17, 2019

@droidmonkey droidmonkey requested a review from phoerious Apr 17, 2019

@PF93mc8y7erq92qTmTjJBysALa

This comment has been minimized.

Copy link
Contributor

commented Apr 18, 2019

In which way is this related to #1535 ?

@phoerious

This comment has been minimized.

Copy link
Member

commented Apr 18, 2019

Same thing.

@droidmonkey

This comment has been minimized.

Copy link
Member Author

commented Apr 18, 2019

I'm let you handle the appimage part, Phoerious

@phoerious phoerious merged commit 53796a2 into release/2.4.2 Apr 20, 2019

3 checks passed

MacOS (KeepassXC) TeamCity build finished
Details
Ubuntu Linux (KeepassXC) TeamCity build finished
Details
Windows 10 (KeepassXC) TeamCity build finished
Details

@phoerious phoerious deleted the hotfix/use-winqtdeploy branch Apr 20, 2019

droidmonkey added a commit that referenced this pull request May 31, 2019

Release 2.4.2
- Improve resilience against memory attacks - overwrite memory before free [#3020]
- Prevent infinite save loop when location is unavailable [#3026]
- Attempt to fix quitting application when shutdown or logout issued [#3199]
- Support merging database custom data [#3002]
- Fix opening URL's with non-http schemes [#3153]
- Fix data loss due to not reading all database attachments if duplicates exist [#3180]
- Fix entry context menu disabling when using keyboard navigation [#3199]
- Fix behaviors when canceling an entry edit [#3199]
- Fix processing of tray icon click and doubleclick [#3112]
- Update group in preview widget when focused [#3199]
- Prefer DuckDuckGo service over direct icon download (increases resolution) [#2996]
- Remove apply button in application settings [#3019]
- Use winqtdeploy on Windows to correct deployment issues [#3025]
- Don't mark entry edit as modified when attribute selection changes [#3041]
- Use console code page CP_UTF8 on Windows if supported [#3050]
- Snap: Fix locking database with session lock [#3046]
- Snap: Fix theming across Linux distributions [#3057]
- Snap: Use SNAP_USER_COMMON and SNAP_USER_DATA directories [#3131]
- KeeShare: Automatically enable WITH_XC_KEESHARE_SECURE if quazip is found [#3088]
- macOS: Fix toolbar text when in dark mode [#2998]
- macOS: Lock database on switching user [#3097]
- macOS: Fix global Auto-Type when the database is locked [#3138]
- Browser: Close popups when database is locked [#3093]
- Browser: Add tests [#3016]
- Browser: Don't create default group if custom group is enabled [#3127]
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.