diff options
| author | Sergio Ahumada <sahumada@blackberry.com> | 2014-06-02 17:12:20 +0200 |
|---|---|---|
| committer | Sergio Ahumada <sahumada@blackberry.com> | 2014-06-02 17:12:47 +0200 |
| commit | 9c79a3de3c0600c991af2aa2b9306040cdbb83c8 (patch) | |
| tree | 7ac2cfabcbfd9d6d9e6c4e89994afe3414728150 | |
| parent | 712ecdac9edfaacf3e3b1a419bec1fda548d8316 (diff) | |
| parent | 2b71f5f2ce41deb9baf91df2db9ec568e98814e8 (diff) | |
| download | qtscript-9c79a3de3c0600c991af2aa2b9306040cdbb83c8.tar.gz | |
Merge remote-tracking branch 'origin/stable' into dev
Conflicts:
.qmake.conf
Change-Id: Ia3c3478a804b369b00aabb5739f409bd11dbb982
| -rw-r--r-- | examples/script/script.pro | 9 | ||||
| -rw-r--r-- | src/3rdparty/javascriptcore/JavaScriptCore/JavaScriptCore.pri | 2 |
2 files changed, 6 insertions, 5 deletions
diff --git a/examples/script/script.pro b/examples/script/script.pro index 3e1eae6..cc97233 100644 --- a/examples/script/script.pro +++ b/examples/script/script.pro @@ -1,7 +1,7 @@ TEMPLATE = subdirs -SUBDIRS = \ - customclass \ - qsdbg +SUBDIRS = customclass + +qtHaveModule(gui): SUBDIRS += qsdbg qtHaveModule(widgets) { SUBDIRS += \ @@ -22,8 +22,7 @@ qtHaveModule(widgets) { } !wince { - SUBDIRS += \ - marshal + qtHaveModule(gui): SUBDIRS += marshal } maemo5: CONFIG += qt_example diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/JavaScriptCore.pri b/src/3rdparty/javascriptcore/JavaScriptCore/JavaScriptCore.pri index 2298de3..6ee0aed 100644 --- a/src/3rdparty/javascriptcore/JavaScriptCore/JavaScriptCore.pri +++ b/src/3rdparty/javascriptcore/JavaScriptCore/JavaScriptCore.pri @@ -41,6 +41,8 @@ DEFINES += BUILDING_QT__ BUILDING_JavaScriptCore BUILDING_WTF win32-* { # Prevent definition of min, max macros in windows.h DEFINES+=NOMINMAX +# Enables rand_s + msvc: DEFINES += _CRT_RAND_S LIBS_PRIVATE += -lwinmm } contains(JAVASCRIPTCORE_JIT,yes) { |