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

Fixed compile of autotests for Mac & QPA

Browse Source 
Several autotests were assuming that Q_OS_MAC == Mac cocoa port, which
caused compile failures when QPA is used.

Change-Id: I4480ed815c15b6d9ce83edf0057b7293f2e3ad7e
Reviewed-on: http://codereview.qt.nokia.com/533
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
This commit is contained in:
Rohan McGovern 2011-06-21 09:36:13 +02:00 committed by Qt Continuous Integration System
parent 84d0a2cc8e
commit f9ae26acf2
5 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/auto/other.pro
View File

@ -38,7 +38,7 @@ SUBDIRS=\
contains(QT_CONFIG, accessibility):SUBDIRS += qaccessibility contains(QT_CONFIG, accessibility):SUBDIRS += qaccessibility
contains(QT_CONFIG, OdfWriter):SUBDIRS += qzip qtextodfwriter contains(QT_CONFIG, OdfWriter):SUBDIRS += qzip qtextodfwriter
mac: { mac:!qpa {
SUBDIRS += macgui \ SUBDIRS += macgui \
macnativeevents \ macnativeevents \
macplist \ macplist \

2
tests/auto/qfontdialog/qfontdialog.pro
View File

@ -4,7 +4,7 @@ QT += core-private gui-private
SOURCES += tst_qfontdialog.cpp SOURCES += tst_qfontdialog.cpp
mac { mac:!qpa {
OBJECTIVE_SOURCES += tst_qfontdialog_mac_helpers.mm OBJECTIVE_SOURCES += tst_qfontdialog_mac_helpers.mm
LIBS += -framework Cocoa LIBS += -framework Cocoa
} }

4
tests/auto/qlayout/tst_qlayout.cpp
View File

@ -56,7 +56,7 @@
#include <QRadioButton> #include <QRadioButton>
#include <private/qlayoutengine_p.h> #include <private/qlayoutengine_p.h>
#ifdef Q_OS_MAC #ifdef Q_WS_MAC
# include <QtGui/QMacStyle> # include <QtGui/QMacStyle>
#endif #endif
@ -280,7 +280,7 @@ public:
void tst_QLayout::layoutItemRect() void tst_QLayout::layoutItemRect()
{ {
#ifdef Q_OS_MAC #ifdef Q_WS_MAC
if (qobject_cast<QMacStyle*>(QApplication::style())) { if (qobject_cast<QMacStyle*>(QApplication::style())) {
QWidget *window = new QWidget; QWidget *window = new QWidget;
QRadioButton *radio = new QRadioButton(window); QRadioButton *radio = new QRadioButton(window);

2
tests/auto/qmacstyle/tst_qmacstyle.cpp
View File

@ -45,7 +45,7 @@
#include <qmacstyle_mac.h> #include <qmacstyle_mac.h>
#ifdef Q_OS_MAC #ifdef Q_WS_MAC
const int N = 1; const int N = 1;

2
tests/auto/qwidget/qwidget.pro
View File

@ -9,7 +9,7 @@ aix-g++*:QMAKE_CXXFLAGS+=-fpermissive
CONFIG += x11inc CONFIG += x11inc
mac { mac:!qpa {
LIBS += -framework Security -framework AppKit -framework Carbon LIBS += -framework Security -framework AppKit -framework Carbon
OBJECTIVE_SOURCES += tst_qwidget_mac_helpers.mm OBJECTIVE_SOURCES += tst_qwidget_mac_helpers.mm
} }