AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

QNX: Fix namespace Qt build

Browse Source 
Declare __progname outside the namespace

Task-number: QTBUG-43569
Change-Id: I000c6fea2e24d9b1a3514ec5de93649baa3e33a8
Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com>
This commit is contained in:
Sérgio Martins 2015-06-26 10:57:02 +01:00 committed by Rafael Roquetto
parent 02ab210ea9
commit 8db7bad6e1
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/corelib/global/qlogging.cpp
View File

@ -87,6 +87,10 @@
# endif
#endif
#if defined(QT_USE_SLOG2)
extern char *__progname;
#endif
#if defined(Q_OS_LINUX) && (defined(__GLIBC__) || __has_include(<sys/syscall.h>))
# include <sys/syscall.h>
static long qt_gettid()
@ -1173,8 +1177,6 @@ void QMessagePattern::setPattern(const QString &pattern)
#define QT_LOG_CODE 9000
#endif
extern char *__progname;
static void slog2_default_handler(QtMsgType msgType, const char *message)
{
if (slog2_set_default_buffer((slog2_buffer_t)-1) == 0) {