diff options
| author | Riccardo Spagni <ric@spagni.net> | 2016-10-11 19:52:46 +0200 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2016-10-11 19:52:46 +0200 |
| commit | 2bd91fd390cbbe934b1c2d671a123c215f128e1e (patch) | |
| tree | eeec3169eb0496a85ac611cb1a32b66d89b39d1a | |
| parent | c35b5b8d947f0881dd2fffa9f44165ae8d256c0e (diff) | |
| parent | 3763c1cf11d17ca5809cd6f7408e0fc3d1ccc10f (diff) | |
| download | monzero-gui-2bd91fd390cbbe934b1c2d671a123c215f128e1e.tar.gz monzero-gui-2bd91fd390cbbe934b1c2d671a123c215f128e1e.tar.xz monzero-gui-2bd91fd390cbbe934b1c2d671a123c215f128e1e.zip | |
Merge pull request #50
3763c1c Fix Windows MSYS2 build (Ilya Kitaev)
| -rw-r--r-- | MiddlePanel.qml | 8 | ||||
| -rw-r--r-- | 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 } |