diff options
| author | Kimmo Ollila <kimmo.ollila@qt.io> | 2017-05-03 12:45:45 +0300 |
|---|---|---|
| committer | Kimmo Ollila <kimmo.ollila@qt.io> | 2017-05-04 05:30:58 +0000 |
| commit | a69edf01cb0a2a06282dc7b89724ffa542f6546d (patch) | |
| tree | 5c3555fe8516c06cd4093dd1e812c206d70a1d2e /src | |
| parent | 7a1c8715cb008a6d9f605508da00572c678b23c0 (diff) | |
Add qtConfig(dlopen) check before adding libdl
Change-Id: Iad67b9719fe6336b8dfc28de2e88463c588a0849
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'src')
| -rw-r--r-- | src/qml/compiler/compiler.pri | 2 | ||||
| -rw-r--r-- | src/qml/compiler/qv4compileddata.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/qml/compiler/compiler.pri b/src/qml/compiler/compiler.pri index 31ee917b39..60f548a2b0 100644 --- a/src/qml/compiler/compiler.pri +++ b/src/qml/compiler/compiler.pri @@ -41,7 +41,7 @@ SOURCES += \ unix: SOURCES += $$PWD/qv4compilationunitmapper_unix.cpp else: SOURCES += $$PWD/qv4compilationunitmapper_win.cpp -qtConfig(private_tests):unix: QMAKE_USE_PRIVATE += libdl +qtConfig(private_tests):qtConfig(dlopen): QMAKE_USE_PRIVATE += libdl } qmldevtools_build|qtConfig(qml-interpreter) { diff --git a/src/qml/compiler/qv4compileddata.cpp b/src/qml/compiler/qv4compileddata.cpp index 71546cc22e..d59a72cde2 100644 --- a/src/qml/compiler/qv4compileddata.cpp +++ b/src/qml/compiler/qv4compileddata.cpp @@ -734,7 +734,7 @@ static QByteArray ownLibraryChecksum() if (checksumInitialized) return libraryChecksum; checksumInitialized = true; -#if defined(Q_OS_UNIX) && !defined(QT_NO_DYNAMIC_CAST) && !defined(Q_OS_INTEGRITY) +#if !defined(QT_NO_DYNAMIC_CAST) && QT_CONFIG(dlopen) Dl_info libInfo; if (dladdr(reinterpret_cast<const void *>(&ownLibraryChecksum), &libInfo) != 0) { QFile library(QFile::decodeName(libInfo.dli_fname)); |