Merge branch 'heenamahour/gsoc' of git://anongit.kde.org/plasma-framework into heenamahour/plasma2

src/declarativeimports/dirmodel/dirmodelplugin.cpp

@@ -26,7 +26,7 @@
 void DirModelPlugin::registerTypes(const char *uri)
 {
     Q_ASSERT(uri == QLatin1String("org.kde.dirmodel"));
-    qmlRegisterType<DirModel>(uri, 0, 1, "DirModel");
+    qmlRegisterType<DirModel>(uri, 2,0, "DirModel");
 }
 
 #include "moc_dirmodelplugin.cpp"

src/declarativeimports/dirmodel/qmldir

@@ -1,2 +1,3 @@
+module org.kde.dirmodel
 plugin dirmodelplugin
 

src/declarativeimports/plasmacomponents/qml/Highlight.qml

@@ -40,6 +40,7 @@ Item {
     /** true if the mouse button is pressed over the component. */
     property bool pressed: false
     width: ListView.view ? ListView.view.width : undefined
+    property alias marginHints: background.margins;
 
     Connections {
         target: highlight.ListView.view