File tree Expand file tree Collapse file tree 1 file changed +6
-2
lines changed Expand file tree Collapse file tree 1 file changed +6
-2
lines changed Original file line number Diff line number Diff line change @@ -384,12 +384,16 @@ function qtdebuggerbuild()
384
384
if _OPTIONS [" QT_HOME" ]~= nil then
385
385
MOCTST = backtick (_OPTIONS [" QT_HOME" ] .. " /bin/moc --version 2>/dev/null" )
386
386
if (MOCTST == ' ' ) then
387
- MOCTST = backtick (_OPTIONS [" QT_HOME" ] .. " /libexec/moc --version 2>/dev/null" )
387
+ local qt_host_libexecs = backtick (_OPTIONS [" QT_HOME" ] .. " /bin/qmake -query QT_HOST_LIBEXECS" )
388
+ if (qt_host_libexecs == ' ' ) then
389
+ qt_host_libexecs = _OPTIONS [" QT_HOME" ] .. " /libexec"
390
+ end
391
+ MOCTST = backtick (qt_host_libexecs .. " /moc --version 2>/dev/null" )
388
392
if (MOCTST == ' ' ) then
389
393
print (" Qt's Meta Object Compiler (moc) wasn't found!" )
390
394
os.exit (1 )
391
395
else
392
- MOC = _OPTIONS [ " QT_HOME " ] .. " /libexec /moc"
396
+ MOC = qt_host_libexecs .. " /moc"
393
397
end
394
398
else
395
399
MOC = _OPTIONS [" QT_HOME" ] .. " /bin/moc"
You can’t perform that action at this time.
0 commit comments