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
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
Marco Martin
4a747bf164
appletprivate.cpp -> applet_p.cpp
2012-07-17 13:44:50 +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
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
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
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
Andre Woebbeking
5b735cfec0
-pedantic
2012-06-24 23:10:47 +02: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
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
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
Stephen Kelly
21a5833090
Merge remote-tracking branch 'origin/KDE/4.8' into frameworks
...
Conflicts:
kdecore/CMakeLists.txt
tier2/kauth/src/backends/dbus/DBusHelperProxy.cpp
2012-06-18 11:33:08 +02:00
Stephen Kelly
d0c0804d3a
Merge remote-tracking branch 'origin/frameworks' into frameworks
2012-06-18 11:30:47 +02:00
Jignesh Kakadiya
362a0a9372
KGlobal::mainComponent().componentName() should be replaced with QCoreApplication::instance()->applicationName()
2012-06-18 13:11:26 +05:30
David Faure
5534b9cfa0
plasma ported to generate_export_header -- this was the last one.
2012-06-16 22:08:06 +02:00
Stephen Kelly
9d49500245
Merge remote-tracking branch 'origin/KDE/4.8' into frameworks
...
Conflicts:
CMakeLists.txt
interfaces/terminal/example/CMakeLists.txt
kdecore/CMakeLists.txt
kdeui/actions/ktogglefullscreenaction.cpp
kdeui/widgets/khelpmenu.cpp
kio/kio/accessmanager.cpp
kio/kio/accessmanagerreply_p.cpp
nepomuk/core/nepomukmainmodel.cpp
nepomuk/core/resourcedata.cpp
nepomuk/core/resourcemanager.cpp
nepomuk/query/andterm_p.h
nepomuk/query/comparisonterm.cpp
nepomuk/query/comparisonterm_p.h
nepomuk/query/literalterm.cpp
nepomuk/query/literalterm_p.h
nepomuk/query/negationterm.cpp
nepomuk/query/negationterm_p.h
nepomuk/query/optionalterm.cpp
nepomuk/query/optionalterm_p.h
nepomuk/query/orterm.cpp
nepomuk/query/orterm_p.h
nepomuk/query/query.cpp
nepomuk/query/resourceterm.cpp
nepomuk/query/resourceterm_p.h
nepomuk/query/resourcetypeterm.cpp
nepomuk/query/resourcetypeterm_p.h
nepomuk/query/term_p.h
plasma/package.cpp
plasma/private/service_p.h
plasma/runnermanager.cpp
staging/kwidgets/autotests/kiconloader_unittest.cpp
tier1/kcoreaddons/src/caching/kshareddatacache.cpp
tier1/kdbusaddons/src/kdbusinterprocesslock.cpp
tier1/solid/src/solid/backends/fstab/fstabmanager.cpp
tier1/solid/src/solid/backends/wmi/wmicdrom.cpp
tier1/solid/src/solid/backends/wmi/wmidevice.cpp
tier1/solid/src/solid/backends/wmi/wmimanager.cpp
tier1/solid/src/solid/backends/wmi/wmiopticaldisc.cpp
2012-06-16 13:40:47 +02:00
Jignesh Kakadiya
3bdd154161
Use kcoreauthorized.h instead of kauthorized.h
2012-06-15 19:35:18 +05:30
Lamarque V. Souza
1dfcd5369c
Small optimization.
2012-06-14 19:11:42 -03:00
Lamarque V. Souza
7ab0e82f67
Fix spelling error.
2012-06-14 18:57:20 -03:00
David Faure
d2a0d70fcd
Ran convert-kstandarddirs.pl and fixed compilation (includes) in a few places
2012-06-12 15:02:33 +02:00
David Faure
ffdf930f8c
Ran kdesdk/scripts/kf5/convert-kstandarddirs.pl
2012-06-12 12:59:34 +02:00
Stephen Kelly
330efc1fa3
Create a QFontMetrics object explicitly with a QFont.
...
Since 6c1bdc1854a7700c2b3a345b95f6a2fdca84037d in Qt 5 there is
no longer an implicit conversion.
2012-06-08 17:33:16 +02:00
Stephen Kelly
cefe436657
Simplify module-includes
...
For Qt 5 porting.
2012-06-08 17:33:16 +02:00
Marco Martin
222674d3ab
save KCM settings on ok ar apply clicked
...
BUG:300840
2012-06-07 12:50:05 +02:00
David Faure
907c6c2b02
KStandardDirs => QStandardPaths
...
(mostly using kf5/convert-kstandarddirs.pl)
2012-06-05 01:16:35 +02:00
Kevin Ottens
dad0d5c8ac
Moving karchive to tier1
2012-06-04 18:36:04 +02:00
Aaron Seigo
46a60a4fe8
Package operates locally only as it is, so no point in using KIO here.
...
this also happens to allow plasmapkg to work outside a kde session.
2012-05-31 14:58:18 +02:00