Created
October 27, 2014 10:20
-
-
Save azbesthu/154a98d8667c90af3403 to your computer and use it in GitHub Desktop.
patch for wk
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/Source/WTF/wtf/CurrentTime.cpp b/Source/WTF/wtf/CurrentTime.cpp | |
index e7326df..0a4dea4 100644 | |
--- a/Source/WTF/wtf/CurrentTime.cpp | |
+++ b/Source/WTF/wtf/CurrentTime.cpp | |
@@ -296,6 +296,8 @@ double monotonicallyIncreasingTime() | |
{ | |
ASSERT(QElapsedTimer::isMonotonic()); | |
static QElapsedTimer timer; | |
+ if (!timer.isValid()) | |
+ timer.start(); | |
return timer.nsecsElapsed() / 1.0e9; | |
} | |
diff --git a/Tools/qmake/mkspecs/features/configure.prf b/Tools/qmake/mkspecs/features/configure.prf | |
index e0e6e17..3e5e3e0 100644 | |
--- a/Tools/qmake/mkspecs/features/configure.prf | |
+++ b/Tools/qmake/mkspecs/features/configure.prf | |
@@ -102,6 +102,7 @@ defineTest(finalizeConfigure) { | |
production_build { | |
WEBKIT_CONFIG -= $$WEBKIT_TOOLS_CONFIG build_tests | |
+ WEBKIT_CONFIG += build_qttestsupport build_testbrowser build_minibrowser | |
} | |
static { |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
az első egy assert-re javítás, Allan fixe, QtWebkit modulba már bement, de lehet a Qt5 hash által behúzott még nem tartalmazza.
a második az a teszt böngészők buildelésének bekapcsolása szintén Allan-től.
JavaScriptCore kapcsolgatás környezeti változóból lehet:
JSC_paraméter
set JSC_useJIT=0
set JSC_useRegExpJIT=0
qt5/QtWebKit/Source/JavaScriptCore/runtume/optoins.h vagy ilyesmi #define JSC_OPTIONS(v) \ részen:
https://qt.gitorious.org/qt/qtwebkit/source/ee0fcd2acc8ad5a300ed4e25880ccb95e704d3a6:Source/JavaScriptCore/runtime/Options.h