Skip to content

Commit

Permalink
Also use $QT_ROOT_DIR
Browse files Browse the repository at this point in the history
Also use the environment variable `$QT_ROOT_DIR`

#300 (comment)
  • Loading branch information
probonopd authored Sep 3, 2024
1 parent bf3088f commit f76153f
Showing 1 changed file with 6 additions and 3 deletions.
9 changes: 6 additions & 3 deletions src/appimagetool/appdirtool.go
Original file line number Diff line number Diff line change
Expand Up @@ -1492,11 +1492,14 @@ func handleQt(appdir helpers.AppDir, qtVersion int) {

func getQtPrfxpath(f *os.File, err error, qtVersion int) string {

// If the user has set $QTDIR, use that instead of the one from qt_prfxpath in the library
// If the user has set $QTDIR or $QT_ROOT_DIR, use that instead of the one from qt_prfxpath in the library
qtPrefixEnv := os.Getenv("QTDIR")
if qtPrefixEnv == "" {
qtPrefixEnv = os.Getenv("QT_ROOT_DIR")
}
if qtPrefixEnv != "" {
log.Println("Using $QTDIR:", qtPrefixEnv)
return qtPrefixEnv
log.Println("Using QTDIR or QT_ROOT_DIR:", qtPrefixEnv)
return qtPrefixEnv
}

f.Seek(0, 0)
Expand Down

0 comments on commit f76153f

Please sign in to comment.