diff options
| author | Simon Hausmann <simon.hausmann@theqtcompany.com> | 2014-12-18 12:12:58 +0100 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@theqtcompany.com> | 2014-12-18 12:12:58 +0100 |
| commit | e281537f2049af0b96fd87158f2b7212afe8ab5f (patch) | |
| tree | 7f9e3b14a2456cc779aa165457192094507dd257 /src/corelib/global | |
| parent | e0a8b5ce88bc50440dcec2fe3a86d83e2a7dc7b0 (diff) | |
| parent | 84569773db68408704193268bc42a200bb25a924 (diff) | |
Merge remote-tracking branch 'origin/5.4' into dev
Conflicts:
src/corelib/global/qglobal.h
src/platformsupport/platformcompositor/qopenglcompositor.cpp
src/platformsupport/platformcompositor/qopenglcompositorbackingstore.cpp
tests/auto/gui/kernel/qwindow/tst_qwindow.cpp
Change-Id: I5422868500be695584a496dbbbc719d146bc572d
Diffstat (limited to 'src/corelib/global')
| -rw-r--r-- | src/corelib/global/qcompilerdetection.h | 12 | ||||
| -rw-r--r-- | src/corelib/global/qlogging.cpp | 4 | ||||
| -rw-r--r-- | src/corelib/global/qnamespace.qdoc | 2 |
3 files changed, 9 insertions, 9 deletions
diff --git a/src/corelib/global/qcompilerdetection.h b/src/corelib/global/qcompilerdetection.h index 44356e6232..e0fa45b45e 100644 --- a/src/corelib/global/qcompilerdetection.h +++ b/src/corelib/global/qcompilerdetection.h @@ -154,17 +154,17 @@ /* Clang also masquerades as GCC */ # if defined(__apple_build_version__) # /* http://en.wikipedia.org/wiki/Xcode#Toolchain_Versions */ -# if __apple_build_version__ >= 600051 +# if __apple_build_version__ >= 6000051 # define Q_CC_CLANG 305 -# elif __apple_build_version__ >= 503038 +# elif __apple_build_version__ >= 5030038 # define Q_CC_CLANG 304 -# elif __apple_build_version__ >= 500275 +# elif __apple_build_version__ >= 5000275 # define Q_CC_CLANG 303 -# elif __apple_build_version__ >= 425024 +# elif __apple_build_version__ >= 4250024 # define Q_CC_CLANG 302 -# elif __apple_build_version__ >= 318045 +# elif __apple_build_version__ >= 3180045 # define Q_CC_CLANG 301 -# elif __apple_build_version__ >= 211101 +# elif __apple_build_version__ >= 2111001 # define Q_CC_CLANG 300 # else # error "Unknown Apple Clang version" diff --git a/src/corelib/global/qlogging.cpp b/src/corelib/global/qlogging.cpp index 843ec6b0ca..0271573445 100644 --- a/src/corelib/global/qlogging.cpp +++ b/src/corelib/global/qlogging.cpp @@ -1286,8 +1286,8 @@ static void android_default_message_handler(QtMsgType type, case QtFatalMsg: priority = ANDROID_LOG_FATAL; break; }; - __android_log_print(priority, "Qt", "%s:%d (%s): %s\n", - context.file, context.line, + __android_log_print(priority, qPrintable(QCoreApplication::applicationName()), + "%s:%d (%s): %s\n", context.file, context.line, context.function, qPrintable(message)); } #endif //Q_OS_ANDROID diff --git a/src/corelib/global/qnamespace.qdoc b/src/corelib/global/qnamespace.qdoc index 53d2b7b58b..04055a3308 100644 --- a/src/corelib/global/qnamespace.qdoc +++ b/src/corelib/global/qnamespace.qdoc @@ -2612,7 +2612,7 @@ \value ElideNone Ellipsis should NOT appear in the text. Qt::ElideMiddle is normally the most appropriate choice for URLs (e.g., - "\l{http://bugreports.qt-project.org/browse/QTWEBSITE-13}{http://bugreports.qt.../QTWEBSITE-13/}"), + "\l{http://bugreports.qt.io/browse/QTWEBSITE-13}{http://bugreports.qt.../QTWEBSITE-13/}"), whereas Qt::ElideRight is appropriate for other strings (e.g., "\l{http://doc.qt.digia.com/qq/qq09-mac-deployment.html}{Deploying Applications on Ma...}"). |