diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-11-01 01:00:14 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-11-01 01:00:14 +0100 |
| commit | 1a0b06bca7e6e23aede9dc624c7e4037cf486105 (patch) | |
| tree | 199ea84d1c3410ef29414774dab1f07f099af6a3 /tools/qmlplugindump | |
| parent | 3ed8744d24032fdaa9c84f32f918a3027cb0420f (diff) | |
| parent | 2609429d7afc263ab8e44864b0f42f1c8356eda8 (diff) | |
Merge remote-tracking branch 'origin/5.12' into dev
Change-Id: I7a2b9bdb69512b2d52050d829b1b65f4fcd9d99d
Diffstat (limited to 'tools/qmlplugindump')
| -rw-r--r-- | tools/qmlplugindump/main.cpp | 25 |
1 files changed, 0 insertions, 25 deletions
diff --git a/tools/qmlplugindump/main.cpp b/tools/qmlplugindump/main.cpp index e7523ec269..7ab42e9a26 100644 --- a/tools/qmlplugindump/main.cpp +++ b/tools/qmlplugindump/main.cpp @@ -66,9 +66,6 @@ #include <QtGui/private/qsimulatorconnection_p.h> #endif -#ifdef Q_OS_UNIX -#include <signal.h> -#endif #ifdef Q_OS_WIN # if !defined(Q_CC_MINGW) # include <crtdbg.h> @@ -750,17 +747,6 @@ enum ExitCode { EXIT_IMPORTERROR = 3 }; -#ifdef Q_OS_UNIX -Q_NORETURN void sigSegvHandler(int) { - fprintf(stderr, "Error: SEGV\n"); - if (!currentProperty.isEmpty()) - fprintf(stderr, "While processing the property '%s', which probably has uninitialized data.\n", currentProperty.toLatin1().constData()); - if (!inObjectInstantiation.isEmpty()) - fprintf(stderr, "While instantiating the object '%s'.\n", inObjectInstantiation.toLatin1().constData()); - exit(EXIT_SEGV); -} -#endif - void printUsage(const QString &appName) { std::cerr << qPrintable(QString( @@ -985,17 +971,6 @@ int main(int argc, char *argv[]) #endif // Q_OS_WIN && !Q_CC_MINGW // The default message handler might not print to console on some systems. Enforce this. qInstallMessageHandler(printDebugMessage); -#ifdef Q_OS_UNIX - // qmldump may crash, but we don't want any crash handlers to pop up - // therefore we intercept the segfault and just exit() ourselves - struct sigaction sigAction; - - sigemptyset(&sigAction.sa_mask); - sigAction.sa_handler = &sigSegvHandler; - sigAction.sa_flags = 0; - - sigaction(SIGSEGV, &sigAction, nullptr); -#endif #ifdef QT_SIMULATOR // Running this application would bring up the Qt Simulator (since it links Qt GUI), avoid that! |