diff options
| author | axis <qt-info@nokia.com> | 2009-05-25 10:53:44 (GMT) |
|---|---|---|
| committer | axis <qt-info@nokia.com> | 2009-05-25 10:53:44 (GMT) |
| commit | ea4960511135786e36480b6841ed06bdb3bbc1d6 (patch) | |
| tree | c8a69b08b713e13be8af2d6fd2c574015f53bedc | |
| parent | 34c81262dc0b79220e6b99051ce09065bf6d83d6 (diff) | |
| download | Qt-ea4960511135786e36480b6841ed06bdb3bbc1d6.zip Qt-ea4960511135786e36480b6841ed06bdb3bbc1d6.tar.gz Qt-ea4960511135786e36480b6841ed06bdb3bbc1d6.tar.bz2 | |
Revert "Enable symbol visibility when compiling with RVCT."
This reverts commit c33abd370470a0097cc1fbb858e1218ba110e0df.
We will need this patch in the end, but right now it's causing too
much trouble with the compiler. To return soon!
| -rw-r--r-- | mkspecs/common/symbian/symbian.conf | 2 | ||||
| -rw-r--r-- | src/corelib/global/qglobal.h | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/mkspecs/common/symbian/symbian.conf b/mkspecs/common/symbian/symbian.conf index 2fe93d2..968a6bc 100644 --- a/mkspecs/common/symbian/symbian.conf +++ b/mkspecs/common/symbian/symbian.conf @@ -29,7 +29,7 @@ QMAKE_CFLAGS_YACC = -Wno-unused -Wno-parentheses QMAKE_CXX = g++ QMAKE_CXXFLAGS = $$QMAKE_CFLAGS QMAKE_CXXFLAGS.CW = -QMAKE_CXXFLAGS.ARMCC = --visibility_inlines_hidden +QMAKE_CXXFLAGS.ARMCC = --no_hide_all QMAKE_CXXFLAGS_DEPS = $$QMAKE_CFLAGS_DEPS QMAKE_CXXFLAGS_WARN_ON = $$QMAKE_CFLAGS_WARN_ON QMAKE_CXXFLAGS_WARN_OFF = $$QMAKE_CFLAGS_WARN_OFF diff --git a/src/corelib/global/qglobal.h b/src/corelib/global/qglobal.h index 15b2d53..27aaac1 100644 --- a/src/corelib/global/qglobal.h +++ b/src/corelib/global/qglobal.h @@ -1118,7 +1118,7 @@ class QDataStream; #ifndef Q_DECL_EXPORT # ifdef Q_OS_WIN # define Q_DECL_EXPORT __declspec(dllexport) -# elif defined(Q_CC_NOKIAX86) || defined(Q_CC_RVCT) +# elif defined(Q_CC_NOKIAX86) # define Q_DECL_EXPORT __declspec(dllexport) # elif defined(QT_VISIBILITY_AVAILABLE) # define Q_DECL_EXPORT __attribute__((visibility("default"))) @@ -1130,7 +1130,7 @@ class QDataStream; #ifndef Q_DECL_IMPORT # if defined(Q_OS_WIN) # define Q_DECL_IMPORT __declspec(dllimport) -# elif defined(Q_CC_NOKIAX86) || defined(Q_CC_RVCT) +# elif defined(Q_CC_NOKIAX86) # define Q_DECL_IMPORT __declspec(dllimport) # else # define Q_DECL_IMPORT |