AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Change coreservices -> ios

Browse Source 
Replace "contains(QT_CONFIG, coreservices)" with "!ios" in config files.
Replace "QT_NO_CORESERVICES" with "Q_OS_IOS" in source files.

Change-Id: Id3b02316b245a24ce550e0b47596d18a4a409e4f
Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
This commit is contained in:
Ian Dean 2012-03-30 09:03:00 +01:00 committed by Qt by Nokia
parent 9a7f7b5d34
commit 22042dd769
24 changed files with 54 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/corelib/corelib.pro
View File

@ -32,7 +32,7 @@ include(mimetypes/mimetypes.pri)
include(xml/xml.pri)
mac|darwin {
contains(QT_CONFIG, coreservices) {
!ios {
LIBS_PRIVATE += -framework ApplicationServices
LIBS_PRIVATE += -framework CoreServices
LIBS_PRIVATE += -framework Foundation

8
src/corelib/global/qglobal.cpp
View File

@ -72,7 +72,7 @@
# include <envLib.h>
#endif
#if defined(Q_OS_MACX) && !defined(QT_NO_CORESERVICES)
#if defined(Q_OS_MAC) && !defined(Q_OS_IOS)
#include <CoreServices/CoreServices.h>
#endif
@ -1602,7 +1602,7 @@ static const unsigned int qt_one = 1;
const int QSysInfo::ByteOrder = ((*((unsigned char *) &qt_one) == 0) ? BigEndian : LittleEndian);
#endif
#if defined(Q_OS_MAC) && !defined(QT_NO_CORESERVICES)
#if defined(Q_OS_MAC) && !defined(Q_OS_IOS)
QT_BEGIN_INCLUDE_NAMESPACE
#include "private/qcore_mac_p.h"
@ -1624,13 +1624,13 @@ Q_CORE_EXPORT void qt_mac_to_pascal_string(QString s, Str255 str, TextEncoding e
Q_CORE_EXPORT QString qt_mac_from_pascal_string(const Str255 pstr) {
return QCFString(CFStringCreateWithPascalString(0, pstr, CFStringGetSystemEncoding()));
}
#endif // defined(Q_OS_MAC) && !defined(QT_NO_CORESERVICES)
#endif // defined(Q_OS_MAC) && !defined(Q_OS_IOS)
#if defined(Q_OS_MAC)
QSysInfo::MacVersion QSysInfo::macVersion()
{
#ifndef QT_NO_CORESERVICES
#ifndef Q_OS_IOS
SInt32 gestalt_version;
if (Gestalt(gestaltSystemVersion, &gestalt_version) == noErr) {
return QSysInfo::MacVersion(((gestalt_version & 0x00F0) >> 4) + 2);

2
src/corelib/io/io.pri
View File

@ -113,7 +113,7 @@ win32 {
SOURCES += io/qsettings_mac.cpp
}
macx-*: {
contains(QT_CONFIG, coreservices) {
!ios {
SOURCES += io/qstandardpaths_mac.cpp
} else {
SOURCES += io/qstandardpaths_unix.cpp

2
src/corelib/io/qfilesystemengine.cpp
View File

@ -259,7 +259,7 @@ void QFileSystemMetaData::fillFromStatBuf(const QT_STATBUF &statBuffer)
// Attributes
entryFlags |= QFileSystemMetaData::ExistsAttribute;
size_ = statBuffer.st_size;
#if defined (Q_OS_MAC) && !defined(QT_NO_CORESERVICES) \
#if defined (Q_OS_MAC) && !defined(Q_OS_IOS) \
&& MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5
if (statBuffer.st_flags & UF_HIDDEN) {
entryFlags |= QFileSystemMetaData::HiddenAttribute;

2
src/corelib/io/qfilesystemengine_p.h
View File

@ -83,7 +83,7 @@ public:
static QString resolveGroupName(uint groupId);
#endif
#if defined(Q_OS_MAC) && !defined(QT_NO_CORESERVICES)
#if defined(Q_OS_MAC) && !defined(Q_OS_IOS)
static QString bundleName(const QFileSystemEntry &entry);
#else
static QString bundleName(const QFileSystemEntry &entry) { Q_UNUSED(entry) return QString(); }

16
src/corelib/io/qfilesystemengine_unix.cpp
View File

@ -58,7 +58,7 @@
QT_BEGIN_NAMESPACE
#if defined(Q_OS_MAC) && !defined(QT_NO_CORESERVICES)
#if defined(Q_OS_MAC) && !defined(Q_OS_IOS)
static inline bool _q_isMacHidden(const char *nativePath)
{
OSErr err;
@ -142,7 +142,7 @@ QFileSystemEntry QFileSystemEngine::getLinkTarget(const QFileSystemEntry &link,
ret.chop(1);
return QFileSystemEntry(ret);
}
#if defined(Q_OS_MAC) && !defined(QT_NO_CORESERVICES)
#if defined(Q_OS_MAC) && !defined(Q_OS_IOS)
{
FSRef fref;
if (FSPathMakeRef((const UInt8 *)QFile::encodeName(QDir::cleanPath(link.filePath())).data(), &fref, 0) == noErr) {
@ -174,7 +174,7 @@ QFileSystemEntry QFileSystemEngine::canonicalName(const QFileSystemEntry &entry,
return QFileSystemEntry(slowCanonicalized(absoluteName(entry).filePath()));
#else
char *ret = 0;
# if defined(Q_OS_MAC) && !defined(QT_NO_CORESERVICES)
# if defined(Q_OS_MAC) && !defined(Q_OS_IOS)
// Mac OS X 10.5.x doesn't support the realpath(X,0) extension we use here.
if (QSysInfo::MacintoshVersion >= QSysInfo::MV_10_6) {
ret = realpath(entry.nativeFilePath().constData(), (char*)0);
@ -308,7 +308,7 @@ QString QFileSystemEngine::resolveGroupName(uint groupId)
return QString();
}
#if defined(Q_OS_MAC) && !defined(QT_NO_CORESERVICES)
#if defined(Q_OS_MAC) && !defined(Q_OS_IOS)
//static
QString QFileSystemEngine::bundleName(const QFileSystemEntry &entry)
{
@ -328,7 +328,7 @@ QString QFileSystemEngine::bundleName(const QFileSystemEntry &entry)
bool QFileSystemEngine::fillMetaData(const QFileSystemEntry &entry, QFileSystemMetaData &data,
QFileSystemMetaData::MetaDataFlags what)
{
#if defined(Q_OS_MAC) && !defined(QT_NO_CORESERVICES)
#if defined(Q_OS_MAC) && !defined(Q_OS_IOS)
if (what & QFileSystemMetaData::BundleType) {
if (!data.hasFlags(QFileSystemMetaData::DirectoryType))
what |= QFileSystemMetaData::DirectoryType;
@ -339,7 +339,7 @@ bool QFileSystemEngine::fillMetaData(const QFileSystemEntry &entry, QFileSystemM
what |= QFileSystemMetaData::PosixStatFlags;
}
# endif // MAC_OS_X_VERSION_MAX_ALLOWED...
#endif // defined(Q_OS_MAC) && !defined(QT_NO_CORESERVICES)
#endif // defined(Q_OS_MAC) && !defined(Q_OS_IOS)
if (what & QFileSystemMetaData::PosixStatFlags)
what |= QFileSystemMetaData::PosixStatFlags;
@ -400,7 +400,7 @@ bool QFileSystemEngine::fillMetaData(const QFileSystemEntry &entry, QFileSystemM
| QFileSystemMetaData::ExistsAttribute;
}
#if defined(Q_OS_MAC) && !defined(QT_NO_CORESERVICES)
#if defined(Q_OS_MAC) && !defined(Q_OS_IOS)
if (what & QFileSystemMetaData::AliasType)
{
if (entryExists) {
@ -446,7 +446,7 @@ bool QFileSystemEngine::fillMetaData(const QFileSystemEntry &entry, QFileSystemM
data.knownFlagsMask |= QFileSystemMetaData::HiddenAttribute;
}
#if defined(Q_OS_MAC) && !defined(QT_NO_CORESERVICES)
#if defined(Q_OS_MAC) && !defined(Q_OS_IOS)
if (what & QFileSystemMetaData::BundleType) {
if (entryExists && data.isDirectory()) {
QCFType<CFStringRef> path = CFStringCreateWithBytes(0,

4
src/corelib/io/qfilesystemmetadata_p.h
View File

@ -100,7 +100,7 @@ public:
LinkType = 0x00010000,
FileType = 0x00020000,
DirectoryType = 0x00040000,
#if defined(Q_OS_MAC) && !defined(QT_NO_CORESERVICES)
#if defined(Q_OS_MAC) && !defined(Q_OS_IOS)
BundleType = 0x00080000,
AliasType = 0x08000000,
#else
@ -248,7 +248,7 @@ private:
Q_DECLARE_OPERATORS_FOR_FLAGS(QFileSystemMetaData::MetaDataFlags)
#if defined(Q_OS_MAC) && !defined(QT_NO_CORESERVICES)
#if defined(Q_OS_MAC) && !defined(Q_OS_IOS)
inline bool QFileSystemMetaData::isBundle() const { return (entryFlags & BundleType); }
inline bool QFileSystemMetaData::isAlias() const { return (entryFlags & AliasType); }
#else

4
src/corelib/io/qprocess.cpp
View File

@ -2218,10 +2218,10 @@ bool QProcess::startDetached(const QString &program)
}
QT_BEGIN_INCLUDE_NAMESPACE
#if defined(Q_OS_MAC) && !defined(QT_NO_CORESERVICES)
#if defined(Q_OS_MAC) && !defined(Q_OS_IOS)
# include <crt_externs.h>
# define environ (*_NSGetEnviron())
#elif defined(Q_OS_WINCE) || (defined(Q_OS_MAC) && defined(QT_NO_CORESERVICES))
#elif defined(Q_OS_WINCE) || defined(Q_OS_IOS)
static char *qt_empty_environ[] = { 0 };
#define environ qt_empty_environ
#elif !defined(Q_OS_WIN)

4
src/corelib/io/qprocess_unix.cpp
View File

@ -476,7 +476,7 @@ bool QProcessPrivate::createChannel(Channel &channel)
}
QT_BEGIN_INCLUDE_NAMESPACE
#if defined(Q_OS_MAC) && !defined(QT_NO_CORESERVICES)
#if defined(Q_OS_MAC) && !defined(Q_OS_IOS)
# include <crt_externs.h>
# define environ (*_NSGetEnviron())
#else
@ -487,7 +487,7 @@ QT_END_INCLUDE_NAMESPACE
QProcessEnvironment QProcessEnvironment::systemEnvironment()
{
QProcessEnvironment env;
#if !defined(Q_OS_MAC) || !defined(QT_NO_CORESERVICES)
#if !defined(Q_OS_IOS)
const char *entry;
for (int count = 0; (entry = environ[count]); ++count) {
const char *equal = strchr(entry, '=');

2
src/corelib/kernel/qcore_mac_p.h
View File

@ -63,7 +63,7 @@
#include <CoreFoundation/CoreFoundation.h>
#endif
#ifndef QT_NO_CORESERVICES
#ifndef Q_OS_IOS
#include <CoreServices/CoreServices.h>
#endif

6
src/corelib/thread/qthread_unix.cpp
View File

@ -79,9 +79,9 @@
# define old_qDebug qDebug
# undef qDebug
# endif
#ifndef QT_NO_CORESERVICES
#ifndef Q_OS_IOS
# include <CoreServices/CoreServices.h>
#endif //QT_NO_CORESERVICES
#endif //Q_OS_IOS
# ifdef old_qDebug
# undef qDebug
@ -371,7 +371,7 @@ int QThread::idealThreadCount()
{
int cores = -1;
#if defined(Q_OS_MAC) && !defined(QT_NO_CORESERVICES)
#if defined(Q_OS_MAC) && !defined(Q_OS_IOS)
// Mac OS X
cores = MPProcessorsScheduled();
#elif defined(Q_OS_HPUX)

22
src/gui/kernel/qkeysequence.cpp
View File

@ -55,14 +55,14 @@
#endif
#include "qvariant.h"
#if defined(Q_OS_MAC) && !defined(QT_NO_CORESERVICES)
#if defined(Q_OS_MAC) && !defined(Q_OS_IOS)
#include <QtCore/private/qcore_mac_p.h>
#include <Carbon/Carbon.h>
#endif
QT_BEGIN_NAMESPACE
#if defined(Q_OS_MAC) && !defined(QT_NO_CORESERVICES)
#if defined(Q_OS_MAC) && !defined(Q_OS_IOS)
static bool qt_sequence_no_mnemonics = true;
struct MacSpecialKey {
int key;
@ -966,7 +966,7 @@ QKeySequence::QKeySequence(const QKeySequence& keysequence)
d->ref.ref();
}
#if defined(Q_OS_MAC) && !defined(QT_NO_CORESERVICES)
#if defined(Q_OS_MAC) && !defined(Q_OS_IOS)
static inline int maybeSwapShortcut(int shortcut)
{
if (qApp->testAttribute(Qt::AA_MacDontSwapCtrlAndMeta)) {
@ -998,7 +998,7 @@ QList<QKeySequence> QKeySequence::keyBindings(StandardKey key)
QKeyBinding keyBinding = QKeySequencePrivate::keyBindings[i];
if (keyBinding.standardKey == key && (keyBinding.platform & platform)) {
uint shortcut =
#if defined(Q_OS_MAC) && !defined(QT_NO_CORESERVICES)
#if defined(Q_OS_MAC) && !defined(Q_OS_IOS)
maybeSwapShortcut(QKeySequencePrivate::keyBindings[i].shortcut);
#else
QKeySequencePrivate::keyBindings[i].shortcut;
@ -1200,7 +1200,7 @@ int QKeySequencePrivate::decodeString(const QString &str, QKeySequence::Sequence
if (nativeText) {
gmodifs = globalModifs();
if (gmodifs->isEmpty()) {
#if defined(Q_OS_MAC) && !defined(QT_NO_CORESERVICES)
#if defined(Q_OS_MAC) && !defined(Q_OS_IOS)
const bool dontSwap = qApp->testAttribute(Qt::AA_MacDontSwapCtrlAndMeta);
if (dontSwap)
*gmodifs << QModifKeyName(Qt::META, QChar(kCommandUnicode));
@ -1240,7 +1240,7 @@ int QKeySequencePrivate::decodeString(const QString &str, QKeySequence::Sequence
modifs += *gmodifs; // Test non-translated ones last
QString sl = accel;
#if defined(Q_OS_MAC) && !defined(QT_NO_CORESERVICES)
#if defined(Q_OS_MAC) && !defined(Q_OS_IOS)
for (int i = 0; i < modifs.size(); ++i) {
const QModifKeyName &mkf = modifs.at(i);
if (sl.contains(mkf.name)) {
@ -1292,7 +1292,7 @@ int QKeySequencePrivate::decodeString(const QString &str, QKeySequence::Sequence
int fnum = 0;
if (accel.length() == 1) {
#if defined(Q_OS_MAC) && !defined(QT_NO_CORESERVICES)
#if defined(Q_OS_MAC) && !defined(Q_OS_IOS)
int qtKey = qtkeyForMacSymbol(accel[0]);
if (qtKey != -1) {
ret |= qtKey;
@ -1371,7 +1371,7 @@ QString QKeySequencePrivate::encodeString(int key, QKeySequence::SequenceFormat
if (key == -1 || key == Qt::Key_unknown)
return s;
#if defined(Q_OS_MAC) && !defined(QT_NO_CORESERVICES)
#if defined(Q_OS_MAC) && !defined(Q_OS_IOS)
if (nativeText) {
// On Mac OS X the order (by default) is Meta, Alt, Shift, Control.
// If the AA_MacDontSwapCtrlAndMeta is enabled, then the order
@ -1427,7 +1427,7 @@ QString QKeySequencePrivate::encodeString(int key, QKeySequence::SequenceFormat
: QString::fromLatin1("F%1").arg(key - Qt::Key_F1 + 1);
} else if (key) {
int i=0;
#if defined(Q_OS_MAC) && !defined(QT_NO_CORESERVICES)
#if defined(Q_OS_MAC) && !defined(Q_OS_IOS)
if (nativeText) {
QChar ch = qt_macSymbolForQtKey(key);
if (!ch.isNull())
@ -1437,7 +1437,7 @@ QString QKeySequencePrivate::encodeString(int key, QKeySequence::SequenceFormat
} else
#endif
{
#if defined(Q_OS_MAC) && !defined(QT_NO_CORESERVICES)
#if defined(Q_OS_MAC) && !defined(Q_OS_IOS)
NonSymbol:
#endif
while (keyname[i].name) {
@ -1463,7 +1463,7 @@ NonSymbol:
}
}
#if defined(Q_OS_MAC) && !defined(QT_NO_CORESERVICES)
#if defined(Q_OS_MAC) && !defined(Q_OS_IOS)
if (nativeText)
s += p;
else

2
src/network/kernel/kernel.pri
View File

@ -34,6 +34,6 @@ win32: {
integrity:SOURCES += kernel/qdnslookup_unix.cpp kernel/qhostinfo_unix.cpp kernel/qnetworkinterface_unix.cpp
mac:LIBS_PRIVATE += -framework SystemConfiguration -framework CoreFoundation -framework CoreServices
mac:contains(QT_CONFIG, coreservices):SOURCES += kernel/qnetworkproxy_mac.cpp
mac:!ios:SOURCES += kernel/qnetworkproxy_mac.cpp
else:win32:SOURCES += kernel/qnetworkproxy_win.cpp
else:SOURCES += kernel/qnetworkproxy_generic.cpp

6
src/network/ssl/qsslsocket_openssl.cpp
View File

@ -62,7 +62,7 @@
QT_BEGIN_NAMESPACE
#if defined(Q_OS_MAC) && !defined(QT_NO_CORESERVICES)
#if defined(Q_OS_MAC) && !defined(Q_OS_IOS)
#define kSecTrustSettingsDomainSystem 2 // so we do not need to include the header file
PtrSecCertificateGetData QSslSocketPrivate::ptrSecCertificateGetData = 0;
PtrSecTrustSettingsCopyCertificates QSslSocketPrivate::ptrSecTrustSettingsCopyCertificates = 0;
@ -612,7 +612,7 @@ void QSslSocketPrivate::ensureCiphersAndCertsLoaded()
resetDefaultCiphers();
//load symbols needed to receive certificates from system store
#if defined(Q_OS_MAC) && !defined(QT_NO_CORESERVICES)
#if defined(Q_OS_MAC) && !defined(Q_OS_IOS)
QLibrary securityLib("/System/Library/Frameworks/Security.framework/Versions/Current/Security");
if (securityLib.load()) {
ptrSecCertificateGetData = (PtrSecCertificateGetData) securityLib.resolve("SecCertificateGetData");
@ -745,7 +745,7 @@ QList<QSslCertificate> QSslSocketPrivate::systemCaCertificates()
timer.start();
#endif
QList<QSslCertificate> systemCerts;
#if defined(Q_OS_MAC) && !defined(QT_NO_CORESERVICES)
#if defined(Q_OS_MAC) && !defined(Q_OS_IOS)
CFArrayRef cfCerts;
OSStatus status = 1;

4
src/network/ssl/qsslsocket_p.h
View File

@ -69,7 +69,7 @@ QT_BEGIN_NAMESPACE
#if defined(Q_OS_MAC)
#include <Security/SecCertificate.h>
#include <CoreFoundation/CFArray.h>
#ifndef QT_NO_CORESERVICES
#ifndef Q_OS_IOS
typedef OSStatus (*PtrSecCertificateGetData)(SecCertificateRef, CSSM_DATA_PTR);
typedef OSStatus (*PtrSecTrustSettingsCopyCertificates)(int, CFArrayRef*);
typedef OSStatus (*PtrSecTrustCopyAnchorCertificates)(CFArrayRef*);
@ -136,7 +136,7 @@ public:
static void addDefaultCaCertificate(const QSslCertificate &cert);
static void addDefaultCaCertificates(const QList<QSslCertificate> &certs);
#if defined(Q_OS_MAC) && !defined(QT_NO_CORESERVICES)
#if defined(Q_OS_MAC) && !defined(Q_OS_IOS)
static PtrSecCertificateGetData ptrSecCertificateGetData;
static PtrSecTrustSettingsCopyCertificates ptrSecTrustSettingsCopyCertificates;
static PtrSecTrustCopyAnchorCertificates ptrSecTrustCopyAnchorCertificates;

2
src/opengl/qgl.h
View File

@ -59,7 +59,7 @@ QT_BEGIN_HEADER
#endif
#if defined(Q_OS_MAC)
# if !defined(QT_NO_CORESERVICES)
# if !defined(Q_OS_IOS)
# include <OpenGL/gl.h>
# else
# if defined(QT_OPENGL_ES_2)

2
src/platformsupport/cglconvenience/cglconvenience.pri
View File

@ -1,4 +1,4 @@
mac:contains(QT_CONFIG, coreservices) {
mac:!ios {
INCLUDEPATH += $$PWD
HEADERS += \

6
src/platformsupport/fontdatabases/mac/qcoretextfontdatabase.mm
View File

@ -39,7 +39,7 @@
**
****************************************************************************/
#ifndef QT_NO_CORESERVICES
#ifndef Q_OS_IOS
#import <Cocoa/Cocoa.h>
#import <IOKit/graphics/IOGraphicsLib.h>
#endif
@ -120,7 +120,7 @@ static NSInteger languageMapSort(id obj1, id obj2, void *context)
QCoreTextFontDatabase::QCoreTextFontDatabase()
{
#ifndef QT_NO_CORESERVICES
#ifndef Q_OS_IOS
QSettings appleSettings(QLatin1String("apple.com"));
QVariant appleValue = appleSettings.value(QLatin1String("AppleAntiAliasingThreshold"));
if (appleValue.isValid())
@ -348,7 +348,7 @@ QStringList QCoreTextFontDatabase::fallbacksForFamily(const QString family, cons
return fallbackLists[styleHint];
}
#ifndef QT_NO_CORESERVICES
#ifndef Q_OS_IOS
OSErr qt_mac_create_fsref(const QString &file, FSRef *fsref);
QStringList QCoreTextFontDatabase::addApplicationFont(const QByteArray &fontData, const QString &fileName)
{

2
src/platformsupport/fontdatabases/mac/qcoretextfontdatabase_p.h
View File

@ -55,7 +55,7 @@ public:
QFontEngine *fontEngine(const QFontDef &fontDef, QUnicodeTables::Script script, void *handle);
QFontEngine *fontEngine(const QByteArray &fontData, qreal pixelSize, QFont::HintingPreference hintingPreference);
QStringList fallbacksForFamily(const QString family, const QFont::Style &style, const QFont::StyleHint &styleHint, const QUnicodeTables::Script &script) const;
#ifndef QT_NO_CORESERVICES
#ifndef Q_OS_IOS
QStringList addApplicationFont(const QByteArray &fontData, const QString &fileName);
#endif
void releaseHandle(void *handle);

2
src/platformsupport/fontdatabases/mac/qfontengine_coretext.mm
View File

@ -413,7 +413,7 @@ QImage QCoreTextFontEngine::imageForGlyph(glyph_t glyph, QFixed subPixelPosition
QImage im(qRound(br.width)+2, qRound(br.height)+2, QImage::Format_RGB32);
im.fill(0);
#ifndef QT_NO_CORESERVICES
#ifndef Q_OS_IOS
CGColorSpaceRef colorspace = CGColorSpaceCreateWithName(kCGColorSpaceGenericRGB);
#else
CGColorSpaceRef colorspace = CGColorSpaceCreateDeviceRGB();

2
src/platformsupport/fontdatabases/mac/qfontengine_coretext_p.h
View File

@ -45,7 +45,7 @@
#include <private/qfontengine_p.h>
#include <private/qcore_mac_p.h>
#ifndef QT_NO_CORESERVICES
#ifndef Q_OS_IOS
#include <ApplicationServices/ApplicationServices.h>
#else
#include <CoreText/CoreText.h>

2
src/plugins/platforms/platforms.pro
View File

@ -6,7 +6,7 @@ contains(QT_CONFIG, xcb) {
SUBDIRS += xcb
}
mac:contains(QT_CONFIG, coreservices): SUBDIRS += cocoa
mac:!ios: SUBDIRS += cocoa
win32: SUBDIRS += windows

2
src/testlib/testlib.pro
View File

@ -65,7 +65,7 @@ wince*::LIBS += libcmt.lib \
mac {
LIBS += -framework IOKit -framework Security
contains(QT_CONFIG, coreservices) {
!ios {
LIBS_PRIVATE += -framework CoreServices
LIBS += -framework ApplicationServices
} else {

2
src/widgets/styles/styles.pri
View File

@ -37,7 +37,7 @@ contains( styles, all ) {
styles = mac windows windowsxp windowsvista
}
!macx-*|!contains(QT_CONFIG, coreservices):styles -= mac
!macx-*|ios:styles -= mac
x11{
QMAKE_CXXFLAGS += $$QT_CFLAGS_QGTKSTYLE