summaryrefslogtreecommitdiff
path: root/examples
diff options
context:
space:
mode:
authorJoerg Bornemann <joerg.bornemann@nokia.com>2012-09-14 12:35:53 +0200
committerQt by Nokia <qt-info@nokia.com>2012-09-14 12:53:43 +0200
commit6bc42fb243edf5870c82cca6c53824a588007faf (patch)
tree2787bab9f1fdd301e87cb0cd20f0dca972b6dbe0 /examples
parent473cadd4a4764d31d64a0d1e004d618a5ae3392c (diff)
downloadqtscript-6bc42fb243edf5870c82cca6c53824a588007faf.tar.gz
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 Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
Diffstat (limited to 'examples')
-rw-r--r--examples/script/qscript/qscript.pro2
1 files changed, 1 insertions, 1 deletions
diff --git a/examples/script/qscript/qscript.pro b/examples/script/qscript/qscript.pro
index d9881a7..02f2cd9 100644
--- a/examples/script/qscript/qscript.pro
+++ b/examples/script/qscript/qscript.pro
@@ -1,6 +1,6 @@
QT += widgets script
-win32: CONFIG += console
+win32:CONFIG += console no_batch
mac:CONFIG -= app_bundle
SOURCES += main.cpp