From 3763c1cf11d17ca5809cd6f7408e0fc3d1ccc10f Mon Sep 17 00:00:00 2001 From: Ilya Kitaev Date: Tue, 11 Oct 2016 18:58:58 +0300 Subject: [PATCH] Fix Windows MSYS2 build --- MiddlePanel.qml | 8 +++++--- monero-core.pro | 2 +- 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 }