diff options
-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) { |