check for program_invocation_short_name variable and use it in QCoreApplication:...

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2c51ca7..b7059c1 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -352,6 +352,7 @@ katie_check_function(timegm "time.h")
 katie_check_function(pipe2 "unistd.h")
 katie_check_function(getdomainname "unistd.h")
 katie_check_function(renameat2 "stdio.h")
+katie_check_function(program_invocation_short_name "errno.h")
 katie_check_struct(tm tm_gmtoff "time.h")
 katie_check_struct(tm tm_zone "time.h")
 katie_check_struct(dirent d_type "dirent.h")

diff --git a/src/core/kernel/qcoreapplication.cpp b/src/core/kernel/qcoreapplication.cpp
index ffd6265..a838fa7 100644 (file)
--- a/src/core/kernel/qcoreapplication.cpp
+++ b/src/core/kernel/qcoreapplication.cpp
@@ -48,6 +48,7 @@
 #include "qstdcontainers_p.h"
 
 #include <stdlib.h>
+#include <errno.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -1568,6 +1569,10 @@ QString QCoreApplication::applicationName()
 {
     QString name = coreappdata()->application;
 
+#ifdef QT_HAVE_PROGRAM_INVOCATION_SHORT_NAME
+    name = QString::fromLocal8Bit(program_invocation_short_name);
+#endif
+
 #ifdef QT_HAVE_GETPROGNAME
     if (name.isEmpty()) {
         name = QString::fromLocal8Bit(::getprogname());