Commit Graph

10245 Commits

Author SHA1 Message Date
Script Kiddy
b0c6996a90 SVN_SILENT made messages (.desktop file) 2013-01-08 17:20:38 +01:00
Jekyll Wu
642ba9df63 Merge branch 'KDE/4.10'
Conflicts:
	nepomuk/kcm/kcm_nepomuk.desktop
2013-01-06 03:22:32 +08:00
Jekyll Wu
1a34aaab2a Merge branch 'KDE/4.10'
Conflicts:
	nepomuk/kcm/kcm_nepomuk.desktop
2013-01-06 03:22:32 +08:00
David Faure
76c6c3e483 Merge remote-tracking branch 'origin/master' into origin-frameworks
Conflicts:
	kio/tests/krununittest.cpp [findExe]
	kparts/partmanager.cpp [moc]
	staging/kde4support/autotests/kmimetypetest.cpp [similar change already here]
	staging/kde4support/autotests/kmimetypetest.h [similar change already here]
	tier1/solid/src/solid/CMakeLists.txt [similar change already here]
2013-01-04 17:39:36 +01:00
Kevin Ottens
4843ce4633 Set the threshold of copyPerformance to 200ms...
Note that this test is kind of odd, clearly YMMV but if you run this
test under load it will randomly fail. Kind of flacky for an automated
test.
2013-01-03 17:51:19 +01:00
Kevin Ottens
9b94febf60 Port away from KDialog 2013-01-03 08:55:44 +01:00
Kevin Ottens
cf98377101 Remove unused include 2013-01-03 08:55:29 +01:00
Kevin Ottens
7676a7142c Port away from KDialog to unbreak the build
I couldn't reach this code before from the Qt4 build, sorry for the
temporary breakage.
2013-01-03 08:54:16 +01:00
Script Kiddy
3fce432280 SVN_SILENT made messages (.desktop file) 2013-01-03 07:38:48 +01:00
Script Kiddy
815c83a1a6 SVN_SILENT made messages (.desktop file) 2013-01-03 07:38:48 +01:00
Script Kiddy
362ba9245c SVN_SILENT made messages (.desktop file) 2013-01-03 07:37:34 +01:00
Aleix Pol
d391a907e1 Reduce warning
Don't add graphics items twice to the scene.
Reparenting already sets the scene.

REVIEW: 108079
2013-01-02 18:38:04 +01:00
Christophe Giboudeaux
6a3903262c Merge branch 'master' into frameworks
Conflicts:
	CMakeLists.txt
	dnssd/CMakeLists.txt
	kdecore/CMakeLists.txt
	kdecore/auth/ConfigureChecks.cmake
	kdecore/compression/ConfigureChecks.cmake
	kdeui/tests/proxymodeltestsuite/CMakeLists.txt
	kimgio/CMakeLists.txt
	kioslave/http/CMakeLists.txt
	kioslave/http/http.cpp
	kjs/CMakeLists.txt
	mimetypes/CMakeLists.txt
	plasma/popupapplet.cpp
	plasma/private/dialogshadows.cpp
	plasma/tooltipmanager.cpp
	solid/solid/CMakeLists.txt
	sonnet/plugins/CMakeLists.txt
2012-12-31 15:39:47 +01:00
Christophe Giboudeaux
a3364e6d9b Port kde-runtime to feature_summary 2012-12-30 19:21:21 +01:00
Sebastian Kügler
48e385a7c2 fix warnings when ToolButton has no parent 2012-12-30 18:50:40 +01:00
Sebastian Kügler
93c43d83d4 fix warnings when ToolButton has no parent 2012-12-30 18:49:43 +01:00
David Faure
72b848ede7 Fix compilation after recent header changes 2012-12-29 01:36:40 +01:00
Marco Martin
fba3fe8966 Merge branch 'KDE/4.10' 2012-12-28 20:41:03 +01:00
Marco Martin
2c6d44eb23 reparent the compact representation
leak--
2012-12-28 20:40:34 +01:00
Marco Martin
8db20e64c7 consider also declarative items for parentSize
this fixes applets collapse in the new qml systray
2012-12-28 18:45:37 +01:00
David Faure
cb466490b0 Fix compilation with Qt5 2012-12-27 11:25:00 +01:00
Weng Xuetian
cc24f1839a fix tooltip shadow problem.
avoid confusations between the deleted window size and the "dirty" area.

