Martin Gräßlin
9291b18cee
Merge branch 'master' into frameworks-scratch
...
Conflicts:
CMakeLists.txt
kwin/effects.cpp
kwin/effects/logout/logout.cpp
kwin/effects/presentwindows/main.qml
kwin/effects/presentwindows/presentwindows.cpp
kwin/effects/presentwindows/presentwindows.h
kwin/effects/zoom/zoom_config.cpp
kwin/libkwineffects/kwinglutils_funcs.cpp
kwin/libkwineffects/kwinxrenderutils.cpp
kwin/nvidiahack.cpp
kwin/xcbutils.h
plasma/desktop/containments/desktop/plasma-containment-desktop.desktop
plasma/generic/wallpapers/image/image.cpp
plasma/generic/wallpapers/image/plasma-wallpaper-image.desktop
2013-08-07 10:10:06 +02:00
Harald Sitter
2c915037c7
explicitly compare latin1 strings in qassert (fixes build with debugfull)
2013-08-07 09:25:27 +02:00
Hrvoje Senjan
bd078d5c23
Unbreak the build
...
1e9f8c8 was correct but KStyle's cmake file wasn't
2013-08-07 05:19:28 +02:00
Hrvoje Senjan
b641c12890
Remove wrongly added component
2013-08-07 04:41:26 +02:00
Hrvoje Senjan
7aa789f781
Adjust to replacements
2013-08-07 03:24:36 +02:00
Hrvoje Senjan
b2f5a68bbb
Remove KWidgets references
2013-08-07 03:23:58 +02:00
Alex Richardson
4d10921548
fix build by including moc_plastikplugin.cpp, not plastikplugin.moc
2013-08-06 23:07:30 +02:00
Hugo Pereira Da Costa
22df9b0c19
removed KDEUI includes
2013-08-06 18:10:06 +02:00
Eike Hein
0f14f28d88
Fix linker error.
2013-08-06 15:58:14 +02:00
Martin Gräßlin
f8092ded4e
Remove KLocalizedString::insertCatalog from Oxygen
...
It got removed in frameworks recently and it seems like their is no
replacement. Therefore all of them are currently removed. Also there are
no porting guides yet for i18n.
2013-08-05 10:40:00 +02:00
Hugo Pereira Da Costa
635e1243e7
Removed unnecessary Qt path in includes.
2013-08-02 09:39:09 +02:00
Martin Gräßlin
22e2efea22
QX11Info is no longer in QtGui
2013-08-02 08:37:36 +02:00
Hugo Pereira Da Costa
53666c655c
Added KConfigWidget to linking
2013-08-01 20:28:43 +02:00
Hugo Pereira Da Costa
43c4594fac
- added HAVE_X11 definition (needed for demo code)
...
- re-included compilation of demo code
- removed linking against kde4support.
2013-08-01 20:20:44 +02:00
Hugo Pereira Da Costa
8839e86e50
removed KDebug
2013-08-01 20:20:27 +02:00
Hugo Pereira Da Costa
d29a9c43c3
Fixed compilation against qt5/kf5
2013-08-01 20:19:37 +02:00
Hugo Pereira Da Costa
e261b3b20c
re-enabled compilation of the 'config' code
2013-08-01 19:38:54 +02:00
Hugo Pereira Da Costa
70553ce8a2
kmessagebox -> qmessagebox
2013-08-01 19:38:53 +02:00
Hugo Pereira Da Costa
b993d576c9
fixed compilation against qt5
2013-08-01 19:38:53 +02:00
Hugo Pereira Da Costa
e80da066ff
ktabwidget -> qtabwidget
2013-08-01 19:38:53 +02:00
Hugo Pereira Da Costa
49362532ff
kpushbutton -> qpushbutton
2013-08-01 19:38:52 +02:00
Hugo Pereira Da Costa
c00fdade17
moved dialog layout to ui
2013-08-01 19:38:52 +02:00
Hugo Pereira Da Costa
965aaabda8
moved QDialog layout to ui for DetectWidget.
2013-08-01 19:38:52 +02:00
Martin Gräßlin
1807265813
KDebug moved to KDE4Support
...
Adjust target link libraries.
2013-07-31 14:07:58 +02:00
Martin Gräßlin
728cb09c1c
Oxygen windeco doesn't need to link XRender
2013-07-31 07:28:15 +02:00
Martin Gräßlin
4141c101f1
Enable building of the Oxygen window decoration
...
Demo and config stays disabled - we are only interested in the window
decoration for now.
Seems to work :-)
CCMAIL: hugo@oxygen-icons.org
2013-07-30 07:57:15 +02:00
Martin Gräßlin
0e2b4b39cf
Adjust target link libraries for Oxygen windeco
2013-07-30 07:57:14 +02:00
Martin Gräßlin
eefdc2cedf
Port SizeGrip::embed to use xcb
...
XLib code was throwing compile errors, so just ported it over to xcb
directly.
2013-07-30 07:57:14 +02:00
Martin Gräßlin
2c7e3edcaa
Drop QByteArray argument from DecoHelper ctor
...
Has been removed from Helper parent class.
2013-07-30 07:11:28 +02:00
Martin Gräßlin
ec29f93604
Add missing includes in oxygenclient
2013-07-30 07:09:00 +02:00
Martin Gräßlin
acc6ce9092
Fix no cast from ascii in Oxygen windeco
2013-07-30 07:02:11 +02:00
Martin Gräßlin
9b6ae91011
Fix include of X11Info in Oxygen windeco
2013-07-30 06:57:02 +02:00
Martin Gräßlin
f5819656b6
Q_SLOTS/Q_SIGNALS in Oxygen windeco
2013-07-30 06:56:16 +02:00
Martin Gräßlin
48b1c388bc
Re-enable compilation of KWin decorations
...
Only Aurorae gets compiled for now. Oxygen is disabled by config option
and legecay decos are commented in CMakeLists.txt.
2013-07-25 18:05:58 +02:00
Martin Gräßlin
c2d3da70eb
Fix linking of Aurorae
2013-07-25 18:05:32 +02:00
Martin Gräßlin
1e69ac6866
Use QStandardPaths in KConfig ctor call in Aurorae
2013-07-25 18:04:56 +02:00
Martin Gräßlin
f924be909b
Fix no cast from ASCII in Aurorae
2013-07-25 18:04:27 +02:00
Martin Gräßlin
a1c0c4048d
Add missing KGlobal include
2013-07-25 18:01:04 +02:00
Martin Gräßlin
e7f76f8736
Use Q_PLUGIN_METADATA for Aurorae's deco QML plugins
2013-07-25 18:00:27 +02:00
Martin Gräßlin
d6a80a3f0a
Use uppercase Q_SLOTS/Q_SIGNALS in Aurorae
2013-07-25 17:59:30 +02:00
l10n daemon script
7bd89eb6ee
SVN_SILENT made messages (.desktop file)
2013-07-14 04:16:47 +00:00
l10n daemon script
34c8d6feb6
SVN_SILENT made messages (.desktop file)
2013-06-05 04:54:40 +00:00
l10n daemon script
020f6fd612
SVN_SILENT made messages (.desktop file)
2013-05-30 04:29:57 +00:00
Alexandr Akulich
cb3f1b7776
Polish Plastik theme.
...
Fixed caption and left buttons positions.
Added enphasizing line under titleRow. (like in 4.9.x version).
REVIEW: 109992
BUG: 317220
FIXED-IN: 4.11
2013-05-29 07:34:13 +02:00
Oliver Henshaw
47acf4ee9a
Merge remote-tracking branch 'origin/KDE/4.10' into master
...
Conflicts:
kwin/scripting/scripting.cpp
powerdevil/daemon/actions/bundled/powerdevildimdisplayaction.desktop
solid-actions-kcm/device-actions/solid-device-SerialInterface.desktop
2013-05-28 17:36:53 +01:00
Oliver Henshaw
b61bca0f3d
add qml import paths in correct order
...
addImportPath prepends the path to importPathList so we must add our
paths in reverse order.
Based on the fix for kdeclarative.cpp in kdelibs
400b9f2e9d10386bb175b6123fe0cdaafeaffe61
REVIEW: 110670
2013-05-28 17:23:19 +01:00
Oliver Henshaw
2d5ebd3b8d
Replace foreach with java-style iterator
...
In preparation for reversing the loop.
REVIEW: 110670
2013-05-28 17:23:09 +01:00
l10n daemon script
a3b09b7ac4
SVN_SILENT made messages (.desktop file)
2013-05-22 03:36:01 +00:00
l10n daemon script
ad8195cad9
SVN_SILENT made messages (.desktop file)
2013-05-21 14:04:28 +00:00
Script Kiddy
dfd72523b1
SVN_SILENT made messages (.desktop file)
2013-05-02 09:17:01 +02:00