- QSqlQueryModel::indexInQuery() is now virtual. See note below under QSql.
+- qMacVersion() has been removed. Use QSysInfo::macVersion() or
+ QSysInfo::MacintoshVersion instead.
+
****************************************************************************
* General *
****************************************************************************
*/
/*!
- \fn int qMacVersion()
- \relates <QtGlobal>
-
- Use QSysInfo::MacintoshVersion instead.
-
- \sa QSysInfo
-*/
-
-/*!
\macro QT_VERSION_CHECK
\relates <QtGlobal>
*/
/*!
+ \fn QSysInfo::MacVersion QSysInfo::macVersion()
+
+ Returns the version of Mac OS X on which the application is run (Mac OS X
+ Only).
+*/
+
+/*!
\enum QSysInfo::Endian
\value BigEndian Big-endian byte order (also called Network byte order)
#if defined(Q_OS_MAC)
-static QSysInfo::MacVersion macVersion()
+QSysInfo::MacVersion QSysInfo::macVersion()
{
#ifndef QT_NO_CORESERVICES
SInt32 gestalt_version;
#endif
return QSysInfo::MV_Unknown;
}
-const QSysInfo::MacVersion QSysInfo::MacintoshVersion = macVersion();
+const QSysInfo::MacVersion QSysInfo::MacintoshVersion = QSysInfo::macVersion();
#elif defined(Q_OS_WIN) || defined(Q_OS_CYGWIN) || defined(Q_OS_WINCE)
MV_LION = MV_10_7
};
static const MacVersion MacintoshVersion;
+ static MacVersion macVersion();
#endif
};
Q_CORE_EXPORT const char *qVersion();
Q_CORE_EXPORT bool qSharedBuild();
-#if defined(Q_OS_MAC)
-inline int qMacVersion() { return QSysInfo::MacintoshVersion; }
-#endif
-
#ifndef Q_OUTOFLINE_TEMPLATE
# define Q_OUTOFLINE_TEMPLATE
#endif
uint sc = SC_TitleBarMinButton;
ThemeTitleBarWidget tbw = kThemeWidgetCollapseBox;
bool active = titlebar->state & State_Active;
- if (qMacVersion() < QSysInfo::MV_10_6) {
+ if (QSysInfo::macVersion() < QSysInfo::MV_10_6) {
int border = 2;
titleBarRect.origin.x += border;
titleBarRect.origin.y -= border;
pi.insert(PI_OSVersion, QString::number(QSysInfo::windowsVersion()));
#elif defined(Q_OS_MAC)
pi.insert(PI_OSName, QLS("MacOS"));
- pi.insert(PI_OSVersion, QString::number(qMacVersion()));
+ pi.insert(PI_OSVersion, QString::number(QSysInfo::macVersion()));
#else
pi.insert(PI_OSName, QLS("Other"));
#endif