diff --git a/src/src.pro b/src/src.pro index 2524b5e..f9e7098 100644 --- a/src/src.pro +++ b/src/src.pro @@ -81,7 +81,7 @@ macx: { HEADERS += kchmviewerapp.h SOURCES += kchmviewerapp.cpp QMAKE_INFO_PLIST=resources/Info.plist - QMAKE_POST_LINK += cp resources/*.icns ${DESTDIR}/kchmviewer.app/Contents/Resources; + ICON = resources/kchmviewer.icns LIBS += ../lib/libebook/libebook.a POST_TARGETDEPS += ../lib/libebook/libebook.a } @@ -102,7 +102,7 @@ win32-*: { LIBS += -lwsock32 -loleaut32 } -unix:!macx: { +unix: { QT += dbus HEADERS += dbus_interface.h @@ -114,20 +114,20 @@ unix:!macx: { greaterThan(QT_MAJOR_VERSION, 4) { # Qt 5 - greaterThan(QT_MINOR_VERSION, 5) { - # Qt 5.6+ - error("You use Qt5.6+ - QWebEngine is not yet suitable for kchmviewer and is not supported") - QT += webengine webenginewidgets - DEFINES += USE_WEBENGINE - SOURCES += viewwindow_webengine.cpp dataprovider_qwebengine.cpp - HEADERS += dataprovider_qwebengine.h viewwindow_webengine.h - } else { +# greaterThan(QT_MINOR_VERSION, 5) { +# # Qt 5.6+ +# error("You use Qt5.6+ - QWebEngine is not yet suitable for kchmviewer and is not supported") +# QT += webengine webenginewidgets +# DEFINES += USE_WEBENGINE +# SOURCES += viewwindow_webengine.cpp dataprovider_qwebengine.cpp +# HEADERS += dataprovider_qwebengine.h viewwindow_webengine.h +# } else { # Qt 5.0-5.5 QT += webkit webkitwidgets DEFINES += USE_WEBKIT SOURCES += viewwindow_webkit.cpp dataprovider_qwebkit.cpp HEADERS += dataprovider_qwebkit.h viewwindow_webkit.h - } +# } } else { message("Qt4 is not supported anymore, please do not report any errors") QT += webkit webkitwidgets