BUG: 311502
REVIEW: 107905
2012-12-26 11:28:35 -05:00
Till Adam
4a2ed6f47e Fix the non-x11 build. 2012-12-24 17:03:09 +01:00
Marco Martin
60e841dafa Merge branch 'KDE/4.10' 2012-12-24 12:10:25 +01:00
Marco Martin
2b3bc4b31b provide the exact resolution needed 2012-12-24 12:10:01 +01:00
Marco Martin
447acb04fb Merge branch 'KDE/4.10'
Conflicts:
	nepomuk/kcm/kcm_nepomuk.desktop
2012-12-24 11:57:26 +01:00
Marco Martin
60f0b63f26 Merge branch 'KDE/4.10'
Conflicts:
	nepomuk/kcm/kcm_nepomuk.desktop
2012-12-24 11:57:26 +01:00
Marco Martin
f598d61949 new default wallpaper name is Elarun
BUG:312052
2012-12-24 11:54:46 +01:00
David Faure
d40a5bbcdd Merge remote-tracking branch 'origin/master' into frameworks
Conflicts:
        interfaces/ktexteditor/kcm_ktexteditor.desktop [and other desktop files, gone]
        kdecore/tests/kmimeglobsfileparsertest.cpp [gone]
        kdecore/tests/kprocesstest.cpp [already fixed here]
        kio/tests/krununittest.cpp [already fixed here]
        solid/solid/backends/udisks2/udisksdevicebackend.cpp [doesn't exist here]
        staging/kservice/autotests/ksycocathreadtest.cp [already fixed here]
        staging/kwidgets/tests/kmessageboxtest.cpp [no such ",0" argument here]
2012-12-24 10:44:28 +01:00
Script Kiddy
fd00bbdafa SVN_SILENT made messages (.desktop file) 2012-12-24 09:03:26 +01:00
Script Kiddy
fa5f1cd3f7 SVN_SILENT made messages (.desktop file) 2012-12-24 09:03:26 +01:00
Script Kiddy
5fb13bf6a3 SVN_SILENT made messages (.desktop file) 2012-12-24 09:00:41 +01:00
Aurélien Gâteau
871b414f4f Group components by category 2012-12-23 22:58:47 +01:00
Aurélien Gâteau
a1bbbfcdd4 Categorize components on PlasmaExtraComponents landing page 2012-12-23 22:58:42 +01:00
Aurélien Gâteau
5586cc4f9a Doxygenize ScrollArea 2012-12-23 22:58:38 +01:00
Aurélien Gâteau
068a46b9d4 Doxygenize Heading, Paragraph and Title 2012-12-23 22:58:35 +01:00
Aurélien Gâteau
bc924f1ebf Doxygenize ConditionalLoader 2012-12-23 22:58:33 +01:00
Aurélien Gâteau
9f209bac3f Doxygenize App 2012-12-23 22:58:25 +01:00
Aurélien Gâteau
bc21de1b4c Doxygenize ToolBar, ToolBarLayout and ToolButton 2012-12-23 22:58:03 +01:00
Aurélien Gâteau
f4c0653174 Doxygenize TextField 2012-12-23 22:55:07 +01:00
Aurélien Gâteau
156b5e1669 Doxygenize TextArea 2012-12-23 22:55:05 +01:00
Aurélien Gâteau
342ca686d3 Doxygenize Tab* components 2012-12-23 22:55:03 +01:00
Aurélien Gâteau
b05fd20f0a Doxygenize Switch 2012-12-23 22:55:01 +01:00
Aurélien Gâteau
d37d8096ea Doxygenize Slider 2012-12-23 22:54:59 +01:00
Aurélien Gâteau
ade2f1cfc0 Doxygenize Sheet 2012-12-23 22:54:57 +01:00
Aurélien Gâteau
bd9ec5fa67 Doxygenize SelectionDialog 2012-12-23 22:54:55 +01:00
Aurélien Gâteau
5fb8c46cd5 Doxygenize SectionScroller 2012-12-23 22:54:53 +01:00
Aurélien Gâteau
d20924b1da Doxygenize ScrollBar 2012-12-23 22:54:51 +01:00
Aurélien Gâteau
8091f5591b Doxygenize RadioButton 2012-12-23 22:54:49 +01:00
Aurélien Gâteau
3ede948f58 Doxygenize ProgressBar 2012-12-23 22:54:48 +01:00