Skip to content

Commit

Permalink
qmake: workaround android build(config.tests) on windows
Browse files Browse the repository at this point in the history
  • Loading branch information
wang-bin committed Jun 16, 2015
1 parent 1500154 commit 54074da
Showing 1 changed file with 2 additions and 0 deletions.
2 changes: 2 additions & 0 deletions root.pri
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@ greaterThan(QT_MAJOR_VERSION, 4) {
SUPPORTED_MAKEFILE_GENERATOR = UNIX MINGW MSVC.NET MSBUILD
message(MAKEFILE_GENERATOR=$$MAKEFILE_GENERATOR)
greaterThan(QT_MAJOR_VERSION, 4):contains(SUPPORTED_MAKEFILE_GENERATOR, $$MAKEFILE_GENERATOR) {
#workaround for android on windows. I don't know how qt deal with it
equals(MAKEFILE_GENERATOR, UNIX):equals(QMAKE_HOST.os, Windows):MAKEFILE_GENERATOR=MINGW
#configure.prf error if makefile generator is not supported and no display in qtcreator
load(configure)
} else {
Expand Down

0 comments on commit 54074da

Please sign in to comment.