From 307cab6cd4e77acf50d382a05d8511d662e48d7a Mon Sep 17 00:00:00 2001 From: Martin Rotter Date: Mon, 29 Aug 2016 09:51:29 +0200 Subject: [PATCH 1/6] WebEngine by default OFF, when used Qt 5.7+, automatically detected. --- rssguard.pro | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/rssguard.pro b/rssguard.pro index be93a03b3..fafee7d79 100755 --- a/rssguard.pro +++ b/rssguard.pro @@ -100,7 +100,19 @@ isEmpty(DESTDIR) { } isEmpty(USE_WEBENGINE) { - USE_WEBENGINE = true + USE_WEBENGINE = false + message(rssguard: USE_WEBENGINE variable is not set.) + + !lessThan(QT_MAJOR_VERSION, 5):!lessThan(QT_MINOR_VERSION, 7) { + qtHaveModule(webenginewidgets) { + USE_WEBENGINE = true + message("rssguard: WebEngine component IS installed, enabling it.") + } + else { + USE_WEBENGINE = false + message("rssguard: WebEngine component is probably NOT installed, disabling it.") + } + } } message(rssguard: Shadow copy build directory \"$$OUT_PWD\".) @@ -148,6 +160,7 @@ message(rssguard: Build revision: \"$$APP_REVISION\".) message(rssguard: lrelease executable name: \"$$LRELEASE_EXECUTABLE\".) QT += core gui widgets sql network xml printsupport + CONFIG *= c++11 debug_and_release warn_on DEFINES *= QT_USE_QSTRINGBUILDER QT_USE_FAST_CONCATENATION QT_USE_FAST_OPERATOR_PLUS UNICODE _UNICODE VERSION = $$APP_VERSION @@ -546,6 +559,10 @@ win32 { QMAKE_EXTRA_TARGETS += seven_zip zip } +equals(USE_WEBENGINE, false) { + # Add extra file naming when building without webengine. +} + # Create NSIS installer target on Windows. win32 { nsis.target = nsis From a08f98645bdc360a77ae606e2c9d5340de2bcefa Mon Sep 17 00:00:00 2001 From: Martin Rotter Date: Mon, 29 Aug 2016 09:52:49 +0200 Subject: [PATCH 2/6] Pro file comment. --- rssguard.pro | 2 ++ 1 file changed, 2 insertions(+) diff --git a/rssguard.pro b/rssguard.pro index fafee7d79..8b6648763 100755 --- a/rssguard.pro +++ b/rssguard.pro @@ -36,6 +36,8 @@ # Variables: # USE_WEBENGINE - if specified, then QtWebEngine module for internal web browser is used. # Otherwise simple text component is used and some features will be disabled. +# Default value is "false". If QtWebEngine is installed during compilation, then +# value of this variable is tweaked automatically. # PREFIX - specifies base folder to which files are copied during "make install" # step, defaults to "$$OUT_PWD/usr" on Linux and to "$$OUT_PWD/app" on Windows. # LRELEASE_EXECUTABLE - specifies the name/path of "lrelease" executable, defaults to "lrelease". From 70a72658c5be493e14e074d0ac7dc5110706b340 Mon Sep 17 00:00:00 2001 From: Martin Rotter Date: Mon, 29 Aug 2016 09:56:51 +0200 Subject: [PATCH 3/6] Lowered minimal Qt for qtHaveModule(...). --- rssguard.pro | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rssguard.pro b/rssguard.pro index 8b6648763..879465d86 100755 --- a/rssguard.pro +++ b/rssguard.pro @@ -105,7 +105,7 @@ isEmpty(USE_WEBENGINE) { USE_WEBENGINE = false message(rssguard: USE_WEBENGINE variable is not set.) - !lessThan(QT_MAJOR_VERSION, 5):!lessThan(QT_MINOR_VERSION, 7) { + !lessThan(QT_MAJOR_VERSION, 5):!lessThan(QT_MINOR_VERSION, 2) { qtHaveModule(webenginewidgets) { USE_WEBENGINE = true message("rssguard: WebEngine component IS installed, enabling it.") From 485add5b6e0910db2c81d552adadb5d6573c7ac4 Mon Sep 17 00:00:00 2001 From: Martin Rotter Date: Mon, 29 Aug 2016 10:00:04 +0200 Subject: [PATCH 4/6] Removed some branching due to Qt versions. --- rssguard.pro | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/rssguard.pro b/rssguard.pro index 879465d86..ae8d3b59f 100755 --- a/rssguard.pro +++ b/rssguard.pro @@ -105,15 +105,13 @@ isEmpty(USE_WEBENGINE) { USE_WEBENGINE = false message(rssguard: USE_WEBENGINE variable is not set.) - !lessThan(QT_MAJOR_VERSION, 5):!lessThan(QT_MINOR_VERSION, 2) { - qtHaveModule(webenginewidgets) { - USE_WEBENGINE = true - message("rssguard: WebEngine component IS installed, enabling it.") - } - else { - USE_WEBENGINE = false - message("rssguard: WebEngine component is probably NOT installed, disabling it.") - } + qtHaveModule(webenginewidgets) { + USE_WEBENGINE = true + message("rssguard: WebEngine component IS installed, enabling it.") + } + else { + USE_WEBENGINE = false + message("rssguard: WebEngine component is probably NOT installed, disabling it.") } } From 28c3c71af6933698e2392fd3a0bdefd075e867fa Mon Sep 17 00:00:00 2001 From: Martin Rotter Date: Mon, 29 Aug 2016 12:53:40 +0200 Subject: [PATCH 5/6] Put installer links into Wiki. --- .appveyor.yml | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/.appveyor.yml b/.appveyor.yml index bb9a6da42..5753d0fde 100755 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -8,8 +8,6 @@ branches: only: - master - dev - except: - - build-artifacts environment: QTDIR: 'C:\Qt\5.7\msvc2013' @@ -33,14 +31,14 @@ build_script: on_success: - dir - - git clone -q --depth=1 --branch=build-artifacts https://github.com/martinrotter/rssguard.git c:\rssguard-artifacts + - git clone -q --depth=1 https://github.com/martinrotter/rssguard.wiki.git c:\rssguard-wiki - git config --global credential.helper store - ps: Add-Content "$env:USERPROFILE\.git-credentials" "https://$($env:access_token):x-oauth-basic@github.com`n" - git config --global user.email "rotter.martinos@gmail.com" - git config --global user.name "martinrotter" - cd ..\rssguard-build - - for /f "tokens=*" %%F in ('dir /s /b *.7z') do curl --upload-file %%F https://transfer.sh/rssguard-win32.7z --silent >> ..\rssguard-artifacts\windows-builds.txt - - cd ..\rssguard-artifacts + - for /f "tokens=*" %%F in ('dir /s /b *.7z') do curl --upload-file %%F https://transfer.sh/rssguard-win32.7z --silent >> ..\rssguard-wiki\Windows-development-builds.md + - cd ..\rssguard-wiki - git add *.* - git commit -m "New files." - - git push origin build-artifacts \ No newline at end of file + - git push origin master \ No newline at end of file From cf499b60f9a676f4902e32385e8f0b5d632a5d22 Mon Sep 17 00:00:00 2001 From: Martin Rotter Date: Mon, 29 Aug 2016 13:07:18 +0200 Subject: [PATCH 6/6] Push DMG files to Wiki. --- resources/scripts/.travis-install-osx.sh | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/resources/scripts/.travis-install-osx.sh b/resources/scripts/.travis-install-osx.sh index 60fc5ff17..22dc97ef1 100755 --- a/resources/scripts/.travis-install-osx.sh +++ b/resources/scripts/.travis-install-osx.sh @@ -11,11 +11,11 @@ ls -lha git config --global user.email "rotter.martinos@gmail.com" git config --global user.name "martinrotter" -git clone -q --depth=1 --branch=build-artifacts https://martinrotter:${GH_TOKEN}@github.com/martinrotter/rssguard.git ./build-artifacts -curl --upload-file ./rssguard-osx.dmg https://transfer.sh/rssguard-osx.dmg --silent >> ./build-artifacts/macosx-builds.txt -cat ./build-artifacts/macosx-builds.txt +git clone -q --depth=1 https://martinrotter:${GH_TOKEN}@github.com/martinrotter/rssguard.wiki.git ./build-wiki +curl --upload-file ./rssguard-osx.dmg https://transfer.sh/rssguard-osx.dmg --silent >> ./build-wiki/Mac-OS-X-development-builds.md +cat ./build-wiki/Mac-OS-X-development-builds.md -cd ./build-artifacts -git add *.txt +cd ./build-wiki +git add *.* git commit -m "New files." -git push origin build-artifacts \ No newline at end of file +git push origin master \ No newline at end of file