[Merge] Fix merging errors

src/qml/applauncher/SearchListView.qml

@@ -58,12 +58,6 @@ Item {
             searchListView.visible = false;
         }
     }
-    onVisibleChanged: {
-        if( visible){
-            searchField.forceActiveFocus()
-        } else searchField.focus = false
-        oldHeight=height
-    }
 
     function calculateHeight()
     {
@@ -132,11 +126,7 @@ Item {
                 value: searchField.text.toLowerCase().trim()
             }
             onTextChanged: {
-<<<<<<< HEAD:src/qml/applauncher/SearchListView.qml
-                if(searchField.lenght>0) {
-=======
                 if(text.lenght>0) {
->>>>>>> 2aeaeb0... [Keyboard] Make keyboard to rotate when homescreen rotates.:src/qml/SearchListView.qml
                     searchField.forceActiveFocus()
                 }
             }

src/src.pro

@@ -38,10 +38,8 @@ qml.files = qml/MainScreen.qml \
     qml/DeviceLockUI.qml \
     qml/LauncherItemWrapper.qml \
     qml/LauncherItemFolder.qml  \
-    qml/SearchListView.qml \
     qml/compositor_new.qml \
-    qml/compositor.qml \
-    qml/LayerManager.qml
+    qml/compositor.qml
 
 qmlcompositor.path = /usr/share/lipstick-glacier-home-qt5/qml/compositor
 qmlcompositor.files = qml/compositor/WindowWrapperMystic.qml \
@@ -146,7 +144,6 @@ DISTFILES += \
     qml/*/*.qml \
     settings-plugins/*/*.qml \
     settings-plugins/*/*.json \
-    settings-plugins/*/*.svg
+    settings-plugins/*/*.svg \
     qml/connectivity/ConnectionSelector.qml \
-    qml/statusbar/BatteryIndicator.qml \
-    qml/LayerManager.qml
+    qml/statusbar/BatteryIndicator.qml