From 09698489f2f82620f4c8b22cdde3be99425d7b40 Mon Sep 17 00:00:00 2001 From: Mohammad Zolfaghari Date: Mon, 25 Apr 2016 00:12:09 +0430 Subject: [PATCH] Using our own fork of go-qml using github.com/limetext/qml-go instead of gopkg.in/qml.v1 which it seems its not under development anymore. also applyed https://github.com/go-qml/qml/pull/140 closes #4 --- glide.lock | 4 ++-- glide.yaml | 2 +- main/dialog.go | 2 +- main/frontend.go | 2 +- main/main.go | 3 +-- main/view.go | 3 +-- main/window.go | 2 +- 7 files changed, 8 insertions(+), 10 deletions(-) diff --git a/glide.lock b/glide.lock index 2c750c9..dbc009b 100644 --- a/glide.lock +++ b/glide.lock @@ -42,8 +42,8 @@ imports: version: 8991807ce6d383a41077a642b7b381eba1df7064 - name: gopkg.in/fsnotify.v1 version: 836bfd95fecc0f1511dd66bdbf2b5b61ab8b00b6 -- name: gopkg.in/qml.v1 - version: 2ee7e5ff737026a4dfa89801fac63561279040f4 +- name: github.com/limetext/qml-go + version: 71e9cf92e2e8c50dc17e5b1bcb4b8f4916dce904 subpackages: - cdata - gl/glbase diff --git a/glide.yaml b/glide.yaml index c3a9bbe..3af3705 100644 --- a/glide.yaml +++ b/glide.yaml @@ -18,4 +18,4 @@ import: - package: github.com/limetext/util version: master - package: gopkg.in/fsnotify.v1 -- package: gopkg.in/qml.v1 +- package: github.com/limetext/qml-go diff --git a/main/dialog.go b/main/dialog.go index e09d0c2..8acc64a 100644 --- a/main/dialog.go +++ b/main/dialog.go @@ -8,7 +8,7 @@ import ( "sync" "github.com/limetext/backend/log" - "gopkg.in/qml.v1" + "github.com/limetext/qml-go" ) type ( diff --git a/main/frontend.go b/main/frontend.go index cb17695..4a91ea5 100644 --- a/main/frontend.go +++ b/main/frontend.go @@ -12,8 +12,8 @@ import ( "sync" "time" + "github.com/limetext/qml-go" "gopkg.in/fsnotify.v1" - "gopkg.in/qml.v1" "github.com/limetext/backend" "github.com/limetext/backend/keys" diff --git a/main/main.go b/main/main.go index 92c3360..55820e9 100644 --- a/main/main.go +++ b/main/main.go @@ -8,12 +8,11 @@ import ( "flag" "runtime" - "gopkg.in/qml.v1" - "github.com/limetext/backend" "github.com/limetext/backend/log" _ "github.com/limetext/commands" "github.com/limetext/gopy/lib" + "github.com/limetext/qml-go" _ "github.com/limetext/sublime" ) diff --git a/main/view.go b/main/view.go index 3b53451..0dff990 100644 --- a/main/view.go +++ b/main/view.go @@ -10,11 +10,10 @@ import ( "io" "strings" - "gopkg.in/qml.v1" - "github.com/limetext/backend" "github.com/limetext/backend/log" "github.com/limetext/backend/render" + "github.com/limetext/qml-go" . "github.com/limetext/text" "github.com/limetext/util" ) diff --git a/main/window.go b/main/window.go index 36e694d..835ae4a 100644 --- a/main/window.go +++ b/main/window.go @@ -8,7 +8,7 @@ import ( "sync" "github.com/limetext/backend" - "gopkg.in/qml.v1" + "github.com/limetext/qml-go" ) // A helper glue structure connecting the backend Window with the qml.Window