diff options
| author | Joerg Bornemann <joerg.bornemann@nokia.com> | 2012-09-14 10:35:53 (GMT) |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-09-17 09:02:50 (GMT) |
| commit | 1df4b49a182dbff10ea7753009a33dca86ba436a (patch) | |
| tree | df20c0ceb9d4365b413bbc37f1a634e292da2d8d /examples/script | |
| parent | 989e6c5ee6f3e38b24632ec5caf49c5b03d17aed (diff) | |
| download | Qt-1df4b49a182dbff10ea7753009a33dca86ba436a.zip Qt-1df4b49a182dbff10ea7753009a33dca86ba436a.tar.gz Qt-1df4b49a182dbff10ea7753009a33dca86ba436a.tar.bz2 | |
fix examples/script/qscript for MSVC
The example needs no_batch in CONFIG because examples/script/customclass
and examples/script/qscript contain a main.cpp and nmake's inference
rules get confused which one to choose.
See QTBUG-13496 for details.
Change-Id: Ia5b06d985504ff4e72ea5e492a623edce252f57a
(cherry picked from commit qtscript/6bc42fb243edf5870c82cca6c53824a588007faf)
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
Diffstat (limited to 'examples/script')
| -rw-r--r-- | examples/script/qscript/qscript.pro | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/examples/script/qscript/qscript.pro b/examples/script/qscript/qscript.pro index d88dcaa..498a1dc 100644 --- a/examples/script/qscript/qscript.pro +++ b/examples/script/qscript/qscript.pro @@ -1,6 +1,6 @@ QT += script -win32: CONFIG += console +win32:CONFIG += console no_batch mac:CONFIG -= app_bundle SOURCES += main.cpp |