122 Commits (401efc28a87c8fb97a064f46a017a64dbd27d28c)

Author SHA1 Message Date
l10n daemon script 6bb9f6db7b 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"
9 years ago
l10n daemon script 3433b05c97 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"
9 years ago
l10n daemon script c342be5961 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"
9 years ago
l10n daemon script 99237c9b3f 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"
9 years ago
l10n daemon script a3c7eac1b8 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"
9 years ago
Hrvoje Senjan 9bddd0fe8a Fix installation of GHNS material
plasmapkg is no more

Reviewed-by: Martin Gräßlin
10 years ago
Johannes Leuschner 9e5f7009b3 Correcting Exec command in kwinscripts.desktop
BUG: 334177
FIXED-IN: 5.1.1
10 years ago
l10n daemon script dcff2f9e6a SVN_SILENT made messages (.desktop file) 10 years ago
Sebastian Kügler b82bce4d5b Adapt to latet changes from review 10 years ago
Sebastian Kügler b5000a21b7 Adapt to new systemsettings categories
Roughly, this moves the systemsettings-visible KCModules under either
Workspace | Window Behavior and Workspace | Desktop Behavior, as laid
out here: http://forum.kde.org/viewtopic.php?f=285&t=121053&start=30#p313837
10 years ago
l10n daemon script 28c7f3c47d SVN_SILENT made messages (.desktop file) 10 years ago
l10n daemon script e73f6b2278 SVN_SILENT made messages (.desktop file) 10 years ago
Martin Gräßlin 53975ccd9c [kcmkwin/scripts] Add missing ki18n_wrap_ui 10 years ago
Martin Gräßlin 8aa02a6daa [kcmkwin/scripting] Fix DBus service name
org.kde.kwin -> org.kde.KWin
11 years ago
Andreas Hartmetz 9c73055a10 Adapt to changes in KAboutData. 11 years ago
Martin Gräßlin 1c2f27945c Adjust kcmkwins to new ki18n
Define the TRANSLATION_DOMAIN in each of the kcms and use
ki18n_wrap_ui.
11 years ago
l10n daemon script 7553c411c2 SVN_SILENT made messages (.desktop file) 11 years ago
l10n daemon script 2f28437e24 SVN_SILENT made messages (.desktop file) 11 years ago
l10n daemon script 2838a9b606 SVN_SILENT made messages (.desktop file) 11 years ago
l10n daemon script 15aa971aab SVN_SILENT made messages (.desktop file) 11 years ago
Martin Gräßlin ee20101142 Fix deprecated warnings for KAboutData
Ctor with catalog name got deprecated, use ctor without it.
11 years ago
l10n daemon script e1f418f4d0 SVN_SILENT made messages (.desktop file) 11 years ago
l10n daemon script f44575ddbf SVN_SILENT made messages (.desktop file) 11 years ago
l10n daemon script 69c3289c18 SVN_SILENT made messages (.desktop file) 11 years ago
l10n daemon script e6db000065 SVN_SILENT made messages (.desktop file) 11 years ago
l10n daemon script eef56c98b2 SVN_SILENT made messages (.desktop file) 11 years ago
l10n daemon script 10f89d6019 SVN_SILENT made messages (.desktop file) 11 years ago
Martin Gräßlin dbf2218338 [kwin] kde4_add_ui_files -> qt5_wrap_ui
Less deprecated CMake usage.
11 years ago
Aleix Pol c72e519d9c Remove KDE/ prefix in include directories
It's unneeded and deprecated since KF5.
11 years ago
l10n daemon script 6f8c3dd771 SVN_SILENT made messages (.desktop file) 11 years ago
Martin Gräßlin a6c47e0314 [kwin] Add ProvidersUrl to *.knsrc
That at least inits the GHNS download dialog.
11 years ago
Martin Gräßlin 16c44810cb [kwin] Drop more unused includes
--warnings
11 years ago
l10n daemon script 22a5e1109f SVN_SILENT made messages (.desktop file) 11 years ago
Martin Gräßlin 930a6b5e05 Ensure the KDE4Support KNS headers are not included
This should hopefully unbreak the Jenkins build.
11 years ago
l10n daemon script 63165c870f SVN_SILENT made messages (.desktop file) 11 years ago
Martin Klapetek 54bc491c46 Port to KF5 renaming changes 11 years ago
Aleix Pol f8468b4043 Drop KDE4Support in kde-workspace/kwin
REVIEW: 114316
11 years ago
Aleix Pol 7b110f0671 Improve CMake usage
It's basically a run of the port-cmake.sh script in here, mostly the changes
are the following:
- Using KF5::* targets
- Using the proper macros, following recent developments in frameworks
11 years ago
Aurélien Gâteau 05b6de1002 ${KDE4Support_LIBRARIES} => KF5::KDE4Support
Fixes a few link errors
11 years ago
Sebastian Kügler b68867463e Change KF5::plasma to KF5::Plasma
Library name has changed in plasma-framework to bring it in line with
KF5:CamelCasing naming.
11 years ago
Sebastian Kügler ab08d3da9b Don't look for plasma headers under KDE 11 years ago
Martin Gräßlin c118b1147d [kwinscripts] Adjust target link libraries for kwinscripts KCM 11 years ago
Martin Gräßlin 2e47f34398 [kwinscripts] Disable installing a local script for the moment
Plasma::Package changed in a way that it's not just a trivial change
to get it compile again.
11 years ago
Martin Gräßlin 469a0c255c [kwinscript] Adjustments to obsoleted members
* KAboutData
* removing insert catalog
* KIcon -> QIcon::fromTheme
* missing moc
11 years ago
Martin Gräßlin 5bdb960413 [kwinscripts] kcmshell4 -> kcmshell5 11 years ago
Martin Gräßlin 6ada27e294 [kwinscripts] slots -> Q_SLOTS 11 years ago
Martin Gräßlin 2017f82670 [kwinscripts] KFileDialog -> QFileDialog 11 years ago
Martin Gräßlin 969e6b85e7 Merge branch 'master' into frameworks-scratch
Conflicts:
	CMakeLists.txt
	kwin/client.cpp
	kwin/effects/highlightwindow/highlightwindow.cpp
	kwin/libkwineffects/kwingltexture.cpp
	kwin/libkwineffects/kwinxrenderutils.cpp
	kwin/scene_opengl.cpp
	kwin/workspace.cpp
	plasma/desktop/applets/kickoff/CMakeLists.txt
	plasma/desktop/applets/taskmanager/package/contents/code/tools.js
	plasma/desktop/applets/taskmanager/package/contents/ui/Task.qml
	plasma/desktop/applets/taskmanager/package/contents/ui/main.qml
	plasma/desktop/applets/taskmanager/package/metadata.desktop
	plasma/desktop/applets/taskmanager/plugin/textlabel.h
	plasma/desktop/applets/tasks/CMakeLists.txt
	plasma/desktop/applets/tasks/package/metadata.desktop
	plasma/desktop/applets/tasks/tasks.cpp
	plasma/desktop/toolboxes/plasma-toolbox-desktoptoolbox.desktop
	plasma/generic/applets/activitybar/activitybar.cpp
	plasma/generic/wallpapers/color/plasma-wallpaper-color.desktop
	plasma/generic/wallpapers/image/plasma-wallpaper-image.desktop
11 years ago
Anselmo L. S. Melo 00d507b7ff Porting kcmkwin to Qt5/KF5: QStandardPaths
REVIEW: 111975
11 years ago
l10n daemon script df17849412 SVN_SILENT made messages (.desktop file) 11 years ago