diff options
| author | Jason Barron <jbarron@trolltech.com> | 2010-02-23 08:57:35 (GMT) |
|---|---|---|
| committer | Jason Barron <jbarron@trolltech.com> | 2010-02-23 10:36:04 (GMT) |
| commit | 9be36306cd19626344cdedf5d99f5b142c2356d0 (patch) | |
| tree | 68f71f90e65bfc188f449be8dc463e06043d4795 /src/corelib/global | |
| parent | 925dac20184820222765385b391a78d776ee61bb (diff) | |
| download | Qt-9be36306cd19626344cdedf5d99f5b142c2356d0.zip Qt-9be36306cd19626344cdedf5d99f5b142c2356d0.tar.gz Qt-9be36306cd19626344cdedf5d99f5b142c2356d0.tar.bz2 | |
Always define Q_WS_S60 on Symbian unless configured with -no-s60.
Previously we were relying on the toolchain to define the S60 version
for us and were enabling Q_WS_S60 based on this. Since the S60 macros
are no longer defined for us, let's assume we always want S60 support
unless Qt is configured with -no-s60.
Reviewed-by: axis
Diffstat (limited to 'src/corelib/global')
| -rw-r--r-- | src/corelib/global/qglobal.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/global/qglobal.h b/src/corelib/global/qglobal.h index 04aac12..82210f3 100644 --- a/src/corelib/global/qglobal.h +++ b/src/corelib/global/qglobal.h @@ -813,7 +813,7 @@ namespace QT_NAMESPACE {} # define Q_WS_MAC32 # endif # elif defined(Q_OS_SYMBIAN) -# if (defined(__SERIES60_31__) || defined(__S60_32__) || defined(__S60_50__)) && !defined(QT_NO_S60) +# if !defined(QT_NO_S60) # define Q_WS_S60 # endif # elif !defined(Q_WS_QWS) |