Skip to content

Commit

Permalink
Merge pull request mbg033#50
Browse files Browse the repository at this point in the history
3763c1c Fix Windows MSYS2 build (Ilya Kitaev)
  • Loading branch information
fluffypony committed Oct 11, 2016
2 parents c35b5b8 + 3763c1c commit 2bd91fd
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 4 deletions.
8 changes: 5 additions & 3 deletions MiddlePanel.qml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion monero-core.pro
Original file line number Diff line number Diff line change
Expand Up @@ -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
}

Expand Down

0 comments on commit 2bd91fd

Please sign in to comment.