aboutsummaryrefslogtreecommitdiffstats
path: root/src/quick
diff options
context:
space:
mode:
Diffstat (limited to 'src/quick')
-rw-r--r--src/quick/items/items.pri2
-rw-r--r--src/quick/quick.pro3
2 files changed, 4 insertions, 1 deletions
diff --git a/src/quick/items/items.pri b/src/quick/items/items.pri
index 93e56830a7..d1a8effaf3 100644
--- a/src/quick/items/items.pri
+++ b/src/quick/items/items.pri
@@ -141,7 +141,7 @@ V4DIR = $$PWD/../../qml/qml/v4
js_class_bindings.output = ${QMAKE_FILE_BASE}_jsclass.cpp
js_class_bindings.input = JS_CLASS_SOURCES
js_class_bindings.script = $$V4DIR/v4classgen
-js_class_bindings.commands = python $$js_class_bindings.script ${QMAKE_FILE_IN} --output ${QMAKE_FILE_OUT}
+js_class_bindings.commands = python $$js_class_bindings.script ${QMAKE_FILE_IN} ${QMAKE_FILE_OUT}
js_class_bindings.depends += $$js_class_bindings.script $$V4DIR/qv4managed_p.h
js_class_bindings.CONFIG += no_link
QMAKE_EXTRA_COMPILERS += js_class_bindings
diff --git a/src/quick/quick.pro b/src/quick/quick.pro
index b584734a83..393fe34e89 100644
--- a/src/quick/quick.pro
+++ b/src/quick/quick.pro
@@ -31,6 +31,9 @@ HEADERS += \
SOURCES += qtquick2.cpp
+# To make #include "qquickcontext2d_jsclass.cpp" work
+INCLUDEPATH += $$PWD
+
mac {
# FIXME: this is a workaround for broken qmake logic in qtAddModule()
# This function refuses to use frameworks unless the framework exists on