diff options
| author | Pasi Petäjäjärvi <pasi.petajajarvi@digia.com> | 2013-01-03 13:39:53 (GMT) |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-01-28 13:12:26 (GMT) |
| commit | bd8882561bae4aae560ef36fad932061daffcfb5 (patch) | |
| tree | 5ef429d895c01bad3cde8496b1544e537ea1fcc8 /src/corelib/plugin | |
| parent | c44a0466636e6bf9e83f9c75deb0d5cad8135e93 (diff) | |
| download | Qt-bd8882561bae4aae560ef36fad932061daffcfb5.zip Qt-bd8882561bae4aae560ef36fad932061daffcfb5.tar.gz Qt-bd8882561bae4aae560ef36fad932061daffcfb5.tar.bz2 | |
Do not define QT_NO_DYNAMIC_LIBRARY for VxWorks process (RTP)
Shared libraries cannot be used in kernel mode (DKM), only at process
mode (RTP).
Change-Id: I8cecc12461aa4417b16577db3bc9cd85a1aa7efa
(cherry picked from qtbase/2d44f879a2af258ce5bba75ab3a478e2066f3c10)
Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
Diffstat (limited to 'src/corelib/plugin')
| -rw-r--r-- | src/corelib/plugin/qlibrary_unix.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/plugin/qlibrary_unix.cpp b/src/corelib/plugin/qlibrary_unix.cpp index a8b4c22..7a0344f 100644 --- a/src/corelib/plugin/qlibrary_unix.cpp +++ b/src/corelib/plugin/qlibrary_unix.cpp @@ -56,7 +56,7 @@ #include <string.h> #endif -#if defined(Q_OS_VXWORKS) || defined (Q_OS_NACL) +#if (defined(Q_OS_VXWORKS) && !defined(VXWORKS_RTP)) || defined (Q_OS_NACL) #define QT_NO_DYNAMIC_LIBRARY #endif |