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
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
David Faure
0fd5c690c8
KStandardDirs::locate/locateLocal ported, by script, this time.
...
(kdesdk/scripts/kf5/convert-kstandarddirs.pl coming up)
2012-05-30 20:25:25 +02:00
Aaron Seigo
1808be9d38
clear the single runner pointer when loading runners; it may have been deleted on us
2012-05-28 19:42:25 +02:00
Aurélien Gâteau
162456d04a
Only dequeue our ThreadWeaver jobs
...
REVIEW-IN: 104973
2012-05-25 19:23:50 +02:00
Stephen Kelly
745b39d905
Port from kde4_add_executable to ecm_mark_as_test.
2012-05-24 23:56:32 +02:00
David Faure
8d7ebc7e89
Finish fixing compilation with Qt4.
...
Ported KUrlRequester away from KHBox, which was polluting its API.
2012-05-19 12:01:39 +02:00
David Faure
d278887d91
Increase version number in runtime services, to avoid mixups.
...
Executable names:
kdeinit4 -> kdeinit5
kded4 -> kded
DBus service names:
org.kde.kded -> org.kde.kded5
org.kde.klauncher -> org.kde.klauncher5
This fixes jobtest with Qt5 (difference in QDateTime serialization), but
more generally it will allow BIC changes in SlaveBase, as well as
not crashing due to kdeinit4 or kded4 loading KF5/Qt5 modules, etc.
2012-05-14 01:07:37 +02:00
Aurélien Gâteau
f75b1e7d10
Add operator != to Plasma::QueryMatch
2012-05-12 23:38:55 +02:00
Kevin Ottens
cba3e4c7aa
Use kconfig_add_kcfg_files in kdelibs
2012-05-12 17:15:01 +02:00
Script Kiddy
d68f439477
SVN_SILENT made messages (.desktop file)
2012-05-11 15:12:49 +02:00
Alex Merry
c4c2e8ee49
Rename new Plasma::Service method to avoid clashes
...
Having overloaded Q_INVOKABLE methods where one takes a superclass of
another is a Bad Idea(TM), since the script engine cannot disambiguate
the methods. associateItem is more accurate than associateWidget for
these methods, anyway.
REVIEW: 104760
2012-05-11 12:31:10 +01:00
Alex Merry
23b50f2dee
Allow QML items to be associated with operations in Plasma::Service
...
QML items derive from QGraphicsObject, but not QGraphicsWidget. We
actually only need QGraphicsObject (for the enabled property).
This allows calling (dis)associateWidget from QML (eg: in javascript
plasmoids) and passing in a QML item.
2012-05-11 11:55:48 +01:00
Stephen Kelly
4e581398e6
Merge remote-tracking branch 'origin/KDE/4.8' into frameworks
...
Conflicts:
CMakeLists.txt
kdeui/kernel/kglobalsettings.cpp
kdeui/widgets/kmessagewidget.cpp
nepomuk/core/nepomukmainmodel.cpp
nepomuk/core/resourcedata.cpp
nepomuk/core/resourcewatcher.cpp
solid/solid/backends/fstab/fstabstorageaccess.cpp
solid/solid/backends/wmi/wmicdrom.cpp
solid/solid/backends/wmi/wmidevice.cpp
solid/solid/backends/wmi/wmimanager.cpp
solid/solid/backends/wmi/wmistorage.cpp
solid/solid/backends/wmi/wmistorageaccess.cpp
solid/solid/backends/wmi/wmivolume.cpp
2012-05-06 23:21:17 +02:00
David Faure
657dcbb6dc
Revert "Port to const QRegExp behaviour."
...
This reverts commit 6e8f714e039e9e0b850304ba3df91ab2951a350b.
The Qt5 commit is going to be reverted, and this broke kreplacetest.
2012-05-04 17:31:51 +02:00
David Faure
4ce1afaa9f
Enable -DQT_NO_URL_CAST_FROM_STRING globally, and fix the code.
2012-05-02 15:08:52 +02:00
David Faure
11bec3095d
KUrl -> QUrl
2012-04-30 22:35:20 +02:00
Aaron Seigo
ab24ad4a6c
if we failed to get the appletdescription, then try to get the pluginName from the existing config
2012-04-30 13:09:51 +02:00
Benjamin Port
1fb3fd585c
Deprecate LineEdit::clickMessage in order to have a consistant API with KLineEdit
...
Reviewed by: David Faure
2012-04-30 03:17:58 +02:00
Stephen Kelly
c8d2e51e43
Merge remote-tracking branch 'origin/KDE/4.8' into frameworks
...
Conflicts:
kdecore/jobs/kjob.h
kdecore/kernel/kcmdlineargs.cpp
kdewebkit/kwebpluginfactory.cpp
plasma/service.cpp
solid/solid/CMakeLists.txt
solid/solid/backends/udev/udevdevice.cpp
solid/solid/backends/udev/udevmanager.cpp
solid/solid/backends/udev/udevportablemediaplayer.cpp
2012-04-29 13:09:37 +02:00
Stephen Kelly
54f790a2a5
Port to const QRegExp behaviour.
2012-04-29 12:18:30 +02:00
David Faure
a3ec111ed6
Fix compilation of plasma and experimental.
2012-04-28 21:57:20 +02:00
David Faure
0ee8271d83
Make plasma compiled even without gpgme
2012-04-28 21:56:51 +02:00
Julien Desgats
a69cb53cc5
Fixed some QIcon and kiconloader compile errors for Plasma
...
Reviewed by: Kevin Ottens
2012-04-28 16:57:00 +02:00