summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>2013-09-06 09:14:00 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-09-09 07:26:48 +0200
commit1a4594c3962d6788dc325a1d2d107ba7d3f9da7e (patch)
tree9ac253c57e97c7ad49fdd4ab1298051513f96904
parente15fbd5e8c13afb0cb9b70bf1270786672083d15 (diff)
Android: Fix QString(char*) warnings in qlogging.cpp
Both context.file and context.function are already char*, so using qPrintable() here would first convert them to QString() with the scary constructor and then back again. Change-Id: I822655c37fb8b9baaddc8f95d7c1842519859a0e Reviewed-by: Christian Stromme <christian.stromme@digia.com>
-rw-r--r--src/corelib/global/qlogging.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/corelib/global/qlogging.cpp b/src/corelib/global/qlogging.cpp
index a37fc15b61..aab2c7b874 100644
--- a/src/corelib/global/qlogging.cpp
+++ b/src/corelib/global/qlogging.cpp
@@ -850,8 +850,9 @@ static void android_default_message_handler(QtMsgType type,
case QtFatalMsg: priority = ANDROID_LOG_FATAL; break;
};
- __android_log_print(priority, "Qt", "%s:%d (%s): %s", qPrintable(context.file), context.line,
- qPrintable(context.function), qPrintable(message));
+ __android_log_print(priority, "Qt", "%s:%d (%s): %s",
+ context.file, context.line,
+ context.function, qPrintable(message));
}
#endif //Q_OS_ANDROID