From 930e750b7aca024b839c9856cfcc79aab8c0abbc Mon Sep 17 00:00:00 2001 From: BogDan Vatra Date: Thu, 9 Jun 2016 11:17:54 +0300 Subject: Remove duplicated QT_HAS_BUILTIN define QT_HAS_BUILTIN is already defined in qcompilerdetection.h which is included in qglobal.h which is included in this header file. Task-number: QTBUG-54068 Change-Id: I46c2e13d85fc21d3e6c426d0f35a584b21ae792b Reviewed-by: Kai Koehne --- src/corelib/global/qendian.h | 6 ------ 1 file changed, 6 deletions(-) (limited to 'src/corelib') diff --git a/src/corelib/global/qendian.h b/src/corelib/global/qendian.h index c2028289a7..4e9cd2e6e3 100644 --- a/src/corelib/global/qendian.h +++ b/src/corelib/global/qendian.h @@ -49,12 +49,6 @@ QT_BEGIN_NAMESPACE -#ifdef __has_builtin -# define QT_HAS_BUILTIN(x) __has_builtin(x) -#else -# define QT_HAS_BUILTIN(x) 0 -#endif - /* * ENDIAN FUNCTIONS */ -- cgit v1.2.3 From 1824e43b516244e60bf330e4305c5b8be2b2a812 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Tue, 3 May 2016 19:21:44 +0200 Subject: make plugin meta data load failure error message less cryptic Change-Id: I280673e7fd582c5877e8e17ed00318cb10cd537c Reviewed-by: Thiago Macieira --- src/corelib/plugin/qlibrary.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/corelib') diff --git a/src/corelib/plugin/qlibrary.cpp b/src/corelib/plugin/qlibrary.cpp index 317c1dcdc1..17a211a8f0 100644 --- a/src/corelib/plugin/qlibrary.cpp +++ b/src/corelib/plugin/qlibrary.cpp @@ -312,7 +312,7 @@ static bool findPatternUnloaded(const QString &library, QLibraryPrivate *lib) } if (!ret && lib) - lib->errorString = QLibrary::tr("Plugin verification data mismatch in '%1'").arg(library); + lib->errorString = QLibrary::tr("Failed to extract plugin meta data from '%1'").arg(library); file.close(); return ret; } -- cgit v1.2.3 From 9caac0f176040b4da48d3ea289683b0b082cf729 Mon Sep 17 00:00:00 2001 From: Ralf Nolden Date: Wed, 22 Jun 2016 13:23:32 +0200 Subject: Add OpenBSD to list of targets that can't use --no-undefined in qtcore A prior commit has already added the resetting of QMAKE_LFLAGS_NOUNDEF in corelib.pro for FreeBSD due to environ(7) not being part of libc. OpenBSD has the same issue, so add it to the list of BSD systems affected for resetting the flags for qtcore. Change-Id: I50a62271ffa05a9976e802de420d47a1425359c4 Reviewed-by: Oswald Buddenhagen Reviewed-by: Thiago Macieira --- src/corelib/corelib.pro | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'src/corelib') diff --git a/src/corelib/corelib.pro b/src/corelib/corelib.pro index 37f33253e0..4fe839d9c9 100644 --- a/src/corelib/corelib.pro +++ b/src/corelib/corelib.pro @@ -29,8 +29,9 @@ ANDROID_PERMISSIONS = \ android.permission.WRITE_EXTERNAL_STORAGE # QtCore can't be compiled with -Wl,-no-undefined because it uses the "environ" -# variable and on FreeBSD, this variable is in the final executable itself -freebsd: QMAKE_LFLAGS_NOUNDEF = +# variable and on FreeBSD and OpenBSD, this variable is in the final executable itself. +# OpenBSD 6.0 will include environ in libc. +freebsd|openbsd: QMAKE_LFLAGS_NOUNDEF = load(qfeatures) -- cgit v1.2.3 From f4be16e1f7828a0f6992ef2e20b9106177d7fc88 Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Wed, 22 Jun 2016 11:31:36 -0700 Subject: Win: Get rid of unused variables un QDateTime::currentMSecsSinceEpoch The compiler didn't complain that they were unused or -Werror / -WX was not active. Change-Id: Ib57b52598e2f452985e9fffd145a7b63a32189fd Reviewed-by: Maurice Kalinowski --- src/corelib/tools/qdatetime.cpp | 2 -- 1 file changed, 2 deletions(-) (limited to 'src/corelib') diff --git a/src/corelib/tools/qdatetime.cpp b/src/corelib/tools/qdatetime.cpp index 29c8dbb2ea..1719d7f470 100644 --- a/src/corelib/tools/qdatetime.cpp +++ b/src/corelib/tools/qdatetime.cpp @@ -4118,8 +4118,6 @@ QDateTime QDateTime::currentDateTimeUtc() qint64 QDateTime::currentMSecsSinceEpoch() Q_DECL_NOTHROW { - QDate d; - QTime t; SYSTEMTIME st; memset(&st, 0, sizeof(SYSTEMTIME)); GetSystemTime(&st); -- cgit v1.2.3