Merge branch 'heenamahour/gsoc' of git://anongit.kde.org/plasma-framework into heenamahour/plasma2
This commit is contained in:
commit
b17ca9f007
@ -26,7 +26,7 @@
|
|||||||
void DirModelPlugin::registerTypes(const char *uri)
|
void DirModelPlugin::registerTypes(const char *uri)
|
||||||
{
|
{
|
||||||
Q_ASSERT(uri == QLatin1String("org.kde.dirmodel"));
|
Q_ASSERT(uri == QLatin1String("org.kde.dirmodel"));
|
||||||
qmlRegisterType<DirModel>(uri, 0, 1, "DirModel");
|
qmlRegisterType<DirModel>(uri, 2,0, "DirModel");
|
||||||
}
|
}
|
||||||
|
|
||||||
#include "moc_dirmodelplugin.cpp"
|
#include "moc_dirmodelplugin.cpp"
|
||||||
|
@ -1,2 +1,3 @@
|
|||||||
|
module org.kde.dirmodel
|
||||||
plugin dirmodelplugin
|
plugin dirmodelplugin
|
||||||
|
|
||||||
|
@ -40,6 +40,7 @@ Item {
|
|||||||
/** true if the mouse button is pressed over the component. */
|
/** true if the mouse button is pressed over the component. */
|
||||||
property bool pressed: false
|
property bool pressed: false
|
||||||
width: ListView.view ? ListView.view.width : undefined
|
width: ListView.view ? ListView.view.width : undefined
|
||||||
|
property alias marginHints: background.margins;
|
||||||
|
|
||||||
Connections {
|
Connections {
|
||||||
target: highlight.ListView.view
|
target: highlight.ListView.view
|
||||||
|
Loading…
Reference in New Issue
Block a user