Commit Graph

6985 Commits

Author SHA1 Message Date
Ben Cooksley
7f0e9fb3b2 Don't crash on exit.
BUG:284989
REVIEW:103202
2011-11-22 21:18:04 +13:00
Aaron Seigo
2bcc53419e don't count custom panel contaiments (e.g. the grouping desktop) the same as a desktop containment
from the "useful things missing from bug reports" and "wondering wtf is wrong with people
while trying to get the useful bits out of a bug report" files ...

BUG:260360
2011-11-20 18:56:06 +01:00
David Faure
3e1acd0b42 Resolve conflicts 2011-11-16 13:45:44 +01:00
David Faure
7f2b0b44c0 Merge remote-tracking branch 'origin/KDE/4.7'
Conflicts:
	plasma/CMakeLists.txt
2011-11-16 13:33:47 +01:00
Aaron Seigo
67651e12bb git rid of the shortcuts dialog on reduced functionality builds 2011-11-14 21:20:18 +01:00
Valentin Rusu
da386deb15 Merge branch 'KDE/4.7' into ksecretsservice 2011-11-08 21:27:31 +01:00
Marco Martin
71ad31df23 add the import paths right into libkdeclarative 2011-11-08 17:19:47 +01:00
Marco Martin
a70c17bc59 fix drawing of focusindicator of spinbox and combobox
use the proper prefix for drawing the combobox focusindicator
2011-11-08 12:57:46 +01:00
Marco Martin
4fad696891 possibility to put the focus over the frame
fixes the wrong shading of the lineedits, but staying retrocompatible with the old themes designed to have an highlight outside
2011-11-07 23:22:11 +01:00
Valentin Rusu
36bb121f93 Merge branch 'KDE/4.7' into ksecretsservice 2011-11-06 12:35:55 +01:00
Aaron Seigo
f38425761a a missing include 2011-11-03 12:15:52 +01:00
Aaron Seigo
ee75cfc1c8 add the variable to the c++ env 2011-11-03 12:15:27 +01:00
Aaron Seigo
58bbbb5fe6 make kutils linking properly conditional, use proper libs vars for other libraries too 2011-11-03 11:06:54 +01:00
Valentin Rusu
f4d5df71f9 Merge branch 'KDE/4.7' into ksecretsservice 2011-11-02 22:23:01 +01:00
Aaron Seigo
9a4825380f improve loading of system kcms
* don't use libkutils on reduced footprint profile builds
* load the kcms even if there isn't a configLoader for the package
2011-11-02 17:24:25 +01:00
Aaron Seigo
ebbf1bbc32 profile controled use of libkutils 2011-11-02 17:22:36 +01:00
Marco Martin
02eeddf931 correct type dekstop->desktop
please test before committing ;)
CCMAIL:viranch.mehta@gmail.com
2011-11-01 20:33:13 +01:00
Christophe Giboudeaux
ec2df8a053 Compile
GIT_SILENT
2011-10-31 21:44:37 +01:00
Viranch Mehta
6c19c0b3c4 Aaron's patch for loading system KCMs in scripted plasmoids config dialog by specifying them in the plasmoid's .desktop file 2011-10-31 22:24:39 +05:30
Aaron Seigo
8eb06eee32 Merge branch 'KDE/4.7'
Conflicts:
	CMakeLists.txt
	cmake/modules/FindNepomuk.cmake
	kdecore/tests/kservicetest.cpp
	kdeui/util/kkeyserver.h
	kio/kio/accessmanagerreply_p.h
	kio/kio/hostinfo.cpp
	kioslave/http/http.h
	kioslave/http/httpauthentication.cpp
	kioslave/http/httpauthentication.h
	kioslave/http/tests/httpauthenticationtest.cpp
	kioslave/http/tests/httpheaderdispositiontest.cpp
	kparts/browseropenorsavequestion.cpp
	plasma/data/services/plasma.protocol
	plasma/wallpaper.cpp
	plasma/widgets/videowidget.h
	solid/solid/backends/wmi/wmiquery.cpp
