Commit Graph

10363 Commits

Author SHA1 Message Date
Raphael Kubo da Costa
c0d3b534e2 Merge branch 'KDE/4.8' into KDE/4.9
Merged via `git merge --log --edit --no-ff --stat -s
recursive'. According to the diffstat, the only actual changes came
from the solid-hal commit below, as expected.

* KDE/4.8:
  HAL: Use the filtering code in HalDevice in devicesFromQuery().
  Fix mem leak (cherry picked from commit b70d6c3d5a021bc37b962c01fc57b6717e9f2868)
  Fix mem leak. Found during debug kmail (cherry picked from commit 0fddae9da44c7edb2140aeb95b4471e2521b1735)
  Allow derived classes to return invalid index in mapToSource.
  SVN_SILENT made messages (.desktop file)
2012-07-23 22:36:11 -03:00
David Faure
18d587a33d Merge branch 'frameworks' of git://anongit.kde.org/kdelibs into frameworks 2012-07-20 15:14:37 +02:00
David Faure
d930917d95 Merge remote-tracking branch 'origin/KDE/4.9' into frameworks
Conflicts:
	CMakeLists.txt
	kdecore/tests/kstandarddirstest.cpp
	kdecore/tests/kurltest.cpp
	kdeui/actions/kaction.cpp
	kdeui/tests/CMakeLists.txt
	kio/kio/krun.cpp
	nepomuk/core/nepomukmainmodel.cpp [gone]
	nepomuk/core/resourcedata.cpp [gone]
	nepomuk/core/resourcemanager.cpp [gone]
	nepomuk/core/resourcemanager_p.h [gone]
	staging/kde4support/autotests/kmimetypetest.cpp [splitted out]
	staging/kwidgets/src/utils/kglobalsettings.cpp
	tier1/itemmodels/src/kviewstateserializer.cpp
2012-07-20 15:10:26 +02:00
David Faure
6c3de95403 Merge branch 'KDE/4.9' 2012-07-20 13:23:52 +02:00
Albert Astals Cid
75ccb1b463 More K_GLOBAL_STATIC -> Q_GLOBAL_STATIC porting
Acked by dfaure
REVIEW: 105611
2012-07-19 21:19:01 +02:00
Script Kiddy
d3e78d9b8f SVN_SILENT made messages (.desktop file) 2012-07-19 15:53:10 +02:00
Script Kiddy
52fbecaf2c SVN_SILENT made messages (.desktop file) 2012-07-19 10:11:11 +02:00
David Faure
402baf422d Merge branch 'KDE/4.8' into KDE/4.9 2012-07-17 23:17:30 +02:00
Marco Martin
f65d8b2abb move all ContainmentPrivate impl in own file 2012-07-17 14:21:45 +02:00
Reza Shah
b14b2ed86d Merge branch 'KDE/4.9' 2012-07-17 21:18:02 +09:00
Marco Martin
4a747bf164 appletprivate.cpp -> applet_p.cpp 2012-07-17 13:44:50 +02:00
Marco Martin
6da0d0d612 more contrast 2012-07-16 21:53:56 +02:00
Marco Martin
095a196120 move qgv privates in graphicsview/private 2012-07-16 21:35:17 +02:00
David Faure
68a7db068b KUrl::List -> QList<QUrl> everywhere. Make KDirNotify API take urls, to avoid conversions in the caller.
DBus, however, needs QList<QUrl> <-> QStringList conversions, which is why
both nepomuk and now KIO have methods for this... => submitted to Qt5's QUrl.
2012-07-15 23:56:29 +02:00
Ignat Semenov
d6b90f183e slots -> Q_SLOTS 2012-07-15 23:28:36 +04:00
Ignat Semenov
3c46a565df slots -> Q_SLOTS 2012-07-15 23:26:14 +04:00
Marco Martin
7fb69d6f42 slide in the expected direction
BUG:302080
FIXED-IN:4.10
2012-07-13 16:07:07 +02:00
Marco Martin
d2f729d000 modify the hack that doesn't break in some cases 2012-07-13 10:50:07 +02:00
Marco Martin
8a04030fdf less ugly workaround for disappearing Qt::Popup
still a workaround but slightly less ugly and works on Qt 4.8 too
2012-07-12 17:51:28 +02:00
Marco Martin
1614ea5cf9 use the window attribute fot the tooltip test 2012-07-12 13:32:43 +02:00
Marco Martin
8c8d4bfb09 fix the border disable logic 2012-07-12 11:58:58 +02:00
Marco Martin
e571a8ea6e don't cut broeders for tooltips 2012-07-12 11:14:14 +02:00
Marco Martin
a0e1dbcca6 fix shadow 2012-07-09 11:11:48 +02:00
Benjamin Port
e3e6489165 Change some call to KLineEdit::setClickMessage to QLineEdit::setPlaceholderText 2012-07-07 03:11:37 +02:00
David Faure
9d6bf88aba My computer isn't that fast apparently... 2012-07-06 09:08:17 +02:00
David Faure
fc73e05210 Merge remote-tracking branch 'origin/KDE/4.9' into frameworks
Conflicts:
	CMakeLists.txt [versioning]
	kio/kio/accessmanager.cpp [headers]
	tier1/solid/src/solid/backends/wmi/wmiacadapter.cpp [Q_EMIT]
	tier1/solid/src/solid/backends/wmi/wmibattery.cpp [Q_EMIT]
2012-07-02 15:53:39 +02:00
David Faure
978df0524d Port away from KStandardDirs::realFilePath() 2012-07-01 10:23:15 +02:00
Johannes Tröscher
796211bbd5 Plasma qml-Components ToolButton: change text-color on hover more fluently
REVIEW: 105375
REVIEWED-BY: troscher aseigo
2012-06-28 19:40:33 +02:00
Marco Martin
daef7975e1 close a toolbox on mouse ress anywhere
BUG:260964
FIXED-IN:4.9
2012-06-27 12:33:07 +02:00
David Faure
ca9720b3d8 Merge remote-tracking branch 'origin/KDE/4.8' into origin-frameworks
Conflicts:
	CMakeLists.txt
	kdeui/actions/kaction.cpp
	tier1/solid/src/solid/powermanagement.cpp
2012-06-26 19:27:14 +02:00
Script Kiddy
6efd9f1c99 SVN_SILENT made messages (.desktop file) 2012-06-26 19:13:32 +02:00
Marco Martin
daa3c78241 use pointSizeF
BUG:296117
FIXED-IN:4.9
2012-06-25 11:18:59 +02:00
Andre Woebbeking
5b735cfec0 -pedantic 2012-06-24 23:10:47 +02:00
David Edmundson
2030c05cf1 Remove text scaling on ToolButton
BUG: 302077
Reviewed-by: Marco Martin
2012-06-23 03:19:47 +01:00
David Edmundson
9bdfa5fe55 Remove animation when changing from normal to pressed state
This was too slow, and for a normal mouse click was too slow to actually be seen.
Releasing from pressed still animates to increase visual feedback.
2012-06-23 03:19:41 +01:00
David Edmundson
bf194777c0 Remove resize animation on buttom press 2012-06-23 03:19:41 +01:00
David Faure
02260596a2 Fix compilation with Qt4 2012-06-23 01:00:19 +02:00
David Faure
747733bb41 Enable X11 code paths in the Qt5 build.
Change a number of Q_WS_X11 to HAVE_X11, fix compilation, cleanups.
Ported KWindowSystem to Q_GLOBAL_STATIC, to remove awful K_GLOBAL_STATIC fork.
Delete _qws and _qpa stubs for kwindowsystem, we need the x11 one on x11.
2012-06-23 00:24:52 +02:00
Marco Martin
120c423448 new progressbar theme 2012-06-21 16:02:08 +02:00
Marco Martin
83946f2b66 respect the hint-bar-stretch hint 2012-06-21 16:02:08 +02:00
Marco Martin
988737b128 fix behavior when hint-bar-stretch is present 2012-06-21 15:32:52 +02:00
Marco Martin
1b5bf827c6 don't create handles when applet-in-applet
yet another reason why this shouldn't be done ever
BUG:301648
2012-06-21 10:35:55 +02:00
David Faure
5118a8d226 last kmimetype -> qmimetype port 2012-06-21 09:19:32 +02:00
David Faure
127c54fd1c The restructuring in 02dcf75a073017a049db70e3e duplicated some code,
including this list of mimetypes, so it wasn't updated after the changes
in 4.8 (897b07485a8c) got merged into the other copy of this code, in this same file...

CCMAIL: aseigo@kde.org
2012-06-21 00:04:24 +02:00
David Faure
1480efc1ce Fix compilation, by reverting package.cpp to before the merge
and redoing c5f36b67f4d3a98fe93dcbef7fb3361248e69b1b
(removal of KIO code path) by hand.
2012-06-20 23:58:30 +02:00
Johannes Tröscher
7d2b4427ba plasma qml components: highlight dualstate button also on focus
highlight dualstate button also on focus + codecleanup in dualstate button

REVIEW: 105232
2012-06-20 20:09:34 +02:00
Marco Martin
ed1e691b2d avoid repaints when the same id is set again
CCBUG:301903
2012-06-20 14:06:23 +02:00
David Faure
a2b502dbf4 Port the last uses of KMimeType. Only plasma/package.cpp is left... 2012-06-20 00:38:04 +02:00
Marco Martin
977f1aceeb prevent save of not loaded modules
BUG:301507
2012-06-19 20:05:06 +02:00
David Faure
8f02ed76a1 some compilation fixes, but plasma/package.cpp is still a big mess 2012-06-18 13:52:02 +02:00