diff options
| author | Volker Krause <volker.krause@kdab.com> | 2014-04-15 13:11:40 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-04-15 17:50:20 +0200 |
| commit | d953d9a4c3bdc5ed3b8d380c4b893b51b523bc50 (patch) | |
| tree | b67db3a09a37be745f060de11a4c110eb7e9aee1 /src/corelib/global/global.pri | |
| parent | 78a1c46a86e205e599d641ffb3eae721705e0d1e (diff) | |
Add a more reliable replacement for qt_add/removeObject().
These hooks only worked reliably with LD_PRELOAD on Linux/GCC, on other
platforms they depended on what exactly the compiler optimizer is doing
as well as some nasty assembler rewriting to actually access them. The
new system uses a simple array of function pointers that can be set to
custom hooks by tools that need this (based on ideas from Andre Poenitz).
This also covers qt_startup_hook (similar problem), and the Qt version
number that Andre had asked for.
Change-Id: I2c3e7950fd49b1b1d04176be34c2fff3293981b0
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
Diffstat (limited to 'src/corelib/global/global.pri')
| -rw-r--r-- | src/corelib/global/global.pri | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/corelib/global/global.pri b/src/corelib/global/global.pri index efa585ff3e..308ba03bd7 100644 --- a/src/corelib/global/global.pri +++ b/src/corelib/global/global.pri @@ -16,7 +16,8 @@ HEADERS += \ global/qsysinfo.h \ global/qisenum.h \ global/qtypetraits.h \ - global/qflags.h + global/qflags.h \ + global/qhooks_p.h SOURCES += \ global/qglobal.cpp \ @@ -24,7 +25,8 @@ SOURCES += \ global/qlibraryinfo.cpp \ global/qmalloc.cpp \ global/qnumeric.cpp \ - global/qlogging.cpp + global/qlogging.cpp \ + global/qhooks.cpp # qlibraryinfo.cpp includes qconfig.cpp INCLUDEPATH += $$QT_BUILD_TREE/src/corelib/global |