1
mirror of https://invent.kde.org/network/falkon.git synced 2024-11-14 02:52:12 +01:00
Commit Graph

5539 Commits

Author SHA1 Message Date
l10n daemon script
871a88811d GIT_SILENT made messages (after extraction) 2020-07-21 07:54:23 +02:00
l10n daemon script
641b5350d7 SVN_SILENT made messages (.desktop file) - always resolve ours
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
2020-07-20 08:37:34 +02:00
l10n daemon script
11297e33e3 GIT_SILENT made messages (after extraction) 2020-07-20 07:26:20 +02:00
l10n daemon script
3d169e7d61 SVN_SILENT made messages (.desktop file) - always resolve ours
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
2020-06-18 08:27:29 +02:00
l10n daemon script
ab102f8c13 GIT_SILENT made messages (after extraction) 2020-06-18 07:13:43 +02:00
l10n daemon script
1904226da8 SVN_SILENT made messages (.desktop file) - always resolve ours
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
2020-06-17 16:50:02 +02:00
l10n daemon script
4511ac8512 GIT_SILENT made messages (after extraction) 2020-06-17 15:34:29 +02:00
Tobias C. Berner
da5a1754ca Add Intl_LIBRARIES and Intl_INCLUDE_DIRS to FalkonPrivate
Summary: See https://build.kde.org/view/OS%20-%20FreeBSD/job/Extragear/job/falkon/job/stable-kf5-qt5%20FreeBSDQt5.13/13/console

Reviewers: #freebsd, aacid, drosca

Reviewed By: drosca

Subscribers: falkon

Tags: #falkon

Differential Revision: https://phabricator.kde.org/D26007

(cherry picked from commit 3efda1bda4)
2020-04-16 13:07:26 +02:00
Laurent Montel
5eedcb5b44 Add missing include in last qt5.14
(cherry picked from commit bbde5c6955)
2020-04-16 12:01:59 +02:00
l10n daemon script
59d76deec6 GIT_SILENT made messages (after extraction) 2020-04-06 08:50:27 +02:00
3070f7b032 Merge branch 'fix-build-with-qt-5.15' into 'Falkon/3.1'
Fix build with Qt 5.15

See merge request kde/falkon!3
2020-03-30 19:46:45 +00:00
Heiko Becker
2ca83509db Fix build with Qt 5.15
QPainterPath is no longer included via qtransform.h (since
5.15.0-beta2, 50d2acdc93b4de2ba56eb67787e2bdcb21dd4bea in qtbase.git).
2020-03-29 12:54:08 +02:00
l10n daemon script
b577df4466 SVN_SILENT made messages (.desktop file) - always resolve ours
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
2020-02-12 10:08:15 +01:00
l10n daemon script
50c2cebdd6 SVN_SILENT made messages (.desktop file) - always resolve ours
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
2020-01-13 09:36:25 +01:00
l10n daemon script
3953f3e0bf GIT_SILENT made messages (after extraction) 2020-01-13 08:18:40 +01:00
Luigi Toscano
f1b7661b1f Update a few internal KDE URLs
Use the generic redirect commits.kde.org insteaf of:
- projects.kde.org, which has been obsolete for a while;
- cgit.kde.org, which is not a future-proof URL anyway.
2019-12-16 00:34:12 +01:00
Albert Astals Cid
29f96b7504 Fix lupdate warnings
Summary:
Class 'XXX' lacks Q_OBJECT macro

If you use tr() in a class it needs Q_OBJECT

Test Plan: It builds

Reviewers: drosca

Reviewed By: drosca

Subscribers: falkon

Tags: #falkon

