diff --git a/appveyor.yml b/appveyor.yml index 8430a125f..4aa84b6a6 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -79,6 +79,7 @@ build_script: - ECHO MYQTDIR=%MYQTDIR% - 'IF defined MYQTDIR cd gui' - 'IF defined MYQTDIR set QTDIR=%MYQTDIR%' + - 'IF defined MYQTDIR set PATH=%PATH%;%QTDIR%\bin' - 'IF defined MYQTDIR %QTDIR%\bin\qmake' - 'IF defined MYQTDIR nmake' - 'IF defined MYQTDIR cd ..' diff --git a/gui/gui.pro b/gui/gui.pro index 8800ee439..51d2cac1b 100644 --- a/gui/gui.pro +++ b/gui/gui.pro @@ -13,10 +13,15 @@ QT += printsupport QT += help # Build online help -#onlinehelp.target = online-help.qhc -#onlinehelp.commands = qhelpgenerator $$PWD/help/online-help.qhp -o online-help.qch ; qhelpgenerator $$PWD/help/online-help.qhcp -o online-help.qhc -#QMAKE_EXTRA_TARGETS += onlinehelp -#PRE_TARGETDEPS += online-help.qhc +onlinehelp.target = online-help.qhc +equals(QT_MAJOR_VERSION, 5):lessThan(QT_MINOR_VERSION, 12) { + # qcollectiongenerator is used in case of QT version < 5.12 + onlinehelp.commands = qcollectiongenerator $$PWD/help/online-help.qhcp -o $$PWD/help/online-help.qhc +} else { + onlinehelp.commands = qhelpgenerator $$PWD/help/online-help.qhcp -o $$PWD/help/online-help.qhc +} +QMAKE_EXTRA_TARGETS += onlinehelp +PRE_TARGETDEPS += online-help.qhc contains(LINKCORE, [yY][eE][sS]) { LIBS += -l../bin/cppcheck-core