Commit Graph

7270 Commits

Author SHA1 Message Date
Aaron Seigo
2c7751ccef Merge remote-tracking branch 'origin/KDE/4.7' into frameworks
Conflicts:
	CMakeLists.txt
	kio/kio/kfileitem.cpp
	plasma/datacontainer.cpp
	plasma/datacontainer.h
	plasma/private/wallpaper_p.h
	plasma/private/wallpaperrenderthread.cpp
2011-10-30 10:44:59 +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
Stephen Kelly
cdad77050d Merge remote-tracking branch 'origin/KDE/4.7' into frameworks 2011-10-18 22:11:25 +02:00
Script Kiddy
5e7e9dc6b8 SVN_SILENT made messages (.desktop file) 2011-10-08 14:50:33 +02:00
Rolf Eike Beer
7d1a833fc1 Merge branch 'KDE/4.7' into frameworks 2011-10-07 18:47:11 +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
David Faure
e6d33e8d14 Merge remote branch 'origin/KDE/4.7' into origin-frameworks 2011-10-05 11:09:19 +02:00
David Faure
108536cb93 Port from KTemporaryFile to QTemporaryFile, and deprecate KTemporaryFile.
My merge request (qtbase/57) for the missing feature in QTemporaryFile
(naming the temp file after the application, to be able to sort out which
app is leaking temp files), has been merged, so we don't need KTemporaryFile
anymore.
2011-10-04 16:52:38 +02:00
Marco Martin
044915b6cb RSIP_OnMouseClick as Oxygen style does 2011-10-04 16:47:04 +02:00
Aaron Seigo
81a320fe70 small performance improvement for the removeAllSources case 2011-10-04 16:47:04 +02:00
Alexey Chernov
6ea166f2af 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-04 16:47:04 +02:00
Script Kiddy
fa9f077459 SVN_SILENT made messages (.desktop file) 2011-10-04 16:47:03 +02:00
Aaron Seigo
199e98ce5b git rid of gratuitous query term
(obsoleted quite some time ago)
2011-10-03 19:54:51 +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
David Faure
685bebaed9 Merge remote branch 'origin/KDE/4.7' into origin-frameworks
Conflicts:
	kdecore/tests/kservicetest.cpp
	plasma/framesvg.cpp
2011-09-28 17:44:59 +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
David Faure
23d42f2724 Remove unused include 2011-09-25 18:55:05 +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
Stephen Kelly
9fca702bb0 Merge remote-tracking branch 'origin/KDE/4.7' into frameworks 2011-09-22 17:04:54 +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
Aaron Seigo
f8d94a98b8 use a hash instead of a map: the sorting was irrelevant and the API that uses this was ported to hashes as well 2011-09-19 11:27:54 +02:00
David Faure
00b0cc8085 oops, git rm didn't do what I thought during merge-conflict-resolving 2011-09-18 14:01:03 +02:00
David Faure
9cc86d27af Merge remote branch 'origin/KDE/4.7' into origin-frameworks
Conflicts:
	plasma/packagestructure.cpp (discarded the 4.7 patch)
	tier1/solid/solid/backends/wmi/wmidevice.cpp (Q_FOREACH)
2011-09-18 13:55:17 +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
Stephen Kelly
94e661c307 Only build plasma if kdepimlibs is found.
Plasma uses gpgme++ from there, which will be split out eventually.
2011-09-15 17:16:43 +02:00
Romain Perier
13c87efb26 Move kauth to tier1/libkauth (reviewed by dfaure) 2011-09-09 19:08:47 +02:00
Mario Bensi
21a64f4a57 Remove warning on deprecated KFilter::device* 2011-09-09 08:59:19 +02:00
Stephen Kelly
3a7a425344 Remove the exports targets from libraries in frameworks.
If there is no kdelibs, there is no kdelibs exports. This fixes some
cmake errors resulting from making it possible to build itemmodels
standalone.
2011-09-04 21:45:19 +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
David Faure
55240b8f31 Must include config-plasma.h *before* the #ifndefs... 2011-09-02 10:50:04 +02:00
David Faure
24bd3d69eb Merge remote branch 'origin/KDE/4.7' into origin-frameworks 2011-09-02 10:08:03 +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
Aaron Seigo
9450a41618 Merge remote-tracking branch 'origin/KDE/4.7' into frameworks
Conflicts:
	plasma/package.cpp
	plasma/packagestructure.cpp
	plasma/private/package_p.h
	plasma/scripting/scriptengine.cpp
2011-09-01 18:23:09 +02:00
David Faure
f4f93336b6 include path fix (this will be simpler once fully separated...) 2011-08-31 18:17:11 +02:00
David Faure
4bb1ea7744 More include paths
Running grep would have been a good idea ;-)
2011-08-31 18:07:04 +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