From 641ca1d7cbdef919130411ff1999229d2e477327 Mon Sep 17 00:00:00 2001 From: Steffen Imhof Date: Wed, 28 May 2014 14:14:39 +0200 Subject: Fix QT_NO_SETTINGS build in QLibraryInfo. One reference to QSettings was only guarded by QT_BOOTSTRAPPED. Change-Id: I2f9761ee88b4a45edb16054fdba3c3f11fec12ff Reviewed-by: Oswald Buddenhagen --- src/corelib/global/qlibraryinfo.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/corelib/global') diff --git a/src/corelib/global/qlibraryinfo.cpp b/src/corelib/global/qlibraryinfo.cpp index 6d25325890..174c1d0d8d 100644 --- a/src/corelib/global/qlibraryinfo.cpp +++ b/src/corelib/global/qlibraryinfo.cpp @@ -537,7 +537,7 @@ QLibraryInfo::rawLocation(LibraryLocation loc, PathGroup group) QStringList QLibraryInfo::platformPluginArguments(const QString &platformName) { -#ifndef QT_BOOTSTRAPPED +#if !defined(QT_BOOTSTRAPPED) && !defined(QT_NO_SETTINGS) if (const QSettings *settings = QLibraryInfoPrivate::findConfiguration()) { QString key = QLatin1String(platformsSection); key += QLatin1Char('/'); @@ -545,7 +545,7 @@ QStringList QLibraryInfo::platformPluginArguments(const QString &platformName) key += QLatin1String("Arguments"); return settings->value(key).toStringList(); } -#endif // !QT_BOOTSTRAPPED +#endif // !QT_BOOTSTRAPPED && !QT_NO_SETTINGS return QStringList(); } -- cgit v1.2.3 From 000d98d826e7b85655456a66522812da338c3f72 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Wed, 18 Jun 2014 00:27:55 +0200 Subject: Bump version Change-Id: I867c3b4aecc82095e65bd7f820e7fe6d14005705 --- src/corelib/global/qglobal.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/corelib/global') diff --git a/src/corelib/global/qglobal.h b/src/corelib/global/qglobal.h index 707e46dd40..d1aae1a681 100644 --- a/src/corelib/global/qglobal.h +++ b/src/corelib/global/qglobal.h @@ -45,11 +45,11 @@ #include -#define QT_VERSION_STR "5.3.1" +#define QT_VERSION_STR "5.3.2" /* QT_VERSION is (major << 16) + (minor << 8) + patch. */ -#define QT_VERSION 0x050301 +#define QT_VERSION 0x050302 /* can be used like #if (QT_VERSION >= QT_VERSION_CHECK(4, 4, 0)) */ -- cgit v1.2.3 From d98004cd2f33e8147cff9f3cb203fdef5e6dd00e Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Fri, 23 May 2014 18:32:32 +0200 Subject: fix QT_SUPPORTS macro with msvc2008 Change-Id: I70ffba51d2672574d7cefc3cb44724341cd86f22 Reviewed-by: Thiago Macieira --- src/corelib/global/qglobal.h | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'src/corelib/global') diff --git a/src/corelib/global/qglobal.h b/src/corelib/global/qglobal.h index d1aae1a681..f610cfab8c 100644 --- a/src/corelib/global/qglobal.h +++ b/src/corelib/global/qglobal.h @@ -59,7 +59,11 @@ #include #include #endif -#define QT_SUPPORTS(FEATURE) (!defined(QT_NO_##FEATURE)) +#if defined(Q_CC_MSVC) && _MSC_VER <= 1500 /* VS2008 */ +# define QT_SUPPORTS(FEATURE) (!defined QT_NO_##FEATURE) +#else +# define QT_SUPPORTS(FEATURE) (!defined(QT_NO_##FEATURE)) +#endif #if QT_VERSION >= QT_VERSION_CHECK(6,0,0) # define QT_NO_UNSHARABLE_CONTAINERS #endif -- cgit v1.2.3 From 0e14a58a96fc3deb78ac152c480cac3ac907f0f7 Mon Sep 17 00:00:00 2001 From: David Faure Date: Sun, 22 Jun 2014 10:46:10 +0200 Subject: Doc: qInstallMessageHandler cannot return 0. The commit 124044613dde9a9596312102ca377bc74ed08165 (in Nov 2011) changed that: the first call will return the builtin message handler, not 0. Change-Id: I535ad69639f2341f9b664a6e2e7b12802ae785e0 Reviewed-by: Thiago Macieira Reviewed-by: Olivier Goffart --- src/corelib/global/qlogging.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'src/corelib/global') diff --git a/src/corelib/global/qlogging.cpp b/src/corelib/global/qlogging.cpp index 4a602e4b2b..ff4372a049 100644 --- a/src/corelib/global/qlogging.cpp +++ b/src/corelib/global/qlogging.cpp @@ -1443,8 +1443,7 @@ void qErrnoWarning(int code, const char *msg, ...) \since 5.0 Installs a Qt message \a handler which has been defined - previously. Returns a pointer to the previous message handler - (which may be 0). + previously. Returns a pointer to the previous message handler. The message handler is a function that prints out debug messages, warnings, critical and fatal error messages. The Qt library (debug -- cgit v1.2.3