From e4453c92ee41943a3a1d67a725804a44e747f64e Mon Sep 17 00:00:00 2001 From: Vicente Olivert Riera Date: Wed, 16 Apr 2014 12:19:17 +0100 Subject: qtscript: Check for QtGui before building the examples qsdbg and marshal examples need QtGui module. If QtGui is not installed they fail to compile. Change-Id: I1af6a8b39a0848c8208fe94a26ee57409dfd9b41 Reviewed-by: Vicente Olivert Riera Reviewed-by: Allan Sandfeld Jensen --- examples/script/script.pro | 9 ++++----- 1 file changed, 4 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 -- cgit v1.2.1 From 161e1fd31537f41992b3024c32b525b64be080ed Mon Sep 17 00:00:00 2001 From: Sergio Ahumada Date: Thu, 17 Apr 2014 17:26:19 +0200 Subject: Bump MODULE_VERSION to 5.3.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I52c832fc93ebde96fbc67ca72c709b794fcea9bd Reviewed-by: Jędrzej Nowacki --- .qmake.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.qmake.conf b/.qmake.conf index efd0e68..ef45a00 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -1,4 +1,4 @@ load(qt_build_config) CONFIG += qt_example_installs -MODULE_VERSION = 5.3.0 +MODULE_VERSION = 5.3.1 -- cgit v1.2.1 From 2b71f5f2ce41deb9baf91df2db9ec568e98814e8 Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Tue, 27 May 2014 12:50:58 -0700 Subject: Fix compilation under precompiled headers: define _CRT_RAND_S If the macro _CRT_RAND_S is defined, #include will define the rand_s function. All was well before the precompiled headers because wtf/config.h was always the first header included in WTF and it #defined at the right place. With precompiled headers, stdlib.h got included from qglobal.h before the #define took place. This was a latent bug because the non-JSC parts of QtScript could have included RandomNumberSeed.h and caused the error. RandomNumberSeed.h(82) : error C3861: 'rand_s': identifier not found Change-Id: I88b4b8670604b35ca694c02522324ac3083ed2b4 Reviewed-by: Sergio Ahumada Reviewed-by: Oswald Buddenhagen --- src/3rdparty/javascriptcore/JavaScriptCore/JavaScriptCore.pri | 2 ++ 1 file changed, 2 insertions(+) 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) { -- cgit v1.2.1