David Faure
083d157684
Merge remote-tracking branch 'origin/KDE/4.8' into origin-frameworks
...
Conflicts:
kdecore/network/k3datagramsocket.cpp
kdeui/actions/kstandardaction.cpp
kdeui/dialogs/kconfigdialogmanager.cpp
kdeui/icons/kicondialog.cpp
kdeui/itemviews/kviewstatesaver.h
kfile/knewfilemenu.cpp
kio/misc/kpac/downloader.cpp
kio/tests/kdirlistertest.cpp
kparts/browserextension.cpp
nepomuk/core/nepomukmainmodel.cpp
nepomuk/query/queryserviceclient.cpp
nepomuk/test/ratingpaintertestwidget.cpp
nepomuk/ui/kedittagsdialog.cpp
nepomuk/ui/ktagcloudwidget.cpp
nepomuk/ui/ktagdisplaywidget.cpp
nepomuk/ui/nepomukmassupdatejob.cpp
nepomuk/ui/tagwidget.cpp
nepomuk/utils/daterangeselectionwidget.cpp
nepomuk/utils/facetwidget.cpp
nepomuk/utils/searchwidget.cpp
plasma/containment.cpp
plasma/datacontainer.cpp
plasma/deprecated/animator.cpp
plasma/extenders/extender.cpp
plasma/plasma.h
plasma/scripting/wallpaperscript.cpp
tier1/solid/tests/networkingclient.cpp
(signal/slot normalization changes conflicted with KUrl->QUrl changes
and with other changes in frameworks)
2012-02-14 12:32:25 +01:00
Dawit Alemayehu
fb0b49af8c
Normalize all signal/slot connections.
...
REVIEW: 103728
2012-02-13 14:27:21 -05:00
Stephen Kelly
b1b68adb7d
Don't use the QtGui module name in includes.
...
In Qt5, many of them are moved to QtWidgets, so this is the only
way to be source compatible with both Qt 4 and Qt 5.
2012-02-02 10:35:53 +01:00
Rob Scheepmaker
413f8da6b3
And port to the new api, and rename the copy.
...
svn path=/trunk/KDE/kdelibs/; revision=1023814
2009-09-15 11:12:45 +00:00
Rob Scheepmaker
baa782e764
Remove the old qtjolie fork, and copy in the current qtjolie, since that one now has all the features remote widgets require.
...
svn path=/trunk/KDE/kdelibs/; revision=1023804
2009-09-15 11:04:17 +00:00
Kevin Ottens
4f8e3e3333
Merging in relevant changes from the libplasma private fork. Porting
...
tests as required.
CCMAIL: r.scheepmaker@student.utwente.nl
CCMAIL: aseigo@kde.org
svn path=/branches/work/~ervin/qtjolie/; revision=1020942
2009-09-07 17:01:03 +00:00
Kevin Ottens
09a0e07c39
addRedirection() now uses Values for the protocols parameters as advised
...
by fmontesi.
svn path=/branches/work/~ervin/qtjolie/; revision=989152
2009-06-29 15:31:25 +00:00
Kevin Ottens
d99e623ae9
Allow to export services thanks to the Server and AbstractAdaptor
...
classes. Also introduce a small calculatorservice example showing that,
with a quick client written using jolie.
svn path=/branches/work/~ervin/qtjolie/; revision=978075
2009-06-05 22:51:08 +00:00
