Commit Graph

28 Commits

Author SHA1 Message Date
David Faure
e7e77f118a Merge remote-tracking branch 'origin/KDE/4.10' into frameworks
Conflicts:
	cmake/modules/FindKDE4Internal.cmake [ON vs TRUE]
	experimental/libkdeclarative/kdeclarative.cpp [include changes]
	kdecore/CMakeLists.txt [kshareddatacache.cpp exception support, but file moved]
	kdecore/kernel/kcmdlineargs.cpp [+1 option, but qi18n]
	kdeui/widgets/ktextedit.cpp [moc]
	kdewebkit/kwebpage.cpp [QUrl]
	kfile/kfilewidget.cpp [QUrl]
	kfile/kurlnavigatortogglebutton.cpp [QT_NO_ACCESSIBILITY]
	kinit/kinit.cpp [document path]
	kio/kfile/kurlrequester.cpp [KDE::icon]
	kio/kio/kprotocolmanager.cpp [kded5]
	kio/kio/krun.cpp [document path]
	kioslave/ftp/ftp.cpp [QUrl]
	kioslave/http/kcookiejar/CMakeLists.txt [upd file resurrected]
	kioslave/http/kcookiejar/kcookiescfg.upd [resurrected]
	kioslave/http/kcookiejar/kcookiewin.cpp [KVBox porting]
	mimetypes/kde.xml [kexi gone]
	nepomuk/core/resourcedata.cpp [deleted]
	nepomuk/test/CMakeLists.txt [deleted]
	plasma/private/packages.cpp [Plasma::Applet::NoBackground]
	tier1/kjs/src/kjs/jsonstringify.cpp [unsigned int]
	tier1/solid/src/solid/CMakeLists.txt [hello udisks2]
2012-10-19 15:10:38 +02:00
Jaime Torres
fe259f19bb include missing initializations
an uninitialized variable can be the origin of several bugs.
unfortunately, not the one I suffer.

REVIEW: 106781
2012-10-10 19:07:06 +02:00
Marco Martin
8db63c42a9 support maximum and preferred sizes as well 2012-09-20 11:49:17 +02:00
Albert Astals Cid
ac117b6c2d Remove unneded kglobal.h includes
Found with
diff -ub  <( wcgrep -l "kglobal\.h" | sort ) <(wcgrep -l 'KGlobal::\|K_GLOBAL\|KSharedConfigPtr' | sort ) | grep -v CMakeLists.txt | grep ^"-\."
2012-08-06 00:27:15 +02:00
Marco Martin
095a196120 move qgv privates in graphicsview/private 2012-07-16 21:35:17 +02:00
David Faure
d2a0d70fcd Ran convert-kstandarddirs.pl and fixed compilation (includes) in a few places 2012-06-12 15:02:33 +02:00
Stephen Kelly
cefe436657 Simplify module-includes
For Qt 5 porting.
2012-06-08 17:33:16 +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
9057ce0c70 Fix compilation with the new cmake automoc stuff. 2012-02-08 23:34:07 +01:00
David Faure
bdf1f5c2dc Merge remote-tracking branch 'origin/KDE/4.7' into origin-frameworks
Conflicts:
	tier1/libkcoreaddons/src/io/kdirwatch.cpp
2011-11-16 14:44:08 +01:00
Marco Martin
71ad31df23 add the import paths right into libkdeclarative 2011-11-08 17:19:47 +01:00
Marco Martin
2212629e18 support minimumSize
if the root object has a minimumSize set, set it as minimum size for the declarative widget, and keep it in sync
2011-08-20 17:35:30 +02:00
Marco Martin
c12af537e4 support minimumSize
if the root object has a minimumSize set, set it as minimum size for the declarative widget, and keep it in sync
2011-08-20 17:34:36 +02:00
Aaron Seigo
82eee5c3b7 avoid compiling in debug strings when compiled without debug 2011-07-29 15:46:52 +02:00
Aaron Seigo
c3157acf2c delete the NAM; it isn't deleted by the QDeclarativeEngine 2011-06-15 14:18:31 +02:00
Marco Martin
a6fa660809 bindings for dataengine in DeclarativeWidget 2011-04-30 12:43:29 +02:00
Marco Martin
14d3286096 use Item width and height as minimumSize
massively not optimal. however qml doesn't have concept of size hints unfortunately
2011-04-20 20:34:52 +02:00
Marco Martin
fb2db78521 FEATURE: access to the QScriptEngine 2011-04-07 22:10:56 +02:00
Marco Martin
256532e240 use libkdeclarative in Plasma::DeclarativeWidget 2011-04-04 23:05:23 +02:00
Marco Martin
c6215bb249 set main object size after loading 2011-02-28 13:47:35 +01:00
Dawit Alemayehu
086599b47a Fixed compile errors when using QT_USE_FAST_CONCATENATION and QT_USE_FAST_OPERATOR_PLUS to compile kdelibs...
svn path=/trunk/KDE/kdelibs/; revision=1194330
2010-11-08 18:14:17 +00:00
Marco Martin
22d9baccef use KIO to access the remote imports
svn path=/trunk/KDE/kdelibs/; revision=1188124
2010-10-21 13:18:50 +00:00
Marco Martin
87db9df855 immediately create the engine, so it can be messed with it before actually loading a file
svn path=/trunk/KDE/kdelibs/; revision=1187951
2010-10-20 20:53:55 +00:00
Marco Martin
6907acbd11 use imports from the KDE plugin dir, since we can't relay on plasma imports being installed on the systemwide qt imports dir
svn path=/trunk/KDE/kdelibs/; revision=1186518
2010-10-16 18:55:55 +00:00
Marco Martin
f49d3bc29b don't crash on parse error
svn path=/trunk/KDE/kdelibs/; revision=1186287
2010-10-15 16:24:12 +00:00
Laurent Montel
dd256bfe92 not necessary to test it before delete it
svn path=/trunk/KDE/kdelibs/; revision=1183974
2010-10-08 21:57:37 +00:00
Laurent Montel
dc6633a0d5 Fix includes
svn path=/trunk/KDE/kdelibs/; revision=1183927
2010-10-08 18:21:31 +00:00
Marco Martin
90165f119a move into libplasma
svn path=/trunk/KDE/kdelibs/; revision=1183873
2010-10-08 14:48:03 +00:00