diff options
| author | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-09-06 14:33:03 +0200 |
|---|---|---|
| committer | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-09-06 14:33:03 +0200 |
| commit | b4719a8cdeffc3991a63fed7df6489509173ebcd (patch) | |
| tree | ae24bf79efddd0c6f98b589852b312e1c9f56ff5 | |
| parent | 34141be75385060aabc34bf92bffd7644b1c5dbb (diff) | |
| parent | 25e4141213098e2358d6bfb3987195656f1b8064 (diff) | |
| download | qtscript-b4719a8cdeffc3991a63fed7df6489509173ebcd.tar.gz | |
Merge remote-tracking branch 'origin/stable' into dev
Change-Id: I8352e99c9886882115b5808e6903ce09645949ba
| -rw-r--r-- | src/script/script.pro | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/script/script.pro b/src/script/script.pro index 03a9da1..49b6ded 100644 --- a/src/script/script.pro +++ b/src/script/script.pro @@ -78,3 +78,5 @@ integrity { # WebKit doesn't compile in C++0x mode *-g++*:QMAKE_CXXFLAGS -= -std=c++0x -std=gnu++0x CONFIG -= c++11 + +TR_EXCLUDE = $$WEBKITDIR/* |