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

..

busywidget.cpp

Fix compilation with the new cmake automoc stuff.

2012-02-08 23:34:07 +01:00

busywidget.h

Don't use the QtGui module name in includes.

2012-02-02 10:35:53 +01:00

checkbox.cpp

Fix compilation with the new cmake automoc stuff.

2012-02-08 23:34:07 +01:00

checkbox.h

Don't use the QtGui module name in includes.

2012-02-02 10:35:53 +01:00

combobox.cpp

Merge remote-tracking branch 'origin/KDE/4.8' into origin-frameworks

2012-02-14 12:32:25 +01:00

combobox.h

Don't use the QtGui module name in includes.

2012-02-02 10:35:53 +01:00

declarativewidget.cpp

Fix compilation with the new cmake automoc stuff.

2012-02-08 23:34:07 +01:00

declarativewidget.h

Don't use the QtGui module name in includes.

2012-02-02 10:35:53 +01:00

flashinglabel.cpp

Fix compilation with the new cmake automoc stuff.

2012-02-08 23:34:07 +01:00

flashinglabel.h

Don't use the QtGui module name in includes.

2012-02-02 10:35:53 +01:00

frame.cpp

Fix compilation with the new cmake automoc stuff.

2012-02-08 23:34:07 +01:00

frame.h

Don't use the QtGui module name in includes.

2012-02-02 10:35:53 +01:00

groupbox.cpp

Fix compilation with the new cmake automoc stuff.

2012-02-08 23:34:07 +01:00

groupbox.h

Don't use the QtGui module name in includes.

2012-02-02 10:35:53 +01:00

iconwidget_p.h

Don't use the QtGui module name in includes.

2012-02-02 10:35:53 +01:00

iconwidget.cpp

Fix compilation with the new cmake automoc stuff.

2012-02-08 23:34:07 +01:00

iconwidget.h

Don't use the QtGui module name in includes.

2012-02-02 10:35:53 +01:00

itembackground.cpp

Fix compilation with the new cmake automoc stuff.

2012-02-08 23:34:07 +01:00

itembackground.h

Don't use the QtGui module name in includes.

2012-02-02 10:35:53 +01:00

label.cpp

Fix compilation with the new cmake automoc stuff.

2012-02-08 23:34:07 +01:00

label.h

Don't use the QtGui module name in includes.

2012-02-02 10:35:53 +01:00

lineedit.cpp

Merge remote-tracking branch 'origin/KDE/4.8' into origin-frameworks

2012-02-14 12:32:25 +01:00

lineedit.h

Don't use the QtGui module name in includes.

2012-02-02 10:35:53 +01:00

make_widget.sh

get krazy off my back

2008-11-07 18:04:32 +00:00

meter.cpp

Fix compilation with the new cmake automoc stuff.

2012-02-08 23:34:07 +01:00

meter.h

Don't use the QtGui module name in includes.

2012-02-02 10:35:53 +01:00

pushbutton.cpp

include kicon.h

2012-02-10 19:59:05 +01:00

pushbutton.h

include kicon.h

2012-02-10 19:59:05 +01:00

radiobutton.cpp

Fix compilation with the new cmake automoc stuff.

2012-02-08 23:34:07 +01:00

radiobutton.h

Don't use the QtGui module name in includes.

2012-02-02 10:35:53 +01:00

scrollbar.cpp

Fix compilation with the new cmake automoc stuff.

2012-02-08 23:34:07 +01:00

scrollbar.h

Don't use the QtGui module name in includes.

2012-02-02 10:35:53 +01:00

scrollwidget.cpp

Fix compilation with the new cmake automoc stuff.

2012-02-08 23:34:07 +01:00

scrollwidget.h

Don't use the QtGui module name in includes.

2012-02-02 10:35:53 +01:00

separator.cpp

Fix compilation with the new cmake automoc stuff.

2012-02-08 23:34:07 +01:00

separator.h

Don't use the QtGui module name in includes.

2012-02-02 10:35:53 +01:00

signalplotter.cpp

Fix compilation with the new cmake automoc stuff.

2012-02-08 23:34:07 +01:00

signalplotter.h

Don't use the QtGui module name in includes.

2012-02-02 10:35:53 +01:00

slider.cpp

Fix compilation with the new cmake automoc stuff.

2012-02-08 23:34:07 +01:00

slider.h

Don't use the QtGui module name in includes.

2012-02-02 10:35:53 +01:00

spinbox.cpp

Fix compilation with the new cmake automoc stuff.

2012-02-08 23:34:07 +01:00

spinbox.h

Don't use the QtGui module name in includes.

2012-02-02 10:35:53 +01:00

svgwidget.cpp

Fix compilation with the new cmake automoc stuff.

2012-02-08 23:34:07 +01:00

svgwidget.h

Don't use the QtGui module name in includes.

2012-02-02 10:35:53 +01:00

tabbar.cpp

Fix compilation with the new cmake automoc stuff.

2012-02-08 23:34:07 +01:00

tabbar.h

Don't use the QtGui module name in includes.

2012-02-02 10:35:53 +01:00

textbrowser.cpp

Fix compilation with the new cmake automoc stuff.

2012-02-08 23:34:07 +01:00

textbrowser.h

Don't use the QtGui module name in includes.

2012-02-02 10:35:53 +01:00

textedit.cpp

Fix compilation with the new cmake automoc stuff.

2012-02-08 23:34:07 +01:00

textedit.h

Don't use the QtGui module name in includes.

2012-02-02 10:35:53 +01:00

toolbutton.cpp

Fix compilation with the new cmake automoc stuff.

2012-02-08 23:34:07 +01:00

toolbutton.h

Don't use the QtGui module name in includes.

2012-02-02 10:35:53 +01:00

treeview.cpp

Fix compilation with the new cmake automoc stuff.

2012-02-08 23:34:07 +01:00

treeview.h

Don't use the QtGui module name in includes.

2012-02-02 10:35:53 +01:00

videowidget.cpp

Merge remote-tracking branch 'origin/KDE/4.8' into origin-frameworks

2012-02-14 12:32:25 +01:00

videowidget.h

Don't use the QtGui module name in includes.

2012-02-02 10:35:53 +01:00

webview.cpp

Merge remote-tracking branch 'origin/KDE/4.8' into origin-frameworks

2012-02-14 12:32:25 +01:00

webview.h

Don't use the QtGui module name in includes.

2012-02-02 10:35:53 +01:00

widget.cpp.template

put it in the template too

2009-09-13 17:17:02 +00:00

widget.h.template

* repaint the svg when the theme changes

2009-09-13 17:13:55 +00:00