diff options
46 files changed, 46 insertions, 50 deletions
diff --git a/lib/settings/configuration.cpp b/lib/settings/configuration.cpp index 51c8e47..d91ae97 100644 --- a/lib/settings/configuration.cpp +++ b/lib/settings/configuration.cpp @@ -2,7 +2,7 @@ * This file is part of smolbote. It's copyrighted by the contributors recorded * in the version control history of the file, available from its original * location: git://neueland.iserlohn-fortress.net/smolbote.git - * + * * SPDX-License-Identifier: GPL-3.0 */ diff --git a/lib/settings/configuration.h b/lib/settings/configuration.h index 5b584e9..49f92d6 100644 --- a/lib/settings/configuration.h +++ b/lib/settings/configuration.h @@ -2,7 +2,7 @@ * This file is part of smolbote. It's copyrighted by the contributors recorded * in the version control history of the file, available from its original * location: git://neueland.iserlohn-fortress.net/smolbote.git - * + * * SPDX-License-Identifier: GPL-3.0 */ diff --git a/lib/settings/settingsdialog.cpp b/lib/settings/settingsdialog.cpp index fd781fa..2b11416 100644 --- a/lib/settings/settingsdialog.cpp +++ b/lib/settings/settingsdialog.cpp @@ -2,7 +2,7 @@ * This file is part of smolbote. It's copyrighted by the contributors recorded * in the version control history of the file, available from its original * location: git://neueland.iserlohn-fortress.net/smolbote.git - * + * * SPDX-License-Identifier: GPL-3.0 */ diff --git a/lib/settings/settingsdialog.h b/lib/settings/settingsdialog.h index c658f1d..74dd964 100644 --- a/lib/settings/settingsdialog.h +++ b/lib/settings/settingsdialog.h @@ -2,7 +2,7 @@ * This file is part of smolbote. It's copyrighted by the contributors recorded * in the version control history of the file, available from its original * location: git://neueland.iserlohn-fortress.net/smolbote.git - * + * * SPDX-License-Identifier: GPL-3.0 */ diff --git a/smolbote.qbs b/smolbote.qbs index dc201d9..e9f112f 100644 --- a/smolbote.qbs +++ b/smolbote.qbs @@ -36,7 +36,6 @@ Project { if(project.gitVersion) { var meta = GitRepo.read(project.sourceDirectory); version = meta.version; - describe = meta.describe; found = true; } } diff --git a/src/browser.cpp b/src/browser.cpp index f8f80f2..6899c00 100644 --- a/src/browser.cpp +++ b/src/browser.cpp @@ -2,7 +2,7 @@ * This file is part of smolbote. It's copyrighted by the contributors recorded * in the version control history of the file, available from its original * location: git://neueland.iserlohn-fortress.net/smolbote.git - * + * * SPDX-License-Identifier: GPL-3.0 */ diff --git a/src/browser.h b/src/browser.h index ceb98d5..bc4a7e4 100644 --- a/src/browser.h +++ b/src/browser.h @@ -2,7 +2,7 @@ * This file is part of smolbote. It's copyrighted by the contributors recorded * in the version control history of the file, available from its original * location: git://neueland.iserlohn-fortress.net/smolbote.git - * + * * SPDX-License-Identifier: GPL-3.0 */ diff --git a/src/forms/aboutdialog.cpp b/src/forms/aboutdialog.cpp index 38a5196..25c5384 100644 --- a/src/forms/aboutdialog.cpp +++ b/src/forms/aboutdialog.cpp @@ -2,7 +2,7 @@ * This file is part of smolbote. It's copyrighted by the contributors recorded * in the version control history of the file, available from its original * location: git://neueland.iserlohn-fortress.net/smolbote.git - * + * * SPDX-License-Identifier: GPL-3.0 */ @@ -22,7 +22,7 @@ AboutDialog::AboutDialog(QWidget *parent) : aboutLabel->setWordWrap(true); aboutLabel->setText(tr("<h2>smolbote %1</h2>" "<p><i>yet another Qute browser</i></p>") - .arg(qApp->applicationVersion())); + .arg(qApp->applicationVersion().left(qApp->applicationVersion().indexOf('-')))); ui->toolBox->addItem(aboutLabel, tr("About")); QLabel *licenseLabel = new QLabel(this); diff --git a/src/forms/aboutdialog.h b/src/forms/aboutdialog.h index 742636c..ba848e7 100644 --- a/src/forms/aboutdialog.h +++ b/src/forms/aboutdialog.h @@ -2,7 +2,7 @@ * This file is part of smolbote. It's copyrighted by the contributors recorded * in the version control history of the file, available from its original * location: git://neueland.iserlohn-fortress.net/smolbote.git - * + * * SPDX-License-Identifier: GPL-3.0 */ diff --git a/src/forms/cookiesform.cpp b/src/forms/cookiesform.cpp index eaaa2f6..fb90f4a 100644 --- a/src/forms/cookiesform.cpp +++ b/src/forms/cookiesform.cpp @@ -2,7 +2,7 @@ * This file is part of smolbote. It's copyrighted by the contributors recorded * in the version control history of the file, available from its original * location: git://neueland.iserlohn-fortress.net/smolbote.git - * + * * SPDX-License-Identifier: GPL-3.0 */ diff --git a/src/forms/cookiesform.h b/src/forms/cookiesform.h index ed7e333..01c32ff 100644 --- a/src/forms/cookiesform.h +++ b/src/forms/cookiesform.h @@ -2,7 +2,7 @@ * This file is part of smolbote. It's copyrighted by the contributors recorded * in the version control history of the file, available from its original * location: git://neueland.iserlohn-fortress.net/smolbote.git - * + * * SPDX-License-Identifier: GPL-3.0 */ diff --git a/src/forms/profileview.cpp b/src/forms/profileview.cpp index df118a9..7d3396f 100644 --- a/src/forms/profileview.cpp +++ b/src/forms/profileview.cpp @@ -2,7 +2,7 @@ * This file is part of smolbote. It's copyrighted by the contributors recorded * in the version control history of the file, available from its original * location: git://neueland.iserlohn-fortress.net/smolbote.git - * + * * SPDX-License-Identifier: GPL-3.0 */ diff --git a/src/forms/profileview.h b/src/forms/profileview.h index 102cacb..a2e42f2 100644 --- a/src/forms/profileview.h +++ b/src/forms/profileview.h @@ -2,7 +2,7 @@ * This file is part of smolbote. It's copyrighted by the contributors recorded * in the version control history of the file, available from its original * location: git://neueland.iserlohn-fortress.net/smolbote.git - * + * * SPDX-License-Identifier: GPL-3.0 */ diff --git a/src/interfaces.h b/src/interfaces.h index a8dc953..f42b513 100644 --- a/src/interfaces.h +++ b/src/interfaces.h @@ -2,7 +2,7 @@ * This file is part of smolbote. It's copyrighted by the contributors recorded * in the version control history of the file, available from its original * location: git://neueland.iserlohn-fortress.net/smolbote.git - * + * * SPDX-License-Identifier: GPL-3.0 */ diff --git a/src/lib/bookmarks/bookmarkswidget.cpp b/src/lib/bookmarks/bookmarkswidget.cpp index ce1e855..10a5424 100644 --- a/src/lib/bookmarks/bookmarkswidget.cpp +++ b/src/lib/bookmarks/bookmarkswidget.cpp @@ -2,7 +2,7 @@ * This file is part of smolbote. It's copyrighted by the contributors recorded * in the version control history of the file, available from its original * location: git://neueland.iserlohn-fortress.net/smolbote.git - * + * * SPDX-License-Identifier: GPL-3.0 */ diff --git a/src/lib/bookmarks/bookmarkswidget.h b/src/lib/bookmarks/bookmarkswidget.h index da66cd0..5e5af12 100644 --- a/src/lib/bookmarks/bookmarkswidget.h +++ b/src/lib/bookmarks/bookmarkswidget.h @@ -2,7 +2,7 @@ * This file is part of smolbote. It's copyrighted by the contributors recorded * in the version control history of the file, available from its original * location: git://neueland.iserlohn-fortress.net/smolbote.git - * + * * SPDX-License-Identifier: GPL-3.0 */ diff --git a/src/lib/bookmarks/xbel.cpp b/src/lib/bookmarks/xbel.cpp index 24bdf5e..55392a1 100644 --- a/src/lib/bookmarks/xbel.cpp +++ b/src/lib/bookmarks/xbel.cpp @@ -2,7 +2,7 @@ * This file is part of smolbote. It's copyrighted by the contributors recorded * in the version control history of the file, available from its original * location: git://neueland.iserlohn-fortress.net/smolbote.git - * + * * SPDX-License-Identifier: GPL-3.0 */ diff --git a/src/lib/bookmarks/xbel.h b/src/lib/bookmarks/xbel.h index 4019a31..ed0a256 100644 --- a/src/lib/bookmarks/xbel.h +++ b/src/lib/bookmarks/xbel.h @@ -2,7 +2,7 @@ * This file is part of smolbote. It's copyrighted by the contributors recorded * in the version control history of the file, available from its original * location: git://neueland.iserlohn-fortress.net/smolbote.git - * + * * SPDX-License-Identifier: GPL-3.0 */ diff --git a/src/lib/downloads/downloadswidget.cpp b/src/lib/downloads/downloadswidget.cpp index 460014f..af41397 100644 --- a/src/lib/downloads/downloadswidget.cpp +++ b/src/lib/downloads/downloadswidget.cpp @@ -2,7 +2,7 @@ * This file is part of smolbote. It's copyrighted by the contributors recorded * in the version control history of the file, available from its original * location: git://neueland.iserlohn-fortress.net/smolbote.git - * + * * SPDX-License-Identifier: GPL-3.0 */ diff --git a/src/lib/downloads/downloadswidget.h b/src/lib/downloads/downloadswidget.h index a601147..ffd0814 100644 --- a/src/lib/downloads/downloadswidget.h +++ b/src/lib/downloads/downloadswidget.h @@ -2,7 +2,7 @@ * This file is part of smolbote. It's copyrighted by the contributors recorded * in the version control history of the file, available from its original * location: git://neueland.iserlohn-fortress.net/smolbote.git - * + * * SPDX-License-Identifier: GPL-3.0 */ diff --git a/src/lib/downloads/widgets/downloaditemwidget.cpp b/src/lib/downloads/widgets/downloaditemwidget.cpp index c42ab00..df0b6fc 100644 --- a/src/lib/downloads/widgets/downloaditemwidget.cpp +++ b/src/lib/downloads/widgets/downloaditemwidget.cpp @@ -2,7 +2,7 @@ * This file is part of smolbote. It's copyrighted by the contributors recorded * in the version control history of the file, available from its original * location: git://neueland.iserlohn-fortress.net/smolbote.git - * + * * SPDX-License-Identifier: GPL-3.0 */ diff --git a/src/lib/downloads/widgets/downloaditemwidget.h b/src/lib/downloads/widgets/downloaditemwidget.h index 9201c38..cffa32a 100644 --- a/src/lib/downloads/widgets/downloaditemwidget.h +++ b/src/lib/downloads/widgets/downloaditemwidget.h @@ -2,7 +2,7 @@ * This file is part of smolbote. It's copyrighted by the contributors recorded * in the version control history of the file, available from its original * location: git://neueland.iserlohn-fortress.net/smolbote.git - * + * * SPDX-License-Identifier: GPL-3.0 */ diff --git a/src/lib/navigation/navigationbutton.cpp b/src/lib/navigation/navigationbutton.cpp index d38066d..13daebc 100644 --- a/src/lib/navigation/navigationbutton.cpp +++ b/src/lib/navigation/navigationbutton.cpp @@ -2,7 +2,7 @@ * This file is part of smolbote. It's copyrighted by the contributors recorded * in the version control history of the file, available from its original * location: git://neueland.iserlohn-fortress.net/smolbote.git - * + * * SPDX-License-Identifier: GPL-3.0 */ diff --git a/src/lib/navigation/navigationbutton.h b/src/lib/navigation/navigationbutton.h index 0bc6c9f..ec39efa 100644 --- a/src/lib/navigation/navigationbutton.h +++ b/src/lib/navigation/navigationbutton.h @@ -2,7 +2,7 @@ * This file is part of smolbote. It's copyrighted by the contributors recorded * in the version control history of the file, available from its original * location: git://neueland.iserlohn-fortress.net/smolbote.git - * + * * SPDX-License-Identifier: GPL-3.0 */ diff --git a/src/lib/navigation/urllineedit.cpp b/src/lib/navigation/urllineedit.cpp index 03e0c0f..300a1e1 100644 --- a/src/lib/navigation/urllineedit.cpp +++ b/src/lib/navigation/urllineedit.cpp @@ -2,7 +2,7 @@ * This file is part of smolbote. It's copyrighted by the contributors recorded * in the version control history of the file, available from its original * location: git://neueland.iserlohn-fortress.net/smolbote.git - * + * * SPDX-License-Identifier: GPL-3.0 */ diff --git a/src/lib/navigation/urllineedit.h b/src/lib/navigation/urllineedit.h index 1eea1ef..73b31a3 100644 --- a/src/lib/navigation/urllineedit.h +++ b/src/lib/navigation/urllineedit.h @@ -2,7 +2,7 @@ * This file is part of smolbote. It's copyrighted by the contributors recorded * in the version control history of the file, available from its original * location: git://neueland.iserlohn-fortress.net/smolbote.git - * + * * SPDX-License-Identifier: GPL-3.0 */ diff --git a/src/main.cpp b/src/main.cpp index 084e102..34a9fbf 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -2,7 +2,7 @@ * This file is part of smolbote. It's copyrighted by the contributors recorded * in the version control history of the file, available from its original * location: git://neueland.iserlohn-fortress.net/smolbote.git - * + * * SPDX-License-Identifier: GPL-3.0 */ diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp index 01abc85..9c1292f 100644 --- a/src/mainwindow.cpp +++ b/src/mainwindow.cpp @@ -2,7 +2,7 @@ * This file is part of smolbote. It's copyrighted by the contributors recorded * in the version control history of the file, available from its original * location: git://neueland.iserlohn-fortress.net/smolbote.git - * + * * SPDX-License-Identifier: GPL-3.0 */ diff --git a/src/mainwindow.h b/src/mainwindow.h index 01cdae0..135f8fb 100644 --- a/src/mainwindow.h +++ b/src/mainwindow.h @@ -2,7 +2,7 @@ * This file is part of smolbote. It's copyrighted by the contributors recorded * in the version control history of the file, available from its original * location: git://neueland.iserlohn-fortress.net/smolbote.git - * + * * SPDX-License-Identifier: GPL-3.0 */ diff --git a/src/settings.cpp b/src/settings.cpp index fad0001..7f867f7 100644 --- a/src/settings.cpp +++ b/src/settings.cpp @@ -2,7 +2,7 @@ * This file is part of smolbote. It's copyrighted by the contributors recorded * in the version control history of the file, available from its original * location: git://neueland.iserlohn-fortress.net/smolbote.git - * + * * SPDX-License-Identifier: GPL-3.0 */ diff --git a/src/settings.h b/src/settings.h index a075b54..ec25eb4 100644 --- a/src/settings.h +++ b/src/settings.h @@ -2,7 +2,7 @@ * This file is part of smolbote. It's copyrighted by the contributors recorded * in the version control history of the file, available from its original * location: git://neueland.iserlohn-fortress.net/smolbote.git - * + * * SPDX-License-Identifier: GPL-3.0 */ diff --git a/src/singleapplication.cpp b/src/singleapplication.cpp index 0f928df..ae4d510 100644 --- a/src/singleapplication.cpp +++ b/src/singleapplication.cpp @@ -2,7 +2,7 @@ * This file is part of smolbote. It's copyrighted by the contributors recorded * in the version control history of the file, available from its original * location: git://neueland.iserlohn-fortress.net/smolbote.git - * + * * SPDX-License-Identifier: GPL-3.0 */ diff --git a/src/singleapplication.h b/src/singleapplication.h index 59361b1..a4ecb2e 100644 --- a/src/singleapplication.h +++ b/src/singleapplication.h @@ -2,7 +2,7 @@ * This file is part of smolbote. It's copyrighted by the contributors recorded * in the version control history of the file, available from its original * location: git://neueland.iserlohn-fortress.net/smolbote.git - * + * * SPDX-License-Identifier: GPL-3.0 */ diff --git a/src/webengine/urlinterceptor.cpp b/src/webengine/urlinterceptor.cpp index 9598f36..2f3f04f 100644 --- a/src/webengine/urlinterceptor.cpp +++ b/src/webengine/urlinterceptor.cpp @@ -2,7 +2,7 @@ * This file is part of smolbote. It's copyrighted by the contributors recorded * in the version control history of the file, available from its original * location: git://neueland.iserlohn-fortress.net/smolbote.git - * + * * SPDX-License-Identifier: GPL-3.0 */ diff --git a/src/webengine/urlinterceptor.h b/src/webengine/urlinterceptor.h index 1ff786b..95e96e2 100644 --- a/src/webengine/urlinterceptor.h +++ b/src/webengine/urlinterceptor.h @@ -2,7 +2,7 @@ * This file is part of smolbote. It's copyrighted by the contributors recorded * in the version control history of the file, available from its original * location: git://neueland.iserlohn-fortress.net/smolbote.git - * + * * SPDX-License-Identifier: GPL-3.0 */ diff --git a/src/webengine/webengineprofile.cpp b/src/webengine/webengineprofile.cpp index cee23da..8bdf21c 100644 --- a/src/webengine/webengineprofile.cpp +++ b/src/webengine/webengineprofile.cpp @@ -2,7 +2,7 @@ * This file is part of smolbote. It's copyrighted by the contributors recorded * in the version control history of the file, available from its original * location: git://neueland.iserlohn-fortress.net/smolbote.git - * + * * SPDX-License-Identifier: GPL-3.0 */ diff --git a/src/webengine/webengineprofile.h b/src/webengine/webengineprofile.h index 8ec4ae4..54b2a56 100644 --- a/src/webengine/webengineprofile.h +++ b/src/webengine/webengineprofile.h @@ -2,7 +2,7 @@ * This file is part of smolbote. It's copyrighted by the contributors recorded * in the version control history of the file, available from its original * location: git://neueland.iserlohn-fortress.net/smolbote.git - * + * * SPDX-License-Identifier: GPL-3.0 */ diff --git a/src/webengine/webview.cpp b/src/webengine/webview.cpp index a4bff5e..2e51587 100644 --- a/src/webengine/webview.cpp +++ b/src/webengine/webview.cpp @@ -2,7 +2,7 @@ * This file is part of smolbote. It's copyrighted by the contributors recorded * in the version control history of the file, available from its original * location: git://neueland.iserlohn-fortress.net/smolbote.git - * + * * SPDX-License-Identifier: GPL-3.0 */ diff --git a/src/webengine/webview.h b/src/webengine/webview.h index ed191e5..bf5b1a6 100644 --- a/src/webengine/webview.h +++ b/src/webengine/webview.h @@ -2,7 +2,7 @@ * This file is part of smolbote. It's copyrighted by the contributors recorded * in the version control history of the file, available from its original * location: git://neueland.iserlohn-fortress.net/smolbote.git - * + * * SPDX-License-Identifier: GPL-3.0 */ diff --git a/src/widgets/loadingbar.cpp b/src/widgets/loadingbar.cpp index 4ee966f..5dde427 100644 --- a/src/widgets/loadingbar.cpp +++ b/src/widgets/loadingbar.cpp @@ -2,7 +2,7 @@ * This file is part of smolbote. It's copyrighted by the contributors recorded * in the version control history of the file, available from its original * location: git://neueland.iserlohn-fortress.net/smolbote.git - * + * * SPDX-License-Identifier: GPL-3.0 */ diff --git a/src/widgets/loadingbar.h b/src/widgets/loadingbar.h index 9ea2bb4..e281628 100644 --- a/src/widgets/loadingbar.h +++ b/src/widgets/loadingbar.h @@ -2,7 +2,7 @@ * This file is part of smolbote. It's copyrighted by the contributors recorded * in the version control history of the file, available from its original * location: git://neueland.iserlohn-fortress.net/smolbote.git - * + * * SPDX-License-Identifier: GPL-3.0 */ diff --git a/src/widgets/mainwindowmenubar.cpp b/src/widgets/mainwindowmenubar.cpp index 8b0f6c2..b5ce229 100644 --- a/src/widgets/mainwindowmenubar.cpp +++ b/src/widgets/mainwindowmenubar.cpp @@ -2,7 +2,7 @@ * This file is part of smolbote. It's copyrighted by the contributors recorded * in the version control history of the file, available from its original * location: git://neueland.iserlohn-fortress.net/smolbote.git - * + * * SPDX-License-Identifier: GPL-3.0 */ diff --git a/src/widgets/mainwindowmenubar.h b/src/widgets/mainwindowmenubar.h index 33daa6b..9154f67 100644 --- a/src/widgets/mainwindowmenubar.h +++ b/src/widgets/mainwindowmenubar.h @@ -2,7 +2,7 @@ * This file is part of smolbote. It's copyrighted by the contributors recorded * in the version control history of the file, available from its original * location: git://neueland.iserlohn-fortress.net/smolbote.git - * + * * SPDX-License-Identifier: GPL-3.0 */ diff --git a/src/widgets/mainwindowtabbar.cpp b/src/widgets/mainwindowtabbar.cpp index 7256f09..837de8d 100644 --- a/src/widgets/mainwindowtabbar.cpp +++ b/src/widgets/mainwindowtabbar.cpp @@ -2,7 +2,7 @@ * This file is part of smolbote. It's copyrighted by the contributors recorded * in the version control history of the file, available from its original * location: git://neueland.iserlohn-fortress.net/smolbote.git - * + * * SPDX-License-Identifier: GPL-3.0 */ diff --git a/src/widgets/mainwindowtabbar.h b/src/widgets/mainwindowtabbar.h index 67f51e0..d0ae9cb 100644 --- a/src/widgets/mainwindowtabbar.h +++ b/src/widgets/mainwindowtabbar.h @@ -2,7 +2,7 @@ * This file is part of smolbote. It's copyrighted by the contributors recorded * in the version control history of the file, available from its original * location: git://neueland.iserlohn-fortress.net/smolbote.git - * + * * SPDX-License-Identifier: GPL-3.0 */ diff --git a/tools/qbs/GitRepo.js b/tools/qbs/GitRepo.js index 04021c8..f3431f9 100644 --- a/tools/qbs/GitRepo.js +++ b/tools/qbs/GitRepo.js @@ -5,11 +5,8 @@ function read(workingDirectory) { git.setWorkingDirectory(workingDirectory); var meta = Object.create(null); - git.exec("git", ["describe", "--abbrev=0", "--tag"], true); - meta.version = git.readLine(); - git.exec("git", ["describe", "--long"], true); - meta.describe = git.readLine(); + meta.version = git.readLine(); return meta; } |