[Qt] Handle nil qt.defaultpath

This commit is contained in:
Dr. Chat 2018-05-22 13:00:04 -05:00
parent 83d45053e3
commit 170007e751
1 changed files with 5 additions and 3 deletions

View File

@ -43,11 +43,13 @@ project("xenia-app")
-- Setup Qt libraries -- Setup Qt libraries
qt.enable() qt.enable()
qtmodules{"core", "gui", "widgets"} qtmodules{"core", "gui", "widgets"}
qtpath(qt.defaultpath)
qtprefix "Qt5" qtprefix "Qt5"
configuration {"Checked"} configuration {"Checked"}
qtsuffix "d" qtsuffix "d"
configuration {} configuration {}
if qt.defaultpath ~= nil then
qtpath(qt.defaultpath)
end
-- Qt static configuration (if necessary). Used by AppVeyor. -- Qt static configuration (if necessary). Used by AppVeyor.
if os.getenv("QT_STATIC") then if os.getenv("QT_STATIC") then
@ -160,6 +162,6 @@ project("xenia-app")
"1>scratch/stdout.txt", "1>scratch/stdout.txt",
}) })
debugenvs({ debugenvs({
"PATH=" .. qt.defaultpath .. "/bin", "PATH=%{cfg.qtpath}/bin",
}) })
end end