Remove assumptions about Qt installation for Mac #20
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
- Instead of assuming how Qt is installed, let the user hand over the path via command line parameter or environment variable QTDIR. - Get Qt version from "qmake --version". - Fixes selection of incorrect Qt in case multiple Qt versions are installed (e.g. 5.9 and 5.12)
- Removes .DS_store and .fseventsd in case they are there - Moves .background out of sight
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The
build-mac.shscript has some assumptions about where and how Qt is installed.This PR removes those assumptions in favor of letting the user hand over the Qt installation path via a command line parameter or environment variable
QTDIR.This also solves the issue that an older Qt version could be used in case multiple versions are installed (sorting is broken if you have, for example, 5.9.6 and 5.12.3 installed).
Additionally, the Qt version is now determined by calling
qmake --versioninstead of assuming that the Qt version is part of the installation path.And I also had the issue that the hidden folders in the DMG were visible.
So this PR also removes the directories
.DS_storeand.fseventsdin the DMG if they exist and moves the.backgrounddirectory out of sight.