summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoraxis <qt-info@nokia.com>2009-04-27 09:06:34 (GMT)
committeraxis <qt-info@nokia.com>2009-08-06 16:03:05 (GMT)
commit7cd9b8dee99cec502b1498adf54832c3247213f3 (patch)
tree4e9a7f594b0c384b13680e6c57b9ef840536b58c
parent36fce9a00b9efbf9c7834454825c275c4bb53820 (diff)
downloadQt-7cd9b8dee99cec502b1498adf54832c3247213f3.zip
Qt-7cd9b8dee99cec502b1498adf54832c3247213f3.tar.gz
Qt-7cd9b8dee99cec502b1498adf54832c3247213f3.tar.bz2
Enable symbol visibility when compiling with RVCT.
This takes advantage of new functionality in RVCT 2.2, and requires build 683 beta or later.
-rw-r--r--mkspecs/common/symbian/symbian.conf2
-rw-r--r--src/corelib/global/qglobal.h4
2 files changed, 3 insertions, 3 deletions
diff --git a/mkspecs/common/symbian/symbian.conf b/mkspecs/common/symbian/symbian.conf
index 65bb69d..af2be8f 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 = --no_hide_all
+QMAKE_CXXFLAGS.ARMCC = --visibility_inlines_hidden
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 9b93306..19a24af 100644
--- a/src/corelib/global/qglobal.h
+++ b/src/corelib/global/qglobal.h
@@ -1156,7 +1156,7 @@ class QDataStream;
#ifndef Q_DECL_EXPORT
# ifdef Q_OS_WIN
# define Q_DECL_EXPORT __declspec(dllexport)
-# elif defined(Q_CC_NOKIAX86)
+# elif defined(Q_CC_NOKIAX86) || defined(Q_CC_RVCT)
# define Q_DECL_EXPORT __declspec(dllexport)
# elif defined(QT_VISIBILITY_AVAILABLE)
# define Q_DECL_EXPORT __attribute__((visibility("default")))
@@ -1168,7 +1168,7 @@ class QDataStream;
#ifndef Q_DECL_IMPORT
# if defined(Q_OS_WIN)
# define Q_DECL_IMPORT __declspec(dllimport)
-# elif defined(Q_CC_NOKIAX86)
+# elif defined(Q_CC_NOKIAX86) || defined(Q_CC_RVCT)
# define Q_DECL_IMPORT __declspec(dllimport)
# else
# define Q_DECL_IMPORT