aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIlya Kitaev <mbg033@gmail.com>2016-10-11 18:58:58 +0300
committerIlya Kitaev <mbg033@gmail.com>2016-10-11 18:58:58 +0300
commit3763c1cf11d17ca5809cd6f7408e0fc3d1ccc10f (patch)
tree7cf3df7c2affbb9f6250b85ba0667ec1facb1dd8
parentd9b3f4a4fd1f2082b9867a1f22ecb0fe01f04280 (diff)
downloadmonzero-gui-3763c1cf11d17ca5809cd6f7408e0fc3d1ccc10f.tar.gz
monzero-gui-3763c1cf11d17ca5809cd6f7408e0fc3d1ccc10f.tar.xz
monzero-gui-3763c1cf11d17ca5809cd6f7408e0fc3d1ccc10f.zip
Fix Windows MSYS2 build
-rw-r--r--MiddlePanel.qml8
-rw-r--r--monero-core.pro2
2 files changed, 6 insertions, 4 deletions
diff --git a/MiddlePanel.qml b/MiddlePanel.qml
index 9160a359..3f4c4c03 100644
--- a/MiddlePanel.qml
+++ b/MiddlePanel.qml
@@ -26,12 +26,14 @@
// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
// THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-import QtQuick 2.2
+
import QtQml 2.0
-import QtQuick.Controls 2.0
+import QtQuick 2.2
+import QtQuick.Controls 1.4
import QtQuick.Layouts 1.1
import QtGraphicalEffects 1.0
-import "pages"
+
+import "./pages"
Rectangle {
id: root
diff --git a/monero-core.pro b/monero-core.pro
index daa1378d..f433fd41 100644
--- a/monero-core.pro
+++ b/monero-core.pro
@@ -194,7 +194,7 @@ macx {
}
win32 {
- deploy.commands += windeployqt $$sprintf("%1/%2/%3.exe", $$OUT_PWD, $$DESTDIR, $$TARGET) -qmldir=$$PWD
+ deploy.commands += windeployqt $$sprintf("%1/%2/%3.exe", $$OUT_PWD, $$DESTDIR, $$TARGET) -release -qmldir=$$PWD
deploy.commands += $$escape_expand(\n\t) $$PWD/windeploy_helper.sh $$DESTDIR
}