Custom artifacts name when WebEngine is not used.

This commit is contained in:
Martin Rotter 2016-09-01 08:25:13 +02:00
parent ab01f6b91c
commit b70c152272
3 changed files with 18 additions and 4 deletions

View File

@ -150,6 +150,11 @@ isEmpty(APP_REVISION) {
APP_REVISION = "" APP_REVISION = ""
} }
equals(USE_WEBENGINE, false) {
# Add extra revision naming when building without webengine.
APP_REVISION = $$sprintf('%1-%2', $$APP_REVISION, nowebengine)
}
DEFINES += APP_REVISION='"\\\"$$APP_REVISION\\\""' DEFINES += APP_REVISION='"\\\"$$APP_REVISION\\\""'
message(rssguard: RSS Guard version is: \"$$APP_VERSION\".) message(rssguard: RSS Guard version is: \"$$APP_VERSION\".)
@ -559,8 +564,16 @@ win32 {
QMAKE_EXTRA_TARGETS += seven_zip zip QMAKE_EXTRA_TARGETS += seven_zip zip
} }
equals(USE_WEBENGINE, false) { unix:!mac {
# Add extra file naming when building without webengine. seven_zip.target = 7zip
seven_zip.depends = install
seven_zip.commands = 7za a -t7z $$TARGET-$$APP_VERSION-$$APP_REVISION-win32.7z $$shell_path($$PREFIX/*)
zip.target = zip
zip.depends = install
zip.commands = 7za a -tzip $$TARGET-$$APP_VERSION-$$APP_REVISION-win32.zip $$shell_path($$PREFIX/*)
QMAKE_EXTRA_TARGETS += seven_zip zip
} }
# Create NSIS installer target on Windows. # Create NSIS installer target on Windows.

View File

@ -38,6 +38,7 @@
#include <QDebug> #include <QDebug>
#include <QTimer> #include <QTimer>
int main(int argc, char *argv[]) { int main(int argc, char *argv[]) {
for (int i = 0; i < argc; i++) { for (int i = 0; i < argc; i++) {
const QString str = QString::fromLocal8Bit(argv[i]); const QString str = QString::fromLocal8Bit(argv[i]);

View File

@ -54,8 +54,8 @@ Application::Application(const QString &id, int &argc, char **argv)
connect(this, SIGNAL(saveStateRequest(QSessionManager&)), this, SLOT(onSaveState(QSessionManager&))); connect(this, SIGNAL(saveStateRequest(QSessionManager&)), this, SLOT(onSaveState(QSessionManager&)));
#if defined(USE_WEBENGINE) #if defined(USE_WEBENGINE)
connect(QWebEngineProfile::defaultProfile(), SIGNAL(downloadRequested(QWebEngineDownloadItem*)), connect(QWebEngineProfile::defaultProfile(), &QWebEngineProfile::downloadRequested,
this, SLOT(downloadRequested(QWebEngineDownloadItem*))); this, &Application::downloadRequested);
#endif #endif
} }