From dc6ccb2ecb9a62baa0e200341547cd6417d225fe Mon Sep 17 00:00:00 2001 From: Dusko Angirevic Date: Fri, 9 Jun 2017 00:23:12 +0200 Subject: [PATCH] Bugfix #1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Note to my future self: when you delete component, don’t use it in the code :D --- harbour-tooter.pro | 12 ++++++------ harbour-tooter.pro.user | 28 ++++++++++++++-------------- qml/pages/MainPage.qml | 2 +- rpm/harbour-tooter.spec | 2 +- rpm/harbour-tooter.yaml | 2 +- 5 files changed, 23 insertions(+), 23 deletions(-) diff --git a/harbour-tooter.pro b/harbour-tooter.pro index d1e00be..084b9cf 100644 --- a/harbour-tooter.pro +++ b/harbour-tooter.pro @@ -22,6 +22,11 @@ OTHER_FILES += qml/harbour-tooter.qml \ qml/pages/LoginPage.qml \ qml/pages/components/MyList.qml \ qml/pages/components/Navigation.qml \ + qml/pages/Conversation.qml \ + qml/pages/components/Toot.qml \ + qml/pages/Browser.qml \ + qml/pages/Profile.qml \ + qml/pages/components/ProfileHeader.qml \ rpm/harbour-tooter.changes.in \ rpm/harbour-tooter.spec \ rpm/harbour-tooter.yaml \ @@ -49,9 +54,4 @@ DISTFILES += \ qml/images/verified.svg \ qml/lib/Mastodon.js \ qml/lib/Worker.js \ - qml/pages/components/Toot.qml \ - qml/pages/Browser.qml \ - qml/pages/Profile.qml \ - qml/pages/components/ProfileHeader.qml \ - qml/images/boosted.svg \ - qml/pages/Conversation.qml + qml/images/boosted.svg diff --git a/harbour-tooter.pro.user b/harbour-tooter.pro.user index 39ab40e..56f6146 100644 --- a/harbour-tooter.pro.user +++ b/harbour-tooter.pro.user @@ -1,14 +1,14 @@ - + EnvironmentId - {25497605-1bff-4134-a878-76c1475dd8e3} + {41ec03ca-9430-48f3-b421-990d428b2838} ProjectExplorer.Project.ActiveTarget - 0 + 1 ProjectExplorer.Project.EditorSettings @@ -61,12 +61,12 @@ MerSDK-SailfishOS-i486 MerSDK-SailfishOS-i486 - {f49c1b5a-d715-401a-9a10-0e5fe9e5b72a} + {fd18ca89-dfc9-4054-9c53-c67be7689951} 0 2 0 - C:/Users/dysko/SF/build-harbour-tooter-MerSDK_SailfishOS_i486-Debug + /Users/dysko/GIT/build-harbour-tooter-MerSDK_SailfishOS_i486-Debug true @@ -138,7 +138,7 @@ true - C:/Users/dysko/SF/build-harbour-tooter-MerSDK_SailfishOS_i486-Release + /Users/dysko/GIT/build-harbour-tooter-MerSDK_SailfishOS_i486-Release true @@ -210,7 +210,7 @@ true - C:/Users/dysko/SF/build-harbour-tooter-MerSDK_SailfishOS_i486-Profile + /Users/dysko/GIT/build-harbour-tooter-MerSDK_SailfishOS_i486-Profile true @@ -396,7 +396,7 @@ 13 14 - C:/Users/dysko/SF/harbour-tooter + /Users/dysko/GIT/harbour-tooter false 10234 3 @@ -426,12 +426,12 @@ MerSDK-SailfishOS-armv7hl MerSDK-SailfishOS-armv7hl - {588087e2-ecc1-41aa-b652-86f16cba9351} + {f895389d-b51a-4d4f-8b03-5ec64bda6f66} 0 2 0 - C:/Users/dysko/SF/build-harbour-tooter-MerSDK_SailfishOS_armv7hl-Debug + /Users/dysko/GIT/build-harbour-tooter-MerSDK_SailfishOS_armv7hl-Debug true @@ -503,7 +503,7 @@ true - C:/Users/dysko/SF/build-harbour-tooter-MerSDK_SailfishOS_armv7hl-Release + /Users/dysko/GIT/build-harbour-tooter-MerSDK_SailfishOS_armv7hl-Release true @@ -575,7 +575,7 @@ true - C:/Users/dysko/SF/build-harbour-tooter-MerSDK_SailfishOS_armv7hl-Profile + /Users/dysko/GIT/build-harbour-tooter-MerSDK_SailfishOS_armv7hl-Profile true @@ -761,7 +761,7 @@ 13 14 - C:/Users/dysko/SF/harbour-tooter + /Users/dysko/GIT/harbour-tooter false 10234 3 @@ -779,7 +779,7 @@ 3768 false true - false + true false true diff --git a/qml/pages/MainPage.qml b/qml/pages/MainPage.qml index 537d43d..6cd219e 100644 --- a/qml/pages/MainPage.qml +++ b/qml/pages/MainPage.qml @@ -95,7 +95,7 @@ Page { width: parent.width height: parent.height onOpenDrawer: infoPanel.open = setDrawer - delegate: Notification {} + header: SearchField { width: parent.width text: tlSearch.search diff --git a/rpm/harbour-tooter.spec b/rpm/harbour-tooter.spec index b8582a3..5fdc28e 100644 --- a/rpm/harbour-tooter.spec +++ b/rpm/harbour-tooter.spec @@ -13,7 +13,7 @@ Name: harbour-tooter %{!?qtc_make:%define qtc_make make} %{?qtc_builddir:%define _builddir %qtc_builddir} Summary: Tooter -Version: 0.1.1 +Version: 0.1.2 Release: 1 Group: Qt/Qt License: LICENSE diff --git a/rpm/harbour-tooter.yaml b/rpm/harbour-tooter.yaml index 5bb7285..3abde91 100644 --- a/rpm/harbour-tooter.yaml +++ b/rpm/harbour-tooter.yaml @@ -1,6 +1,6 @@ Name: harbour-tooter Summary: Tooter -Version: 0.1.1 +Version: 0.1.2 Release: # The contents of the Group field should be one of the groups listed here: # http://gitorious.org/meego-developer-tools/spectacle/blobs/master/data/GROUPS