Merge pull request #50

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

View file

@ -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

View file

@ -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
}