diff options
author | Liang Qi <liang.qi@theqtcompany.com> | 2016-03-07 19:32:46 +0100 |
---|---|---|
committer | Liang Qi <liang.qi@theqtcompany.com> | 2016-03-07 19:32:46 +0100 |
commit | a775b9da4794f1f248b63a4a58ee6ad6885f0622 (patch) | |
tree | 55f42013d9feb858b53134978141a61e81539f02 /src/script/script.pro | |
parent | 0af88dc973d3410cdd905265ce935916693b2d44 (diff) | |
parent | f5e16ab0e1e153ec86f0d8651571e176ac6caa7c (diff) | |
download | qtscript-a775b9da4794f1f248b63a4a58ee6ad6885f0622.tar.gz |
Merge remote-tracking branch 'origin/5.6' into 5.7
Change-Id: Ib80d7470da24f01d92a9363894ae82aae9e34e28
Diffstat (limited to 'src/script/script.pro')
-rw-r--r-- | src/script/script.pro | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/script/script.pro b/src/script/script.pro index e48abac..dec4a4f 100644 --- a/src/script/script.pro +++ b/src/script/script.pro @@ -8,8 +8,6 @@ DEFINES += QLALR_NO_QSCRIPTGRAMMAR_DEBUG_INFO QMAKE_DOCS = $$PWD/doc/qtscript.qdocconf -load(qt_module) - CONFIG += building-libs WEBKITDIR = $$PWD/../3rdparty/javascriptcore @@ -76,3 +74,5 @@ integrity { } TR_EXCLUDE = $$WEBKITDIR/* + +load(qt_module) |