2011-10-31 15:25:10 +01:00
Valentin Rusu
3caa6e8a6c Merge branch 'KDE/4.7' into ksecretsservice 2011-10-30 21:30:51 +01:00
Aaron Seigo
356e618364 stop the timers 2011-10-30 10:46:28 +01:00
Aaron Seigo
176d4b896b delay usage checks so quite disconnect/reconnects don't result in unecessary loss of data
(only to reload it again immediately thereafter...)
2011-10-30 10:35:29 +01:00
Aaron Seigo
97743420a0 add a wallpaper render that takes a pre-loaded QImage. FAR FAR faster than re-loading from disk if already in memory.
new API (new overload, really), but required to fix iperformance issues elsewhere, so considered a bug fix
2011-10-30 10:24:57 +01:00
Aaron Seigo
23784d26bb less profanity 2011-10-30 01:58:11 +02:00
Script Kiddy
4371c365fa SVN_SILENT made messages (.desktop file) 2011-10-28 14:12:20 +02:00
Script Kiddy
4cc0c2fbd6 SVN_SILENT made messages (.desktop file) 2011-10-22 14:56:58 +02:00
Sebastian Kügler
4e12ac1c09 Fix small license glitch 2011-10-21 13:07:23 +02:00
Aaron Seigo
df4813ba2c add missing smallest font support for qml and js widgets
(cherry picked from commit 7a15d198c629fe1b642e727253e369bfdceb725c)
(to fix compilation of kde-runtime with kdelibs master)
2011-10-14 10:44:03 +02:00
Script Kiddy
5e7e9dc6b8 SVN_SILENT made messages (.desktop file) 2011-10-08 14:50:33 +02:00
Valentin Rusu
03ff689d04 Fix crash due to assertion in Qt when using Qt 4.8
=6  0x00007f34dd379ab5 in raise (sig=6) at
../nptl/sysdeps/unix/sysv/linux/raise.c:64
=7  0x00007f34dd37afb6 in abort () at abort.c:92
=8  0x00007f34df37d208 in qt_message_output (msgType=QtFatalMsg,
buf=0x158b628 "ASSERT: \"item_exists()\" in file
/home/kde/include/QtCore/qhash.h, line 1037") at global/qglobal.cpp:2255
=9  0x00007f34df37d384 in qt_message(QtMsgType, const char *, typedef
__va_list_tag __va_list_tag *) (msgType=QtFatalMsg, msg=0x7f34df542188
"ASSERT: \"%s\" in file %s, line %d", ap=0x7fff4835b7e0) at
global/qglobal.cpp:2301
=10 0x00007f34df37dbf2 in qFatal (msg=0x7f34df542188 "ASSERT: \"%s\" in
file %s, line %d") at global/qglobal.cpp:2484
=11 0x00007f34df37cdbb in qt_assert (assertion=0x7f34d5cc7311
"item_exists()", file=0x7f34d5cc72f0 "/home/kde/include/QtCore/qhash.h",
line=1037) at global/qglobal.cpp:1999
=12 0x00007f34d5b109ef in QMutableHashIterator<QString,
Plasma::DataContainer*>::key (this=0x7fff4835b920) at
/home/kde/include/QtCore/qhash.h:1037
=13 0x00007f34d5b0db4a in Plasma::DataEngine::removeAllSources
(this=0x1007a90) at /home/kde/work/kdelibs/plasma/dataengine.cpp:335
2011-10-05 23:10:54 +02:00
Valentin Rusu
830026d068 Fix crash due to assertion in Qt when using Qt 4.8
=6  0x00007f34dd379ab5 in raise (sig=6) at
../nptl/sysdeps/unix/sysv/linux/raise.c:64
=7  0x00007f34dd37afb6 in abort () at abort.c:92
=8  0x00007f34df37d208 in qt_message_output (msgType=QtFatalMsg,
buf=0x158b628 "ASSERT: \"item_exists()\" in file
/home/kde/include/QtCore/qhash.h, line 1037") at global/qglobal.cpp:2255
=9  0x00007f34df37d384 in qt_message(QtMsgType, const char *, typedef
__va_list_tag __va_list_tag *) (msgType=QtFatalMsg, msg=0x7f34df542188
"ASSERT: \"%s\" in file %s, line %d", ap=0x7fff4835b7e0) at
global/qglobal.cpp:2301
=10 0x00007f34df37dbf2 in qFatal (msg=0x7f34df542188 "ASSERT: \"%s\" in
file %s, line %d") at global/qglobal.cpp:2484
=11 0x00007f34df37cdbb in qt_assert (assertion=0x7f34d5cc7311
"item_exists()", file=0x7f34d5cc72f0 "/home/kde/include/QtCore/qhash.h",
line=1037) at global/qglobal.cpp:1999
=12 0x00007f34d5b109ef in QMutableHashIterator<QString,
Plasma::DataContainer*>::key (this=0x7fff4835b920) at
/home/kde/include/QtCore/qhash.h:1037
=13 0x00007f34d5b0db4a in Plasma::DataEngine::removeAllSources
(this=0x1007a90) at /home/kde/work/kdelibs/plasma/dataengine.cpp:335
2011-10-05 23:03:37 +02:00
Valentin Rusu
69488694bd Merge branch 'KDE/4.7' into ksecretsservice 2011-10-05 20:20:46 +02:00
Marco Martin
ef069ab402 RSIP_OnMouseClick as Oxygen style does 2011-10-03 17:26:12 +02:00
Aaron Seigo
28ab3be499 small performance improvement for the removeAllSources case 2011-10-03 14:07:19 +02:00
Alexey Chernov
9abdf64813 Remove waste setTextBackgroundColor() for internal KTextEdit
Removed setTextBackgroundColor() for internal KTextEdit as it
seems to be useless and leads to QTBUG-21522
(http://bugreports.qt.nokia.com/browse/QTBUG-21522).

REVIEW: 102698
2011-10-02 00:24:15 +04:00
Script Kiddy
a3ec982d01 SVN_SILENT made messages (.desktop file) 2011-10-01 15:12:18 +02:00
Aaron Seigo
0ab9bf2524 only allow valid values for the resize method, and add missing getters
(cherry picked from commit 6ef2c70949c0188f72789b924d9d88b8fb72459e)
2011-09-30 16:48:02 +02:00
Marco Martin
7f0cd3ed30 be quiet 2011-09-28 16:48:24 +02:00
Valentin Rusu
112b6b9a3d Merge remote-tracking branch 'origin/KDE/4.7' into ksecretsservice 2011-09-26 21:18:29 +02:00
Marco Martin
888a5753de export data property to make it work in QML 2011-09-24 15:54:44 +02:00
Aaron Seigo
dc07293b90 don't show configuration on failed applets 2011-09-22 22:43:16 +02:00
Aaron Seigo
064b78d8b1 only allow valid values for the resize method, and add missing getters 2011-09-19 16:18:52 +02:00
Marco Martin
21d9d07e0b remove the static hash of packagestructure
unfortunately they are stateful with a state per-package, so sharing them leads to an incorrect state
2011-09-15 23:48:52 +02:00
Valentin Rusu
41299661c2 Merge branch 'master' of ../tmp/ksecretservice into ksecretsservice 2011-09-04 13:13:37 +02:00
Valentin Rusu
ed0b414450 Merge ../ksecretservice into ksecretsservice 2011-09-04 11:08:06 +02:00
Aaron Seigo
423ce0c356 don't emit addSource for a source being added in a sourceRequest event until the event is over 2011-09-01 19:07:22 +02:00
Marco Martin
d09397673e correctly concatenate the path.
package is valid again (and passes plasmoidpackagetest)
2011-08-31 12:53:09 +02:00
Marco Martin
0e13cdcdf2 use plsmoidpackage for generic packages too 2011-08-31 12:53:09 +02:00
Marco Martin
37ac5105ab fix resolution of paths w/ only a packageRoot+name 2011-08-31 12:53:09 +02:00