Commit Graph

11827 Commits

Author SHA1 Message Date
Stephen Kelly
01e95b0129 Remove most uses of QT_QTCORE_LIBRARY for linking
Qt is aware of its dependencies, so this is almost always redundant.
2013-01-25 14:47:01 +01:00
Marco Martin
11cda61047 Merge branch 'KDE/4.10' 2013-01-25 14:10:06 +01:00
Marco Martin
90799fbbe2 correct icon layout
correct icon layout on buttons taller than wide
2013-01-25 14:08:58 +01:00
Marco Martin
d1c1178d36 Merge branch 'KDE/4.10' 2013-01-25 12:49:28 +01:00
Marco Martin
603360bea3 the listitem element should be visible in repeaters too 2013-01-25 12:48:52 +01:00
Marco Martin
e8ee1413a9 Merge branch 'KDE/4.10' 2013-01-25 11:27:30 +01:00
Marco Martin
d6ba0ff0b4 fix minimum tabbutton width 2013-01-25 11:27:02 +01:00
Marco Martin
c68b5909c2 Merge branch 'KDE/4.10' 2013-01-23 15:06:06 +01:00
Marco Martin
64c31f5ca1 update margins when the element prefix changes 2013-01-23 15:05:51 +01:00
Stephen Kelly
c37776d67d Clean up some Qt5 checks in the buildsystem.
QT5_BUILD is always true now, and the inqt5 and QtMimeType libraries
are obsolete.
2013-01-19 19:05:47 +01:00
Stephen Kelly
71d4b1ab85 Remove backward compatibility Qt 4 code in ifdefs. 2013-01-19 19:05:46 +01:00
Marco Martin
b5b70aba7e Merge branch 'KDE/4.10' 2013-01-17 23:40:27 +01:00
Marco Martin
260f921d26 change to elarun in oxygen as well 2013-01-17 23:40:03 +01:00
Christophe Giboudeaux
59b323de25 Merge branch 'KDE/4.10'
Conflicts:
	kcontrol/componentchooser/windowmanagers/compiz-custom.desktop
2013-01-17 10:18:29 +01:00
Script Kiddy
cb15730316 SVN_SILENT made messages (.desktop file) 2013-01-15 20:30:43 +01:00
Script Kiddy
6d0ec6f376 SVN_SILENT made messages (.desktop file) 2013-01-15 16:13:04 +01:00
Weng Xuetian
fd17e1251d Merge branch 'KDE/4.10' 2013-01-11 20:06:44 -05:00
Weng Xuetian
7dd6ca01ca fix 'listItem.ListView.view' [null] is not an object warning
attached property like obj.QmlType is consider as true in qml, should
check full property obj.QmlType.property instead.
2013-01-11 20:05:25 -05:00
Marco Martin
aaf535812a Merge branch 'KDE/4.10' 2013-01-11 16:06:45 +01:00
Marco Martin
8e7a995797 connect conditionally to minimumWidthChanged
this removes warnings: not all declarative items will have this signals
2013-01-11 16:02:01 +01:00
David Faure
9212e9fecc Merge remote-tracking branch 'origin/master' into frameworks
Conflicts:
	plasma/applet.cpp
2013-01-10 16:36:35 +01:00
Aleix Pol
a7f4cf52be Don't crash if there's no model
Even if the case doesn't make much sense, nobody likes crashing stuff.
2013-01-10 05:02:55 +01:00
Aleix Pol
de51d8e4d2 Output some kind of warning in case the writeConfig wasn't executed
It helps find what's going on when debugging and reduces magic.

CCMAIL: aseigo@kde.org
2013-01-10 05:02:55 +01:00
Aleix Pol
cff944bfb8 Split messages with \n
This way the front-end won't receive a big string but every error in a
different line, so it improves the readability of the errors.

REVIEW: 108124
2013-01-10 05:02:55 +01:00
Aleix Pol
01989dec5d Don't crash if there's no model
Even if the case doesn't make much sense, nobody likes crashing stuff.
2013-01-10 05:01:59 +01:00
Aleix Pol
0093962cff Output some kind of warning in case the writeConfig wasn't executed
It helps find what's going on when debugging and reduces magic.

CCMAIL: aseigo@kde.org
2013-01-10 05:01:59 +01:00
Aleix Pol
84aaa236e5 Split messages with \n
This way the front-end won't receive a big string but every error in a
different line, so it improves the readability of the errors.

REVIEW: 108124
2013-01-10 05:01:59 +01:00
Aleix Pol
463d467f85 Translate \n into <br/> for error messages
This way we can display the error message like it was meant to be read.

REVIEW: 108123
2013-01-10 04:54:31 +01:00
Marco Martin
77b77ccc2f Merge branch 'KDE/4.10' 2013-01-09 12:14:59 +01:00
Marco Martin
ae25b971e3 give a max width to tabbar buttons 2013-01-09 12:14:36 +01:00
Jekyll Wu
863fd55e81 Merge branch 'KDE/4.10' 2013-01-09 11:34:05 +08:00
Script Kiddy
fe57fb7027 SVN_SILENT made messages (.desktop file) 2013-01-08 22:36:24 +01:00
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