Differential Revision: https://phabricator.kde.org/D25911
2019-12-14 00:32:16 +01:00
David Rosca
bfb9420cbb
PyFalkon: Fix C linkage issues
BUG: 413093
FIXED-IN: 3.1.1
2019-10-31 10:37:24 +01:00
l10n daemon script
1363b848a5 SVN_SILENT made messages (.desktop file) - always resolve ours
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
2019-09-30 08:39:50 +02:00
l10n daemon script
74e55c59d3 SVN_SILENT made messages (.desktop file) - always resolve ours
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
2019-09-05 09:04:23 +02:00
l10n daemon script
8b4d2556a0 SVN_SILENT made messages (.desktop file) - always resolve ours
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
2019-08-31 08:46:56 +02:00
l10n daemon script
821b1c6f81 SVN_SILENT made messages (.desktop file) - always resolve ours
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
2019-08-30 09:20:27 +02:00
l10n daemon script
1162a5cf20 SVN_SILENT made messages (.desktop file) - always resolve ours
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
2019-08-24 08:41:15 +02:00
l10n daemon script
026320183c GIT_SILENT made messages (after extraction) 2019-08-09 07:55:37 +02:00
l10n daemon script
677380520c SVN_SILENT made messages (.desktop file) - always resolve ours
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
2019-08-06 08:27:21 +02:00
Pino Toscano
070bce531c i18n: use https for bugs.kde.org 2019-06-30 11:26:59 +02:00
l10n daemon script
6ae5f0e9e5 SVN_SILENT made messages (.desktop file) - always resolve ours
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
2019-06-23 18:39:57 +02:00
l10n daemon script
3fdd1d95d3 SVN_SILENT made messages (.desktop file) - always resolve ours
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
2019-06-21 08:51:00 +02:00
l10n daemon script
483f5f70b5 SVN_SILENT made messages (.desktop file) - always resolve ours
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
2019-06-19 08:52:28 +02:00
l10n daemon script
24434a05a7 GIT_SILENT made messages (after extraction) 2019-06-06 07:15:38 +02:00
l10n daemon script
eb3e966363 GIT_SILENT made messages (after extraction) 2019-06-03 07:38:51 +02:00
l10n daemon script
44c85c7f65 SVN_SILENT made messages (.desktop file) - always resolve ours
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
2019-05-30 08:26:40 +02:00
l10n daemon script
cc248c72c8 SVN_SILENT made messages (.desktop file) - always resolve ours
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
2019-05-25 08:42:22 +02:00
David Rosca
3075477492
IconProvider: Add mutex around icon cache
BUG: 406972
FIXED-IN: 3.1.1
2019-05-24 21:47:20 +02:00
l10n daemon script
8e57d0895c SVN_SILENT made messages (.desktop file) - always resolve ours
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
2019-05-11 09:01:28 +02:00
l10n daemon script
01f3c3d376 GIT_SILENT made messages (after extraction) 2019-05-11 07:51:53 +02:00
l10n daemon script
8393f62ad4 SVN_SILENT made messages (.desktop file) - always resolve ours
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
2019-05-04 08:50:18 +02:00
l10n daemon script
5614a32d5c SVN_SILENT made messages (.desktop file) - always resolve ours
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
2019-05-03 08:53:24 +02:00
l10n daemon script
0d5e79a8a9 SVN_SILENT made messages (.desktop file) - always resolve ours
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
2019-04-24 09:02:26 +02:00
l10n daemon script
05b63efb59 SVN_SILENT made messages (.desktop file) - always resolve ours
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
2019-04-23 09:11:22 +02:00
David Rosca
f38265230d
SideBarManager: Clear active sidebar upon close
BUG: 406724
FIXED-IN: 3.1.1
2019-04-21 11:21:29 +02:00
David Rosca
92721449c0
VerticalTabs: Also override Ctrl+PgUp/PgDown shortcuts 2019-04-20 19:26:00 +02:00
David Rosca
514097ef4c
BookmarksManager: Don't allow to create bookmark without parent
BUG: 406433
FIXED-IN: 3.1.1
2019-04-20 14:08:44 +02:00
David Rosca
8e4328b03c
QmlUserScript: Automatically install/uninstall underlying script 2019-04-20 11:52:28 +02:00
David Rosca
a8d43ed0c8
QmlStaticData: Prevent deleting singletons by QML engine 2019-04-20 11:23:16 +02:00
David Rosca
231101151e
QmlPluginLoader: Fallback to main.qml as entrypoint if not set 2019-04-20 10:54:01 +02:00
David Rosca
10eb20c162
QmlExtensionScheme: Fix warning about QQmlParserStatus qobject_cast 2019-04-20 10:46:53 +02:00
David Rosca
eb4b68fdd9
MainApplication: Create private browsing QWebEngineProfile without parent
Fixes crash on shutdown
2019-04-20 09:33:44 +02:00
l10n daemon script
c5e1aab96a SVN_SILENT made messages (.desktop file) - always resolve ours
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
2019-04-20 09:03:19 +02:00
David Rosca
232eaa54bd
KDEFrameworksIntegration: Create Purpose menu in init 2019-04-17 16:28:45 +02:00