plasma-framework/tests/testengine
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
..
CMakeLists.txt If the intention was that this can be built as a separate project, this works now. 2009-01-04 18:15:55 +00:00
plasma-dataengine-testengine.desktop SVN_SILENT made messages (.desktop file) 2013-01-03 07:37:34 +01:00
testengine.cpp Don't use the QtGui module name in includes. 2012-02-02 10:35:53 +01:00
testengine.h ok, this time JUST the plasma dir ;) 2008-11-03 23:08:39 +00:00