4rkal/monero-gui
1
0
Fork 0
mirror of https://github.com/monero-project/monero-gui.git synced 2025-02-21 17:20:37 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #50

Browse Source 
3763c1c Fix Windows MSYS2 build (Ilya Kitaev)
This commit is contained in:
Riccardo Spagni 2016-10-11 19:52:46 +02:00
commit 2bd91fd390
No known key found for this signature in database
GPG Key ID: 55432DF31CCD4FCD
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
MiddlePanel.qml
View File

@ -26,12 +26,14 @@
// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF // 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. // THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
import QtQuick 2.2
import QtQml 2.0 import QtQml 2.0
import QtQuick.Controls 2.0 import QtQuick 2.2
import QtQuick.Controls 1.4
import QtQuick.Layouts 1.1 import QtQuick.Layouts 1.1
import QtGraphicalEffects 1.0 import QtGraphicalEffects 1.0
import "pages"
import "./pages"
Rectangle { Rectangle {
id: root id: root

2
monero-core.pro
View File

@ -194,7 +194,7 @@ macx {
} }
win32 { 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 deploy.commands += $$escape_expand(\n\t) $$PWD/windeploy_helper.sh $$DESTDIR
} }