diff options
| author | Simon Hausmann <simon.hausmann@digia.com> | 2013-05-22 11:58:16 +0200 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@digia.com> | 2013-05-22 14:57:31 +0200 |
| commit | bd0bdcb55dd31c4453d320ab2f7b41abbee0bf16 (patch) | |
| tree | 75a2a41d6ddd3738430c761f7462f164927e530c /src/quick/quick.pro | |
| parent | d7f2868e427299c1cb9ec33b3c1939c6ad4e78a7 (diff) | |
Fix build on Windows
* Include stdint.h for uint16_t and friends
* Fix struct vs. class mismatch
* Export QV4::String as referenced by QQuick
* Eliminate declared but not defined destructor
* Fix v4classgen python script to not require argsparse, so that it works with older Python versions
* Replace the use of QStringLiteral in some places where we concatenate the
input (like "Foo" \n "Bar") and MSVC thinks that the two string literals have
a different "width" (8 bit vs. 16 bit) and therefore cannot be used with QStringLiteral
* Add src/qquick to the include search path to work around the differing include search path
semantics between MSVC and gcc
Change-Id: Iedcc21cc757c53b6c7d81b514fd857ff1f573b01
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Diffstat (limited to 'src/quick/quick.pro')
| -rw-r--r-- | src/quick/quick.pro | 3 |
1 files changed, 3 insertions, 0 deletions
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 |