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

Make it more obvious that Q_WS_ is dead code, and should perhaps be ported

Browse Source 
We still have a bunch of Q_WS_ ifdefs in our code, which are easy to
mistake for Q_OS_ ifdefs when quickly scanning the code. By renaming
the ifdefs we make it clear that the code in question is dead.

In incremental follow-ups, we can then selectively either remove, or
port, the pieces that are dead code.

Change-Id: Ib5ef3e9e0662d321f179f3e25122cacafff0f41f
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
This commit is contained in:
Tor Arne Vestbø 2015-02-02 18:49:18 +01:00 committed by Tor Arne Vestbø
parent 611bcc3cd3
commit c5db8fc74a
90 changed files with 309 additions and 314 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/global/qt-cpp-defines.qdocconf
View File

@ -7,7 +7,7 @@ defines += Q_QDOC \
QT_KEYPAD_NAVIGATION \
QT_NO_EGL \
QT3_SUPPORT \
Q_WS_.* \
Q_DEAD_CODE_FROM_QT4_.* \
Q_OS_.* \
Q_BYTE_ORDER \
QT_DEPRECATED \

2
examples/widgets/graphicsview/boxes/scene.cpp
View File

@ -110,7 +110,7 @@ void ColorEdit::mousePressEvent(QMouseEvent *event)
QColorDialog dialog(color, 0);
dialog.setOption(QColorDialog::ShowAlphaChannel, true);
// The ifdef block is a workaround for the beta, TODO: remove when bug 238525 is fixed
#ifdef Q_WS_MAC
#ifdef Q_DEAD_CODE_FROM_QT4_MAC
dialog.setOption(QColorDialog::DontUseNativeDialog, true);
#endif
dialog.move(280, 120);

4
examples/widgets/tools/i18n/languagechooser.cpp
View File

@ -43,7 +43,7 @@
#include "languagechooser.h"
#include "mainwindow.h"
#ifdef Q_WS_MAC
#ifdef Q_DEAD_CODE_FROM_QT4_MAC
QT_BEGIN_NAMESPACE
extern void qt_mac_set_menubar_merge(bool merge);
QT_END_NAMESPACE
@ -82,7 +82,7 @@ LanguageChooser::LanguageChooser(const QString& defaultLang, QWidget *parent)
mainLayout->addWidget(buttonBox);
setLayout(mainLayout);
#ifdef Q_WS_MAC
#ifdef Q_DEAD_CODE_FROM_QT4_MAC
qt_mac_set_menubar_merge(false);
#endif

2
src/gui/image/qicon.cpp
View File

@ -46,7 +46,7 @@
#include "qdebug.h"
#include "qpalette.h"
#ifdef Q_WS_MAC
#ifdef Q_DEAD_CODE_FROM_QT4_MAC
#include <private/qt_mac_p.h>
#include <private/qt_cocoa_helpers_mac_p.h>
#endif

4
src/gui/image/qiconloader.cpp
View File

@ -47,7 +47,7 @@
#include <QtCore/QSettings>
#include <QtGui/QPainter>
#ifdef Q_WS_MAC
#ifdef Q_DEAD_CODE_FROM_QT4_MAC
#include <private/qt_cocoa_helpers_mac_p.h>
#endif
@ -398,7 +398,7 @@ void QIconLoaderEngine::paint(QPainter *painter, const QRect &rect,
QIcon::Mode mode, QIcon::State state)
{
QSize pixmapSize = rect.size();
#if defined(Q_WS_MAC)
#if defined(Q_DEAD_CODE_FROM_QT4_MAC)
pixmapSize *= qt_mac_get_scalefactor();
#endif
painter->drawPixmap(rect, pixmap(pixmapSize, mode, state));

2
src/plugins/platforms/windows/qwindowsfontengine.cpp
View File

@ -239,7 +239,7 @@ int QWindowsFontEngine::getGlyphIndexes(const QChar *str, int numChars, QGlyphLa
while (it.hasNext()) {
const uint uc = it.next();
if (
#ifdef Q_WS_WINCE
#ifdef Q_DEAD_CODE_FROM_QT4_WINCE
tm.tmFirstChar > 60000 ||
#endif
uc >= first && uc <= last)

4
src/plugins/styles/bb10style/qpixmapstyle.cpp
View File

@ -75,7 +75,7 @@ QPixmapStyle::~QPixmapStyle()
void QPixmapStyle::polish(QApplication *application)
{
QCommonStyle::polish(application);
#if defined(Q_WS_WIN)
#if defined(Q_DEAD_CODE_FROM_QT4_WIN)
QApplication::setEffectEnabled(Qt::UI_AnimateCombo, false);
#endif
}
@ -129,7 +129,7 @@ void QPixmapStyle::polish(QWidget *widget)
frame->setContentsMargins(pix.margins.left(), desc.margins.top(),
pix.margins.right(), desc.margins.bottom());
frame->setAttribute(Qt::WA_TranslucentBackground);
#ifdef Q_WS_WIN
#ifdef Q_DEAD_CODE_FROM_QT4_WIN
// FramelessWindowHint is needed on windows to make
// WA_TranslucentBackground work properly
frame->setWindowFlags(widget->windowFlags() | Qt::FramelessWindowHint);

2
src/printsupport/dialogs/qpagesetupdialog.cpp
View File

@ -110,7 +110,7 @@ void QPageSetupDialogPrivate::setPrinter(QPrinter *newPrinter)
printer = new QPrinter;
ownsPrinter = true;
}
#ifndef Q_WS_X11
#ifndef Q_DEAD_CODE_FROM_QT4_X11
if (printer->outputFormat() != QPrinter::NativeFormat)
qWarning("QPageSetupDialog: Cannot be used on non-native printers");
#endif

7
src/tools/qdoc/doc/qdoc-manual-qdocconf.qdoc
View File

@ -204,7 +204,6 @@
QT_.*_LIB \
QT_COMPAT \
QT3_SUPPORT \
Q_WS_.* \
Q_OS_.* \
Q_BYTE_ORDER \
__cplusplus
@ -214,14 +213,14 @@
symbols to be defined. For example:
\code
#ifdef Q_WS_WIN
#ifdef Q_OS_WIN
HDC getDC() const;
void releaseDC(HDC) const;
#endif
\endcode
Since the Q_WS_.* regular expression (specified using the \c
defines variable) matches Q_WS_WIN, QDoc will process the code
Since the Q_OS_.* regular expression (specified using the \c
defines variable) matches Q_OS_WIN, QDoc will process the code
within #ifdef and #endif in our example.
You can also define preprocessor symbols manually on the command

8
src/widgets/dialogs/qcolordialog.cpp
View File

@ -1605,7 +1605,7 @@ void QColorDialogPrivate::init(const QColor &initial)
if (!nativeDialogInUse)
initWidgets();
#ifdef Q_WS_MAC
#ifdef Q_DEAD_CODE_FROM_QT4_MAC
delegate = 0;
#endif
#ifdef Q_OS_WIN32
@ -2009,7 +2009,7 @@ QColorDialog::ColorDialogOptions QColorDialog::options() const
\sa color, colorSelected()
*/
#ifdef Q_WS_MAC
#ifdef Q_DEAD_CODE_FROM_QT4_MAC
// can only have one Cocoa color panel active
bool QColorDialogPrivate::sharedColorPanelAvailable = true;
#endif
@ -2040,7 +2040,7 @@ void QColorDialog::setVisible(bool visible)
if (visible)
d->selectedQColor = QColor();
#if defined(Q_WS_MAC)
#if defined(Q_DEAD_CODE_FROM_QT4_MAC)
if (visible) {
if (d->delegate || (QColorDialogPrivate::sharedColorPanelAvailable &&
!(testAttribute(Qt::WA_DontShowOnScreen) || (d->opts & DontUseNativeDialog)))){
@ -2141,7 +2141,7 @@ QRgb QColorDialog::getRgba(QRgb initial, bool *ok, QWidget *parent)
QColorDialog::~QColorDialog()
{
#if defined(Q_WS_MAC)
#if defined(Q_DEAD_CODE_FROM_QT4_MAC)
Q_D(QColorDialog);
if (d->delegate) {
d->releaseCocoaColorPanelDelegate();

2
src/widgets/dialogs/qcolordialog_p.h
View File

@ -150,7 +150,7 @@ public:
QWindow dummyTransparentWindow;
#endif
#ifdef Q_WS_MAC
#ifdef Q_DEAD_CODE_FROM_QT4_MAC
void openCocoaColorPanel(const QColor &initial,
QWidget *parent, const QString &title, QColorDialog::ColorDialogOptions options);
void closeCocoaColorPanel();

8
src/widgets/dialogs/qfiledialog.cpp
View File

@ -327,16 +327,12 @@ Q_GLOBAL_STATIC(QUrl, lastVisitedDir)
This signal is emitted when the user selects a \a filter.
*/
//#if defined(Q_WS_WIN) || defined(Q_WS_MAC)
//bool Q_WIDGETS_EXPORT qt_use_native_dialogs = true; // for the benefit of testing tools, until we have a proper API
//#endif
QT_BEGIN_INCLUDE_NAMESPACE
#ifdef Q_WS_WIN
#ifdef Q_DEAD_CODE_FROM_QT4_WIN
#include <qwindowsstyle_p.h>
#endif
#include <qshortcut.h>
#ifdef Q_WS_MAC
#ifdef Q_DEAD_CODE_FROM_QT4_MAC
#include <qmacstyle_mac_p.h>
#endif
QT_END_INCLUDE_NAMESPACE

2
src/widgets/dialogs/qprogressdialog.cpp
View File

@ -697,7 +697,7 @@ void QProgressDialog::setValue(int progress)
d->shown_once = true;
}
}
#ifdef Q_WS_MAC
#ifdef Q_DEAD_CODE_FROM_QT4_MAC
QApplication::flush();
#endif
}

2
src/widgets/doc/snippets/code/doc_src_styles.cpp
View File

@ -71,7 +71,7 @@
state |= QStyle::State_MouseOver;
if (widget->window()->isActiveWindow())
state |= QStyle::State_Active;
#ifdef Q_WS_MAC
#ifdef Q_DEAD_CODE_FROM_QT4_MAC
extern bool qt_mac_can_clickThrough(const QWidget *w); //qwidget_mac.cpp
if (!(state & QStyle::State_Active) && !qt_mac_can_clickThrough(widget))
state &= ~QStyle::State_Enabled;

4
src/widgets/doc/snippets/macmainwindow.mm
View File

@ -43,7 +43,7 @@
#include <QtGui>
#ifdef Q_WS_MAC
#ifdef Q_DEAD_CODE_FROM_QT4_MAC
#include <Carbon/Carbon.h>
@ -344,4 +344,4 @@ QAbstractItemModel *MacMainWindow::createDocumentModel()
return model;
}
#endif // Q_WS_MAC
#endif // Q_DEAD_CODE_FROM_QT4_MAC

2
src/widgets/graphicsview/qgraphicsitem.cpp
View File

@ -7404,7 +7404,7 @@ void QGraphicsItem::setInputMethodHints(Qt::InputMethodHints hints)
*/
void QGraphicsItem::updateMicroFocus()
{
#if !defined(QT_NO_IM) && defined(Q_WS_X11)
#if !defined(QT_NO_IM) && defined(Q_DEAD_CODE_FROM_QT4_X11)
if (QWidget *fw = QApplication::focusWidget()) {
if (scene()) {
for (int i = 0 ; i < scene()->views().count() ; ++i) {

4
src/widgets/graphicsview/qgraphicsscene.cpp
View File

@ -4136,7 +4136,7 @@ void QGraphicsScene::wheelEvent(QGraphicsSceneWheelEvent *wheelEvent)
wheelEvent->scenePos(),
wheelEvent->widget());
#ifdef Q_WS_MAC
#ifdef Q_DEAD_CODE_FROM_QT4_MAC
// On Mac, ignore the event if the first item under the mouse is not the last opened
// popup (or one of its descendant)
if (!d->popupWidgets.isEmpty() && !wheelCandidates.isEmpty() && wheelCandidates.first() != d->popupWidgets.back() && !d->popupWidgets.back()->isAncestorOf(wheelCandidates.first())) {
@ -4375,7 +4375,7 @@ void QGraphicsScenePrivate::drawItemHelper(QGraphicsItem *item, QPainter *painte
// Render directly, using no cache.
if (cacheMode == QGraphicsItem::NoCache
#ifdef Q_WS_X11
#ifdef Q_DEAD_CODE_FROM_QT4_X11
|| !X11->use_xrender
#endif
) {

4
src/widgets/graphicsview/qgraphicsview.cpp
View File

@ -3484,7 +3484,7 @@ void QGraphicsView::paintEvent(QPaintEvent *event)
// Draw background
if ((d->cacheMode & CacheBackground)
#ifdef Q_WS_X11
#ifdef Q_DEAD_CODE_FROM_QT4_X11
&& X11->use_xrender
#endif
) {
@ -3683,7 +3683,7 @@ void QGraphicsView::scrollContentsBy(int dx, int dy)
d->updateLastCenterPoint();
if ((d->cacheMode & CacheBackground)
#ifdef Q_WS_X11
#ifdef Q_DEAD_CODE_FROM_QT4_X11
&& X11->use_xrender
#endif
) {

4
src/widgets/graphicsview/qgraphicsview_p.h
View File

@ -176,7 +176,7 @@ public:
inline void dispatchPendingUpdateRequests()
{
#ifdef Q_WS_MAC
#ifdef Q_DEAD_CODE_FROM_QT4_MAC
// QWidget::update() works slightly different on the Mac without the raster engine;
// it's not part of our backing store so it needs special threatment.
if (QApplicationPrivate::graphics_system_name != QLatin1String("raster")) {
@ -187,7 +187,7 @@ public:
extern void qt_mac_dispatchPendingUpdateRequests(QWidget *);
qt_mac_dispatchPendingUpdateRequests(viewport->window());
} else
#endif // !Q_WS_MAC
#endif // !Q_DEAD_CODE_FROM_QT4_MAC
{
if (qt_widget_private(viewport)->paintOnScreen())
QCoreApplication::sendPostedEvents(viewport, QEvent::UpdateRequest);

2
src/widgets/graphicsview/qgraphicswidget.cpp
View File

@ -694,7 +694,7 @@ void QGraphicsWidget::initStyleOption(QStyleOption *option) const
option->state |= QStyle::State_Window;
/*
###
#ifdef Q_WS_MAC
#ifdef Q_DEAD_CODE_FROM_QT4_MAC
extern bool qt_mac_can_clickThrough(const QGraphicsWidget *w); //qwidget_mac.cpp
if (!(option->state & QStyle::State_Active) && !qt_mac_can_clickThrough(widget))
option->state &= ~QStyle::State_Enabled;

4
src/widgets/graphicsview/qgraphicswidget_p.cpp
View File

@ -46,7 +46,7 @@
#include <QtWidgets/qstyleoption.h>
#include <QtWidgets/QStyleOptionTitleBar>
#include <QtWidgets/QGraphicsSceneMouseEvent>
#if defined(Q_WS_MAC) && !defined(QT_NO_STYLE_MAC)
#if defined(Q_DEAD_CODE_FROM_QT4_MAC) && !defined(QT_NO_STYLE_MAC)
# include <private/qmacstyle_mac_p.h>
#endif
@ -682,7 +682,7 @@ void QGraphicsWidgetPrivate::windowFrameHoverMoveEvent(QGraphicsSceneHoverEvent
case Qt::TitleBarArea:
windowData->buttonRect = q->style()->subControlRect(
QStyle::CC_TitleBar, &bar, QStyle::SC_TitleBarCloseButton, 0);
#ifdef Q_WS_MAC
#ifdef Q_DEAD_CODE_FROM_QT4_MAC
// On mac we should hover if we are in the 'area' of the buttons
windowData->buttonRect |= q->style()->subControlRect(
QStyle::CC_TitleBar, &bar, QStyle::SC_TitleBarMinButton, 0);

6
src/widgets/itemviews/qabstractitemview.cpp
View File

@ -2384,7 +2384,7 @@ void QAbstractItemView::keyPressEvent(QKeyEvent *event)
}
#endif
break;
#ifdef Q_WS_MAC
#ifdef Q_DEAD_CODE_FROM_QT4_MAC
case Qt::Key_Enter:
case Qt::Key_Return:
// Propagate the enter if you couldn't edit the item and there are no
@ -2414,7 +2414,7 @@ void QAbstractItemView::keyPressEvent(QKeyEvent *event)
selectAll();
break;
}
#ifdef Q_WS_MAC
#ifdef Q_DEAD_CODE_FROM_QT4_MAC
if (event->key() == Qt::Key_O && event->modifiers() & Qt::ControlModifier && currentIndex().isValid()) {
emit activated(currentIndex());
break;
@ -3619,7 +3619,7 @@ QStyleOptionViewItem QAbstractItemView::viewOptions() const
option.state &= ~QStyle::State_MouseOver;
option.font = font();
#ifndef Q_WS_MAC
#ifndef Q_DEAD_CODE_FROM_QT4_MAC
// On mac the focus appearance follows window activation
// not widget activation
if (!hasFocus())

2
src/widgets/itemviews/qheaderview.cpp
View File

@ -2392,7 +2392,7 @@ void QHeaderView::mouseMoveEvent(QMouseEvent *e)
if (pos < 0 && d->state != QHeaderViewPrivate::SelectSections)
return;
if (e->buttons() == Qt::NoButton) {
#if !defined(Q_WS_MAC)
#if !defined(Q_DEAD_CODE_FROM_QT4_MAC)
// Under Cocoa, when the mouse button is released, may include an extra
// simulated mouse moved event. The state of the buttons when this event
// is generated is already "no button" and the code below gets executed

2
src/widgets/itemviews/qtreeview.cpp
View File

@ -2199,7 +2199,7 @@ QModelIndex QTreeView::moveCursor(CursorAction cursorAction, Qt::KeyboardModifie
return QModelIndex();
}
int vi = -1;
#if defined(Q_WS_MAC) && !defined(QT_NO_STYLE_MAC)
#if defined(Q_DEAD_CODE_FROM_QT4_MAC) && !defined(QT_NO_STYLE_MAC)
// Selection behavior is slightly different on the Mac.
if (d->selectionMode == QAbstractItemView::ExtendedSelection
&& d->selectionModel

20
src/widgets/kernel/qapplication_p.h
View File

@ -114,7 +114,7 @@ public:
virtual bool shouldQuit() Q_DECL_OVERRIDE;
bool tryCloseAllWindows() Q_DECL_OVERRIDE;
#if defined(Q_WS_X11)
#if defined(Q_DEAD_CODE_FROM_QT4_X11)
#ifndef QT_NO_SETTINGS
static bool x11_apply_settings();
#endif
@ -137,7 +137,7 @@ public:
static bool isBlockedByModal(QWidget *widget);
static bool modalState();
static bool tryModalHelper(QWidget *widget, QWidget **rettop = 0);
#ifdef Q_WS_MAC
#ifdef Q_DEAD_CODE_FROM_QT4_MAC
static QWidget *tryModalHelper_sys(QWidget *top);
bool canQuit();
#endif
@ -151,14 +151,14 @@ public:
bool notify_helper(QObject *receiver, QEvent * e);
void construct(
#ifdef Q_WS_X11
#ifdef Q_DEAD_CODE_FROM_QT4_X11
Display *dpy = 0, Qt::HANDLE visual = 0, Qt::HANDLE cmap = 0
#endif
);
void initialize();
void process_cmdline();
#if defined(Q_WS_X11)
#if defined(Q_DEAD_CODE_FROM_QT4_X11)
static void x11_initialize_style();
#endif
@ -213,7 +213,7 @@ public:
static void initializeWidgetFontHash();
static void setSystemFont(const QFont &font);
#if defined(Q_WS_X11)
#if defined(Q_DEAD_CODE_FROM_QT4_X11)
static void applyX11SpecificCommandLineArguments(QWidget *main_widget);
#endif
@ -226,7 +226,7 @@ public:
static Qt::NavigationMode navigationMode;
#endif
#if defined(Q_WS_MAC) || defined(Q_WS_X11)
#if defined(Q_DEAD_CODE_FROM_QT4_MAC) || defined(Q_DEAD_CODE_FROM_QT4_X11)
void _q_alertTimeOut();
QHash<QWidget *, QTimer *> alertTimerHash;
#endif
@ -266,12 +266,12 @@ public:
QGestureManager *gestureManager;
QWidget *gestureWidget;
#endif
#if defined(Q_WS_X11) || defined(Q_WS_WIN)
#if defined(Q_DEAD_CODE_FROM_QT4_X11) || defined(Q_DEAD_CODE_FROM_QT4_WIN)
QPixmap *move_cursor;
QPixmap *copy_cursor;
QPixmap *link_cursor;
#endif
#if defined(Q_WS_WIN)
#if defined(Q_DEAD_CODE_FROM_QT4_WIN)
QPixmap *ignore_cursor;
#endif
@ -301,9 +301,9 @@ private:
static bool isAlien(QWidget *);
};
#if defined(Q_WS_WIN)
#if defined(Q_DEAD_CODE_FROM_QT4_WIN)
extern void qt_win_set_cursor(QWidget *, bool);
#elif defined(Q_WS_X11)
#elif defined(Q_DEAD_CODE_FROM_QT4_X11)
extern void qt_x11_enforce_cursor(QWidget *, bool);
extern void qt_x11_enforce_cursor(QWidget *);
#else

4
src/widgets/kernel/qgesturemanager.cpp
View File

@ -46,7 +46,7 @@
#ifdef Q_OS_OSX
#include "qmacgesturerecognizer_p.h"
#endif
#if defined(Q_WS_WIN) && !defined(QT_NO_NATIVE_GESTURES)
#if defined(Q_DEAD_CODE_FROM_QT4_WIN) && !defined(QT_NO_NATIVE_GESTURES)
#include "qwinnativepangesturerecognizer_win_p.h"
#endif
@ -94,7 +94,7 @@ QGestureManager::QGestureManager(QObject *parent)
registerGestureRecognizer(new QSwipeGestureRecognizer);
registerGestureRecognizer(new QTapGestureRecognizer);
#endif
#if defined(Q_WS_WIN)
#if defined(Q_DEAD_CODE_FROM_QT4_WIN)
#if !defined(QT_NO_NATIVE_GESTURES)
if (QApplicationPrivate::HasTouchSupport)
registerGestureRecognizer(new QWinNativePanGestureRecognizer);

2
src/widgets/kernel/qt_widgets_pch.h
View File

@ -44,7 +44,7 @@
#include <qglobal.h>
#ifdef Q_WS_WIN
#ifdef Q_DEAD_CODE_FROM_QT4_WIN
# define _POSIX_
# include <limits.h>
# undef _POSIX_

16
src/widgets/kernel/qtooltip.cpp
View File

@ -30,7 +30,7 @@
** $QT_END_LICENSE$
**
****************************************************************************/
#ifdef Q_WS_MAC
#ifdef Q_DEAD_CODE_FROM_QT4_MAC
# include <private/qcore_mac_p.h>
#endif
@ -51,7 +51,7 @@
#include <private/qstylesheetstyle_p.h>
#ifndef QT_NO_TOOLTIP
#ifdef Q_WS_MAC
#ifdef Q_DEAD_CODE_FROM_QT4_MAC
# include <private/qcore_mac_p.h>
#include <private/qt_cocoa_helpers_mac_p.h>
#endif
@ -279,7 +279,7 @@ void QTipLabel::timerEvent(QTimerEvent *e)
|| e->timerId() == expireTimer.timerId()){
hideTimer.stop();
expireTimer.stop();
#if defined(Q_WS_MAC) && !defined(QT_NO_EFFECTS)
#if defined(Q_DEAD_CODE_FROM_QT4_MAC) && !defined(QT_NO_EFFECTS)
if (QApplication::isEffectEnabled(Qt::UI_FadeTooltip)){
// Fade out tip on mac (makes it invisible).
// The tip will not be deleted until a new tip is shown.
@ -299,7 +299,7 @@ void QTipLabel::timerEvent(QTimerEvent *e)
bool QTipLabel::eventFilter(QObject *o, QEvent *e)
{
switch (e->type()) {
#ifdef Q_WS_MAC
#ifdef Q_DEAD_CODE_FROM_QT4_MAC
case QEvent::KeyPress:
case QEvent::KeyRelease: {
int key = static_cast<QKeyEvent *>(e)->key();
@ -380,7 +380,7 @@ void QTipLabel::placeTip(const QPoint &pos, QWidget *w)
#endif //QT_NO_STYLE_STYLESHEET
#ifdef Q_WS_MAC
#ifdef Q_DEAD_CODE_FROM_QT4_MAC
// When in full screen mode, there is no Dock nor Menu so we can use
// the whole screen for displaying the tooltip. However when not in
// full screen mode we need to save space for the dock, so we use
@ -397,7 +397,7 @@ void QTipLabel::placeTip(const QPoint &pos, QWidget *w)
QPoint p = pos;
p += QPoint(2,
#ifdef Q_WS_WIN
#ifdef Q_DEAD_CODE_FROM_QT4_WIN
21
#else
16
@ -486,7 +486,7 @@ void QToolTip::showText(const QPoint &pos, const QString &text, QWidget *w, cons
}
if (!text.isEmpty()){ // no tip can be reused, create new tip:
#ifndef Q_WS_WIN
#ifndef Q_DEAD_CODE_FROM_QT4_WIN
new QTipLabel(text, w, msecDisplayTime); // sets QTipLabel::instance to itself
#else
// On windows, we can't use the widget as parent otherwise the window will be
@ -498,7 +498,7 @@ void QToolTip::showText(const QPoint &pos, const QString &text, QWidget *w, cons
QTipLabel::instance->setObjectName(QLatin1String("qtooltip_label"));
#if !defined(QT_NO_EFFECTS) && !defined(Q_WS_MAC)
#if !defined(QT_NO_EFFECTS) && !defined(Q_DEAD_CODE_FROM_QT4_MAC)
if (QApplication::isEffectEnabled(Qt::UI_FadeTooltip))
qFadeEffect(QTipLabel::instance);
else if (QApplication::isEffectEnabled(Qt::UI_AnimateTooltip))

6
src/widgets/kernel/qwhatsthis.cpp
View File

@ -567,7 +567,7 @@ void QWhatsThisPrivate::say(QWidget * widget, const QString &text, int x, int y)
// make a fresh widget, and set it up
QWhatsThat *whatsThat = new QWhatsThat(
text,
#if defined(Q_WS_X11) && !defined(QT_NO_CURSOR)
#if defined(Q_DEAD_CODE_FROM_QT4_X11) && !defined(QT_NO_CURSOR)
QApplication::desktop()->screen(widget ? widget->x11Info().screen() : QCursor::x11Screen()),
#else
0,
@ -580,11 +580,11 @@ void QWhatsThisPrivate::say(QWidget * widget, const QString &text, int x, int y)
int scr = (widget ?
QApplication::desktop()->screenNumber(widget) :
#if defined(Q_WS_X11) && !defined(QT_NO_CURSOR)
#if defined(Q_DEAD_CODE_FROM_QT4_X11) && !defined(QT_NO_CURSOR)
QCursor::x11Screen()
#else
QApplication::desktop()->screenNumber(QPoint(x,y))
#endif // Q_WS_X11
#endif // Q_DEAD_CODE_FROM_QT4_X11
);
QRect screen = QApplication::desktop()->screenGeometry(scr);

162
src/widgets/kernel/qwidget.cpp
View File

@ -53,7 +53,7 @@
#ifndef QT_NO_ACCESSIBILITY
# include "qaccessible.h"
#endif
#ifdef Q_WS_MAC
#ifdef Q_DEAD_CODE_FROM_QT4_MAC
# include "qt_mac_p.h"
# include "qt_cocoa_helpers_mac_p.h"
# include "qmainwindow.h"
@ -76,7 +76,7 @@
#include <private/qgraphicseffect_p.h>
#include <qbackingstore.h>
#include <private/qwidgetbackingstore_p.h>
#ifdef Q_WS_MAC
#ifdef Q_DEAD_CODE_FROM_QT4_MAC
# include <private/qpaintengine_mac_p.h>
#endif
#include <private/qpaintengine_raster_p.h>
@ -108,7 +108,7 @@
QT_BEGIN_NAMESPACE
static bool qt_enable_backingstore = true;
#ifdef Q_WS_X11
#ifdef Q_DEAD_CODE_FROM_QT4_X11
// for compatibility with Qt 4.0
Q_WIDGETS_EXPORT void qt_x11_set_global_double_buffer(bool enable)
{
@ -116,7 +116,7 @@ Q_WIDGETS_EXPORT void qt_x11_set_global_double_buffer(bool enable)
}
#endif
#ifdef Q_WS_MAC
#ifdef Q_DEAD_CODE_FROM_QT4_MAC
bool qt_mac_clearDirtyOnWidgetInsideDrawWidget = false;
#endif
@ -131,7 +131,7 @@ static inline bool hasBackingStoreSupport()
return true;
}
#ifdef Q_WS_MAC
#ifdef Q_DEAD_CODE_FROM_QT4_MAC
# define QT_NO_PAINT_DEBUG
#endif
@ -272,13 +272,13 @@ QWidgetPrivate::QWidgetPrivate(int version)
#if defined(Q_OS_WIN)
, noPaintOnScreen(0)
#endif
#if defined(Q_WS_X11)
#if defined(Q_DEAD_CODE_FROM_QT4_X11)
, picture(0)
#elif defined(Q_WS_WIN)
#elif defined(Q_DEAD_CODE_FROM_QT4_WIN)
#ifndef QT_NO_GESTURES
, nativeGesturePanEnabled(0)
#endif
#elif defined(Q_WS_MAC)
#elif defined(Q_DEAD_CODE_FROM_QT4_MAC)
, needWindowChange(0)
, window_event(0)
, qd_hd(0)
@ -294,7 +294,7 @@ QWidgetPrivate::QWidgetPrivate(int version)
isWidget = true;
memset(high_attributes, 0, sizeof(high_attributes));
#ifdef Q_WS_MAC
#ifdef Q_DEAD_CODE_FROM_QT4_MAC
drawRectOriginalAdded = false;
originalDrawMethod = true;
changeMethods = false;
@ -303,7 +303,7 @@ QWidgetPrivate::QWidgetPrivate(int version)
toolbar_ancestor = 0;
flushRequested = false;
touchEventsEnabled = false;
#endif // Q_WS_MAC
#endif // Q_DEAD_CODE_FROM_QT4_MAC
#ifdef QWIDGET_EXTRA_DEBUG
static int count = 0;
qDebug() << "widgets" << ++count;
@ -1063,7 +1063,7 @@ void QWidgetPrivate::adjustFlags(Qt::WindowFlags &flags, QWidget *w)
// Only enable this on non-Mac platforms. Since the old way of doing this would
// interpret WindowSystemMenuHint as a close button and we can't change that behavior
// we can't just add this in.
#ifndef Q_WS_MAC
#ifndef Q_DEAD_CODE_FROM_QT4_MAC
if ((flags & (Qt::WindowMinMaxButtonsHint | Qt::WindowCloseButtonHint | Qt::WindowContextHelpButtonHint))
# ifdef Q_OS_WIN
&& type != Qt::Dialog // QTBUG-2027, allow for menu-less dialogs.
@ -1126,7 +1126,7 @@ void QWidgetPrivate::init(QWidget *parentWidget, Qt::WindowFlags f)
}
#endif
#if defined(Q_WS_X11)
#if defined(Q_DEAD_CODE_FROM_QT4_X11)
if (desktopWidget) {
// make sure the widget is created on the same screen as the
// programmer specified desktop widget
@ -1160,7 +1160,7 @@ void QWidgetPrivate::init(QWidget *parentWidget, Qt::WindowFlags f)
mustHaveWindowHandle = 1;
q->setAttribute(Qt::WA_NativeWindow);
}
//#ifdef Q_WS_MAC
//#ifdef Q_DEAD_CODE_FROM_QT4_MAC
// q->setAttribute(Qt::WA_NativeWindow);
//#endif
@ -1185,9 +1185,9 @@ void QWidgetPrivate::init(QWidget *parentWidget, Qt::WindowFlags f)
setOpaque(q->isWindow() && background.style() != Qt::NoBrush && background.isOpaque());
}
data.fnt = QFont(data.fnt, q);
#if defined(Q_WS_X11)
#if defined(Q_DEAD_CODE_FROM_QT4_X11)
data.fnt.x11SetScreen(xinfo.screen());
#endif // Q_WS_X11
#endif // Q_DEAD_CODE_FROM_QT4_X11
q->setAttribute(Qt::WA_PendingMoveEvent);
q->setAttribute(Qt::WA_PendingResizeEvent);
@ -1204,7 +1204,7 @@ void QWidgetPrivate::init(QWidget *parentWidget, Qt::WindowFlags f)
extraPaintEngine = 0;
#ifdef Q_WS_MAC
#ifdef Q_DEAD_CODE_FROM_QT4_MAC
// If we add a child to the unified toolbar, we have to redirect the painting.
if (parentWidget && parentWidget->d_func() && parentWidget->d_func()->isInUnifiedToolbar) {
if (parentWidget->d_func()->unifiedSurface) {
@ -1212,7 +1212,7 @@ void QWidgetPrivate::init(QWidget *parentWidget, Qt::WindowFlags f)
parentWidget->d_func()->unifiedSurface->recursiveRedirect(toolbar, toolbar, toolbar->d_func()->toolbar_offset);
}
}
#endif // Q_WS_MAC
#endif // Q_DEAD_CODE_FROM_QT4_MAC
}
@ -1295,14 +1295,14 @@ void QWidget::create(WId window, bool initializeWindow, bool destroyOldWindow)
<< "Alien?" << !testAttribute(Qt::WA_NativeWindow);
#endif
#if defined (Q_WS_WIN) && !defined(QT_NO_DRAGANDDROP)
#if defined (Q_DEAD_CODE_FROM_QT4_WIN) && !defined(QT_NO_DRAGANDDROP)
// Unregister the dropsite (if already registered) before we
// re-create the widget with a native window.
if (testAttribute(Qt::WA_WState_Created) && !internalWinId() && testAttribute(Qt::WA_NativeWindow)
&& d->extra && d->extra->dropTarget) {
d->registerDropSite(false);
}
#endif // defined (Q_WS_WIN) && !defined(QT_NO_DRAGANDDROP)
#endif // defined (Q_DEAD_CODE_FROM_QT4_WIN) && !defined(QT_NO_DRAGANDDROP)
d->updateIsOpaque();
@ -1583,7 +1583,7 @@ QWidget::~QWidget()
}
}
#if defined(Q_WS_WIN) || defined(Q_WS_X11)|| defined(Q_WS_MAC)
#if defined(Q_DEAD_CODE_FROM_QT4_WIN) || defined(Q_DEAD_CODE_FROM_QT4_X11)|| defined(Q_DEAD_CODE_FROM_QT4_MAC)
else if (!internalWinId() && isVisible()) {
qApp->d_func()->sendSyntheticEnterLeave(this);
}
@ -1627,7 +1627,7 @@ QWidget::~QWidget()
d->blockSig = blocked;
#ifdef Q_WS_MAC
#ifdef Q_DEAD_CODE_FROM_QT4_MAC
// QCocoaView holds a pointer back to this widget. Clear it now
// to make sure it's not followed later on. The lifetime of the
// QCocoaView might exceed the lifetime of this widget in cases
@ -1678,7 +1678,7 @@ void QWidgetPrivate::setWinId(WId id) // set widget identifier
const WId oldWinId = data.winid;
data.winid = id;
#if defined(Q_WS_X11)
#if defined(Q_DEAD_CODE_FROM_QT4_X11)
hd = id; // X11: hd == ident
#endif
if (mapper && id && !userDesktopWidget) {
@ -1714,9 +1714,9 @@ void QWidgetPrivate::createTLExtra()
x->window = 0;
x->shareContext = 0;
x->screenIndex = 0;
#ifdef Q_WS_MAC
#ifdef Q_DEAD_CODE_FROM_QT4_MAC
x->wasMaximized = false;
#endif // Q_WS_MAC
#endif // Q_DEAD_CODE_FROM_QT4_MAC
#ifdef QWIDGET_EXTRA_DEBUG
static int count = 0;
qDebug() << "tlextra" << ++count;
@ -2114,10 +2114,10 @@ void QWidgetPrivate::subtractOpaqueSiblings(QRegion &sourceRegion, bool *hasDirt
if (disableSubtractOpaqueSiblings || q->isWindow())
return;
#ifdef Q_WS_MAC
#ifdef Q_DEAD_CODE_FROM_QT4_MAC
if (q->d_func()->isInUnifiedToolbar)
return;
#endif // Q_WS_MAC
#endif // Q_DEAD_CODE_FROM_QT4_MAC
QRect clipBoundingRect;
bool dirtyClipBoundingRect = true;
@ -2251,7 +2251,7 @@ void QWidgetPrivate::updateIsOpaque()
#endif //QT_NO_GRAPHICSEFFECT
Q_Q(QWidget);
#ifdef Q_WS_X11
#ifdef Q_DEAD_CODE_FROM_QT4_X11
if (q->testAttribute(Qt::WA_X11OpenGLOverlay)) {
setOpaque(false);
return;
@ -2310,7 +2310,7 @@ static inline void fillRegion(QPainter *painter, const QRegion &rgn, const QBrus
Q_ASSERT(painter);
if (brush.style() == Qt::TexturePattern) {
#ifdef Q_WS_MAC
#ifdef Q_DEAD_CODE_FROM_QT4_MAC
// Optimize pattern filling on mac by using HITheme directly
// when filling with the standard widget background.
// Defined in qmacstyle_mac.cpp
@ -2322,7 +2322,7 @@ static inline void fillRegion(QPainter *painter, const QRegion &rgn, const QBrus
painter->setClipRegion(rgn);
painter->drawTiledPixmap(rect, brush.texture(), rect.topLeft());
}
#endif // Q_WS_MAC
#endif // Q_DEAD_CODE_FROM_QT4_MAC
} else if (brush.gradient()
&& brush.gradient()->coordinateMode() == QGradient::ObjectBoundingMode) {
@ -2394,7 +2394,7 @@ void QWidgetPrivate::paintBackground(QPainter *painter, const QRegion &rgn, int
visible widgets.
*/
#ifdef Q_WS_MAC
#ifdef Q_DEAD_CODE_FROM_QT4_MAC
extern QPointer<QWidget> qt_button_down;
#else
extern QWidget *qt_button_down;
@ -2681,7 +2681,7 @@ void QWidget::setStyle(QStyle *style)
}
void QWidgetPrivate::setStyle_helper(QStyle *newStyle, bool propagate, bool
#ifdef Q_WS_MAC
#ifdef Q_DEAD_CODE_FROM_QT4_MAC
metalHack
#endif
)
@ -2692,7 +2692,7 @@ void QWidgetPrivate::setStyle_helper(QStyle *newStyle, bool propagate, bool
QPointer<QStyle> origStyle;
#endif
#ifdef Q_WS_MAC
#ifdef Q_DEAD_CODE_FROM_QT4_MAC
// the metalhack boolean allows Qt/Mac to do a proper re-polish depending
// on how the Qt::WA_MacBrushedMetal attribute is set. It is only ever
// set when changing that attribute and passes the widget's CURRENT style.
@ -2712,12 +2712,12 @@ void QWidgetPrivate::setStyle_helper(QStyle *newStyle, bool propagate, bool
if (q->windowType() != Qt::Desktop) {
if (polished) {
oldStyle->unpolish(q);
#ifdef Q_WS_MAC
#ifdef Q_DEAD_CODE_FROM_QT4_MAC
if (metalHack)
macUpdateMetalAttribute();
#endif
q->style()->polish(q);
#ifdef Q_WS_MAC
#ifdef Q_DEAD_CODE_FROM_QT4_MAC
} else if (metalHack) {
macUpdateMetalAttribute();
#endif
@ -3082,7 +3082,7 @@ bool QWidget::isFullScreen() const
*/
void QWidget::showFullScreen()
{
#ifdef Q_WS_MAC
#ifdef Q_DEAD_CODE_FROM_QT4_MAC
// If the unified toolbar is enabled, we have to disable it before going fullscreen.
QMainWindow *mainWindow = qobject_cast<QMainWindow*>(this);
if (mainWindow && mainWindow->unifiedTitleAndToolBarOnMac()) {
@ -3090,7 +3090,7 @@ void QWidget::showFullScreen()
QMainWindowLayout *mainLayout = qobject_cast<QMainWindowLayout*>(mainWindow->layout());
mainLayout->activateUnifiedToolbarAfterFullScreen = true;
}
#endif // Q_WS_MAC
#endif // Q_DEAD_CODE_FROM_QT4_MAC
ensurePolished();
setWindowState((windowState() & ~(Qt::WindowMinimized | Qt::WindowMaximized))
@ -3118,7 +3118,7 @@ void QWidget::showMaximized()
setWindowState((windowState() & ~(Qt::WindowMinimized | Qt::WindowFullScreen))
| Qt::WindowMaximized);
#ifdef Q_WS_MAC
#ifdef Q_DEAD_CODE_FROM_QT4_MAC
// If the unified toolbar was enabled before going fullscreen, we have to enable it back.
QMainWindow *mainWindow = qobject_cast<QMainWindow*>(this);
if (mainWindow)
@ -3129,7 +3129,7 @@ void QWidget::showMaximized()
mainLayout->activateUnifiedToolbarAfterFullScreen = false;
}
}
#endif // Q_WS_MAC
#endif // Q_DEAD_CODE_FROM_QT4_MAC
setVisible(true);
}
@ -3147,7 +3147,7 @@ void QWidget::showNormal()
setWindowState(windowState() & ~(Qt::WindowMinimized
| Qt::WindowMaximized
| Qt::WindowFullScreen));
#ifdef Q_WS_MAC
#ifdef Q_DEAD_CODE_FROM_QT4_MAC
// If the unified toolbar was enabled before going fullscreen, we have to enable it back.
QMainWindow *mainWindow = qobject_cast<QMainWindow*>(this);
if (mainWindow)
@ -3158,7 +3158,7 @@ void QWidget::showNormal()
mainLayout->activateUnifiedToolbarAfterFullScreen = false;
}
}
#endif // Q_WS_MAC
#endif // Q_DEAD_CODE_FROM_QT4_MAC
setVisible(true);
}
@ -3366,7 +3366,7 @@ void QWidgetPrivate::setEnabled_helper(bool enable)
if (w && !w->testAttribute(attribute))
w->d_func()->setEnabled_helper(enable);
}
#if defined(Q_WS_X11)
#if defined(Q_DEAD_CODE_FROM_QT4_X11)
if (q->testAttribute(Qt::WA_SetCursor) || q->isWindow()) {
// enforce the windows behavior of clearing the cursor on
// disabled widgets
@ -3380,7 +3380,7 @@ void QWidgetPrivate::setEnabled_helper(bool enable)
qt_qpa_set_cursor(q, false);
}
#endif
#if defined(Q_WS_MAC)
#if defined(Q_DEAD_CODE_FROM_QT4_MAC)
setEnabled_helper_sys(enable);
#endif
#ifndef QT_NO_IM
@ -4484,7 +4484,7 @@ const QPalette &QWidget::palette() const
) {
data->pal.setCurrentColorGroup(QPalette::Active);
} else {
#ifdef Q_WS_MAC
#ifdef Q_DEAD_CODE_FROM_QT4_MAC
extern bool qt_mac_can_clickThrough(const QWidget *); //qwidget_mac.cpp
if (qt_mac_can_clickThrough(this))
data->pal.setCurrentColorGroup(QPalette::Active);
@ -4728,7 +4728,7 @@ void QWidgetPrivate::updateFont(const QFont &font)
#endif
data.fnt = QFont(font, q);
#if defined(Q_WS_X11)
#if defined(Q_DEAD_CODE_FROM_QT4_X11)
// make sure the font set on this widget is associated with the correct screen
data.fnt.x11SetScreen(xinfo.screen());
#endif
@ -4901,7 +4901,7 @@ void QWidget::setCursor(const QCursor &cursor)
{
Q_D(QWidget);
// On Mac we must set the cursor even if it is the ArrowCursor.
#if !defined(Q_WS_MAC)
#if !defined(Q_DEAD_CODE_FROM_QT4_MAC)
if (cursor.shape() != Qt::ArrowCursor
|| (d->extra && d->extra->curs))
#endif
@ -5326,7 +5326,7 @@ void QWidgetPrivate::render_helper(QPainter *painter, const QPoint &targetOffset
Q_ASSERT(!toBePainted.isEmpty());
Q_Q(QWidget);
#ifndef Q_WS_MAC
#ifndef Q_DEAD_CODE_FROM_QT4_MAC
const QTransform originalTransform = painter->worldTransform();
const bool useDeviceCoordinates = originalTransform.isScaling();
if (!useDeviceCoordinates) {
@ -5350,7 +5350,7 @@ void QWidgetPrivate::render_helper(QPainter *painter, const QPoint &targetOffset
if (restore)
painter->setRenderHints(QPainter::SmoothPixmapTransform, false);
#ifndef Q_WS_MAC
#ifndef Q_DEAD_CODE_FROM_QT4_MAC
} else {
// Render via a pixmap in device coordinates (to avoid pixmap scaling).
QTransform transform = originalTransform;
@ -5459,7 +5459,7 @@ void QWidgetPrivate::drawWidget(QPaintDevice *pdev, const QRegion &rgn, const QP
if (paintEngine) {
setRedirected(pdev, -offset);
#ifdef Q_WS_MAC
#ifdef Q_DEAD_CODE_FROM_QT4_MAC
// (Alien support) Special case for Mac when redirecting: If the paint device
// is of the Widget type we need to set WA_WState_InPaintEvent since painting
// outside the paint event is not supported on QWidgets. The attributeis
@ -5541,7 +5541,7 @@ void QWidgetPrivate::drawWidget(QPaintDevice *pdev, const QRegion &rgn, const QP
//restore
if (paintEngine) {
#ifdef Q_WS_MAC
#ifdef Q_DEAD_CODE_FROM_QT4_MAC
if (pdev->devType() == QInternal::Widget)
static_cast<QWidget *>(pdev)->setAttribute(Qt::WA_WState_InPaintEvent, false);
#endif
@ -5615,7 +5615,7 @@ void QWidgetPrivate::render(QPaintDevice *target, const QPoint &targetOffset,
if (paintRegion.isEmpty())
return;
#ifndef Q_WS_MAC
#ifndef Q_DEAD_CODE_FROM_QT4_MAC
QPainter *oldSharedPainter = inRenderWithPainter ? sharedPainter() : 0;
// Use the target's shared painter if set (typically set when doing
@ -6234,7 +6234,7 @@ QString QWidget::windowRole() const
*/
void QWidget::setWindowRole(const QString &role)
{
#if defined(Q_WS_X11)
#if defined(Q_DEAD_CODE_FROM_QT4_X11)
Q_D(QWidget);
d->topData()->role = role;
d->setWindowRole();
@ -6376,7 +6376,7 @@ void QWidget::setFocus(Qt::FocusReason reason)
f = f->d_func()->extra->focus_proxy;
if (QApplication::focusWidget() == f
#if defined(Q_WS_WIN)
#if defined(Q_DEAD_CODE_FROM_QT4_WIN)
&& GetFocus() == f->internalWinId()
#endif
)
@ -6561,7 +6561,7 @@ void QWidget::clearFocus()
if (hasFocus()) {
// Update proxy state
QApplicationPrivate::setFocusWidget(0, Qt::OtherFocusReason);
#if defined(Q_WS_WIN)
#if defined(Q_DEAD_CODE_FROM_QT4_WIN)
if (!(windowType() == Qt::Popup) && GetFocus() == internalWinId())
SetFocus(0);
else
@ -7191,7 +7191,7 @@ void QWidgetPrivate::setGeometry_sys(int x, int y, int w, int h, bool isMove)
*/
QByteArray QWidget::saveGeometry() const
{
#ifdef Q_WS_MAC
#ifdef Q_DEAD_CODE_FROM_QT4_MAC
// We check if the window was maximized during this invocation. If so, we need to record the
// starting position as 0,0.
Q_D(const QWidget);
@ -7202,7 +7202,7 @@ QByteArray QWidget::saveGeometry() const
newFramePosition.moveTo(0, 0);
newNormalPosition.moveTo(0, 0);
}
#endif // Q_WS_MAC
#endif // Q_DEAD_CODE_FROM_QT4_MAC
QByteArray array;
QDataStream stream(&array, QIODevice::WriteOnly);
stream.setVersion(QDataStream::Qt_4_0);
@ -7216,13 +7216,13 @@ QByteArray QWidget::saveGeometry() const
stream << magicNumber
<< majorVersion
<< minorVersion
#ifdef Q_WS_MAC
#ifdef Q_DEAD_CODE_FROM_QT4_MAC
<< newFramePosition
<< newNormalPosition
#else
<< frameGeometry()
<< normalGeometry()
#endif // Q_WS_MAC
#endif // Q_DEAD_CODE_FROM_QT4_MAC
<< qint32(screenNumber)
<< quint8(windowState() & Qt::WindowMaximized)
<< quint8(windowState() & Qt::WindowFullScreen)
@ -7331,7 +7331,7 @@ bool QWidget::restoreGeometry(const QByteArray &geometry)
// - The title bar is outside the available geometry.
// - (Mac only) The window is higher than the available geometry. It must
// be possible to bring the size grip on screen by moving the window.
#ifdef Q_WS_MAC
#ifdef Q_DEAD_CODE_FROM_QT4_MAC
restoredFrameGeometry.setHeight(qMin(restoredFrameGeometry.height(), availableGeometry.height()));
restoredNormalGeometry.setHeight(qMin(restoredNormalGeometry.height(), availableGeometry.height() - frameHeight));
#endif
@ -7380,7 +7380,7 @@ bool QWidget::restoreGeometry(const QByteArray &geometry)
d_func()->topData()->normalGeometry = restoredNormalGeometry;
} else {
QPoint offset;
#ifdef Q_WS_X11
#ifdef Q_DEAD_CODE_FROM_QT4_X11
if (isFullScreen())
offset = d_func()->topData()->fullScreenOffset;
#endif
@ -7773,7 +7773,7 @@ void QWidgetPrivate::show_helper()
// On Windows, show the popup now so that our own focus handling
// stores the correct old focus widget even if it's stolen in the
// showevent
#if defined(Q_WS_WIN) || defined(Q_WS_MAC)
#if defined(Q_DEAD_CODE_FROM_QT4_WIN) || defined(Q_DEAD_CODE_FROM_QT4_MAC)
if (!isEmbedded && q->windowType() == Qt::Popup)
qApp->d_func()->openPopup(q);
#endif
@ -7896,7 +7896,7 @@ void QWidgetPrivate::hide_helper()
if (!isEmbedded && (q->windowType() == Qt::Popup))
qApp->d_func()->closePopup(q);
#if defined(Q_WS_WIN)
#if defined(Q_DEAD_CODE_FROM_QT4_WIN)
if (q->isWindow() && !(q->windowType() == Qt::Popup) && q->parentWidget()
&& !q->parentWidget()->isHidden() && q->isActiveWindow())
q->parentWidget()->activateWindow(); // Activate parent
@ -8091,7 +8091,7 @@ void QWidget::setVisible(bool visible)
} else { // hide
if (testAttribute(Qt::WA_WState_ExplicitShowHide) && testAttribute(Qt::WA_WState_Hidden))
return;
#if defined(Q_WS_WIN)
#if defined(Q_DEAD_CODE_FROM_QT4_WIN)
// reset WS_DISABLED style in a Blocked window
if(isWindow() && testAttribute(Qt::WA_WState_Created)
&& QApplicationPrivate::isBlockedByModal(this))
@ -8176,7 +8176,7 @@ void QWidgetPrivate::hideChildren(bool spontaneous)
QWidget *widget = qobject_cast<QWidget*>(childList.at(i));
if (!widget || widget->isWindow() || widget->testAttribute(Qt::WA_WState_Hidden))
continue;
#ifdef Q_WS_MAC
#ifdef Q_DEAD_CODE_FROM_QT4_MAC
// Before doing anything we need to make sure that we don't leave anything in a non-consistent state.
// When hiding a widget we need to make sure that no mouse_down events are active, because
// the mouse_up event will never be received by a hidden widget or one of its descendants.
@ -8192,7 +8192,7 @@ void QWidgetPrivate::hideChildren(bool spontaneous)
// supposed to trigger because it is not visible.
if(widget == qt_button_down)
qt_button_down = 0;
#endif // Q_WS_MAC
#endif // Q_DEAD_CODE_FROM_QT4_MAC
if (spontaneous)
widget->setAttribute(Qt::WA_Mapped, false);
else
@ -8427,7 +8427,7 @@ QSize QWidgetPrivate::adjustedSize() const
s.setWidth(qMax(s.width(), 200));
if (exp & Qt::Vertical)
s.setHeight(qMax(s.height(), 100));
#if defined(Q_WS_X11)
#if defined(Q_DEAD_CODE_FROM_QT4_X11)
QRect screen = QApplication::desktop()->screenGeometry(q->x11Info().screen());
#else // all others
QRect screen = QApplication::desktop()->screenGeometry(q->pos());
@ -8560,7 +8560,7 @@ bool QWidget::isAncestorOf(const QWidget *child) const
return false;
}
#if defined(Q_WS_WIN)
#if defined(Q_DEAD_CODE_FROM_QT4_WIN)
inline void setDisabledStyle(QWidget *w, bool setStyle)
{
// set/reset WS_DISABLED style.
@ -8982,7 +8982,7 @@ bool QWidget::event(QEvent *event)
}
}
}
#if defined(Q_WS_WIN)
#if defined(Q_DEAD_CODE_FROM_QT4_WIN)
setDisabledStyle(this, (event->type() == QEvent::WindowBlocked));
#endif
break;
@ -9009,7 +9009,7 @@ bool QWidget::event(QEvent *event)
case QEvent::EmbeddingControl:
d->topData()->frameStrut.setCoords(0 ,0, 0, 0);
data->fstrut_dirty = false;
#if defined(Q_WS_WIN) || defined(Q_WS_X11)
#if defined(Q_DEAD_CODE_FROM_QT4_WIN) || defined(Q_DEAD_CODE_FROM_QT4_X11)
d->topData()->embedded = 1;
#endif
break;
@ -9034,7 +9034,7 @@ bool QWidget::event(QEvent *event)
}
break;
}
#ifdef Q_WS_MAC
#ifdef Q_DEAD_CODE_FROM_QT4_MAC
case QEvent::MacGLWindowChange:
d->needWindowChange = false;
break;
@ -9145,7 +9145,7 @@ void QWidget::changeEvent(QEvent * event)
case QEvent::MacSizeChange:
updateGeometry();
break;
#elif defined Q_WS_MAC
#elif defined Q_DEAD_CODE_FROM_QT4_MAC
case QEvent::ToolTipChange:
case QEvent::MouseTrackingChange:
qt_mac_update_mouseTracking(this);
@ -10415,7 +10415,7 @@ void QWidget::setParent(QWidget *parent, Qt::WindowFlags f)
// (f & Qt::MSWindowsOwnDC) clause (which is set on QGLWidgets on all
// platforms).
if (newParent
#if defined(Q_WS_WIN) || defined(QT_OPENGL_ES)
#if defined(Q_DEAD_CODE_FROM_QT4_WIN) || defined(QT_OPENGL_ES)
|| (f & Qt::MSWindowsOwnDC)
#endif
) {
@ -10435,7 +10435,7 @@ void QWidget::setParent(QWidget *parent, Qt::WindowFlags f)
}
//### already hidden above ---> must probably do something smart on the mac
// #ifdef Q_WS_MAC
// #ifdef Q_DEAD_CODE_FROM_QT4_MAC
// extern bool qt_mac_is_macdrawer(const QWidget *); //qwidget_mac.cpp
// if(!qt_mac_is_macdrawer(q)) //special case
// q->setAttribute(Qt::WA_WState_Hidden);
@ -10967,7 +10967,7 @@ void QWidget::setAttribute(Qt::WidgetAttribute attribute, bool on)
d->receiveChildEvents = !on;
break;
case Qt::WA_MacBrushedMetal:
#ifdef Q_WS_MAC
#ifdef Q_DEAD_CODE_FROM_QT4_MAC
d->setStyle_helper(style(), false, true); // Make sure things get unpolished/polished correctly.
// fall through since changing the metal attribute affects the opaque size grip.
case Qt::WA_MacOpaqueSizeGrip:
@ -10984,7 +10984,7 @@ void QWidget::setAttribute(Qt::WidgetAttribute attribute, bool on)
break;
#endif
case Qt::WA_MacAlwaysShowToolWindow:
#ifdef Q_WS_MAC
#ifdef Q_DEAD_CODE_FROM_QT4_MAC
d->macUpdateHideOnSuspend();
#endif
break;
@ -11061,7 +11061,7 @@ void QWidget::setAttribute(Qt::WidgetAttribute attribute, bool on)
}
case Qt::WA_PaintOnScreen:
d->updateIsOpaque();
#if defined(Q_WS_WIN) || defined(Q_WS_X11) || defined(Q_WS_MAC)
#if defined(Q_DEAD_CODE_FROM_QT4_WIN) || defined(Q_DEAD_CODE_FROM_QT4_X11) || defined(Q_DEAD_CODE_FROM_QT4_MAC)
// Recreate the widget if it's already created as an alien widget and
// WA_PaintOnScreen is enabled. Paint on screen widgets must have win id.
// So must their children.
@ -11081,7 +11081,7 @@ void QWidget::setAttribute(Qt::WidgetAttribute attribute, bool on)
d->updateSystemBackground();
break;
case Qt::WA_TransparentForMouseEvents:
#ifdef Q_WS_MAC
#ifdef Q_DEAD_CODE_FROM_QT4_MAC
d->macUpdateIgnoreMouseEvents();
#endif
break;
@ -11100,7 +11100,7 @@ void QWidget::setAttribute(Qt::WidgetAttribute attribute, bool on)
d->resolveFont();
d->resolveLocale();
break;
#ifdef Q_WS_X11
#ifdef Q_DEAD_CODE_FROM_QT4_X11
case Qt::WA_NoX11EventCompression:
if (!d->extra)
d->createExtra();
@ -11125,7 +11125,7 @@ void QWidget::setAttribute(Qt::WidgetAttribute attribute, bool on)
break;
}
#ifdef Q_WS_X11
#ifdef Q_DEAD_CODE_FROM_QT4_X11
case Qt::WA_X11NetWmWindowTypeDesktop:
case Qt::WA_X11NetWmWindowTypeDock:
case Qt::WA_X11NetWmWindowTypeToolBar:
@ -11160,7 +11160,7 @@ void QWidget::setAttribute(Qt::WidgetAttribute attribute, bool on)
break;
case Qt::WA_AcceptTouchEvents:
#if defined(Q_WS_WIN) || defined(Q_WS_MAC)
#if defined(Q_DEAD_CODE_FROM_QT4_WIN) || defined(Q_DEAD_CODE_FROM_QT4_MAC)
if (on)
d->registerTouchWindow();
#endif
@ -11781,7 +11781,7 @@ QRect QWidgetPrivate::frameStrut() const
}
if (data.fstrut_dirty
#ifndef Q_WS_WIN
#ifndef Q_DEAD_CODE_FROM_QT4_WIN
// ### Fix properly for 4.3
&& q->isVisible()
#endif
@ -12689,7 +12689,7 @@ void QWidget::setMask(const QRegion &newMask)
d->extra->mask = newMask;
d->extra->hasMask = !newMask.isEmpty();
#ifndef Q_WS_MAC
#ifndef Q_DEAD_CODE_FROM_QT4_MAC
if (!testAttribute(Qt::WA_WState_Created))
return;
#endif

4
src/widgets/kernel/qwidget.h
View File

@ -555,12 +555,12 @@ public:
inline QWidget *childAt(int x, int y) const;
QWidget *childAt(const QPoint &p) const;
#if defined(Q_WS_X11)
#if defined(Q_DEAD_CODE_FROM_QT4_X11)
const QX11Info &x11Info() const;
Qt::HANDLE x11PictureHandle() const;
#endif
#if defined(Q_WS_MAC)
#if defined(Q_DEAD_CODE_FROM_QT4_MAC)
Qt::HANDLE macQDHandle() const;
Qt::HANDLE macCGHandle() const;
#endif

18
src/widgets/kernel/qwidget_p.h
View File

@ -177,7 +177,7 @@ struct QTLWExtra {
uint embedded : 1;
// *************************** Platform specific values (bit fields first) **********
#if defined(Q_WS_X11) // <----------------------------------------------------------- X11
#if defined(Q_DEAD_CODE_FROM_QT4_X11) // <----------------------------------------------------------- X11
uint spont_unmapped: 1; // window was spontaneously unmapped
uint dnd : 1; // DND properties installed
uint validWMState : 1; // is WM_STATE valid?
@ -191,11 +191,11 @@ struct QTLWExtra {
qint32 newCounterValueHi;
quint32 newCounterValueLo;
#endif
#elif defined(Q_WS_WIN) // <--------------------------------------------------------- WIN
#elif defined(Q_DEAD_CODE_FROM_QT4_WIN) // <--------------------------------------------------------- WIN
uint hotkeyRegistered: 1; // Hot key from the STARTUPINFO has been registered.
HICON winIconBig; // internal big Windows icon
HICON winIconSmall; // internal small Windows icon
#elif defined(Q_WS_MAC) // <--------------------------------------------------------- MAC
#elif defined(Q_DEAD_CODE_FROM_QT4_MAC) // <--------------------------------------------------------- MAC
uint resizer : 4;
uint isSetGeometry : 1;
uint isMove : 1;
@ -253,15 +253,15 @@ struct QWExtra {
uint hasWindowContainer : 1;
// *************************** Platform specific values (bit fields first) **********
#if defined(Q_WS_WIN) // <----------------------------------------------------------- WIN
#if defined(Q_DEAD_CODE_FROM_QT4_WIN) // <----------------------------------------------------------- WIN
#ifndef QT_NO_DRAGANDDROP
QOleDropTarget *dropTarget; // drop target
QList<QPointer<QWidget> > oleDropWidgets;
#endif
#elif defined(Q_WS_X11) // <--------------------------------------------------------- X11
#elif defined(Q_DEAD_CODE_FROM_QT4_X11) // <--------------------------------------------------------- X11
uint compress_events : 1;
WId xDndProxy; // XDND forwarding to embedded windows
#elif defined(Q_WS_MAC) // <------------------------------------------------------ MAC
#elif defined(Q_DEAD_CODE_FROM_QT4_MAC) // <------------------------------------------------------ MAC
// Cocoa Mask stuff
QImage maskBits;
CGImageRef imageMask;
@ -745,7 +745,7 @@ public:
#if defined(Q_OS_WIN)
uint noPaintOnScreen : 1; // see qwidget.cpp ::paintEngine()
#endif
#if defined(Q_WS_X11) // <----------------------------------------------------------- X11
#if defined(Q_DEAD_CODE_FROM_QT4_X11) // <----------------------------------------------------------- X11
Qt::HANDLE picture;
static QWidget *mouseGrabber;
static QWidget *keyboardGrabber;
@ -758,7 +758,7 @@ public:
void updateX11AcceptFocus();
QPoint mapToGlobal(const QPoint &pos) const;
QPoint mapFromGlobal(const QPoint &pos) const;
#elif defined(Q_WS_WIN) // <--------------------------------------------------------- WIN
#elif defined(Q_DEAD_CODE_FROM_QT4_WIN) // <--------------------------------------------------------- WIN
#ifndef QT_NO_GESTURES
uint nativeGesturePanEnabled : 1;
#endif
@ -774,7 +774,7 @@ public:
void winSetupGestures();
#elif defined(Q_OS_MAC) // <--------------------------------------------------------- MAC
void macUpdateSizeAttribute();
#elif defined(Q_WS_MAC) // <--------------------------------------------------------- MAC (old stuff)
#elif defined(Q_DEAD_CODE_FROM_QT4_MAC) // <--------------------------------------------------------- MAC (old stuff)
// This is new stuff
uint needWindowChange : 1;

4
src/widgets/kernel/qwidgetbackingstore.cpp
View File

@ -662,7 +662,7 @@ void QWidgetBackingStore::markDirtyOnScreen(const QRegion &region, QWidget *widg
if (!widget || widget->d_func()->paintOnScreen() || region.isEmpty())
return;
#if defined(Q_WS_MAC)
#if defined(Q_DEAD_CODE_FROM_QT4_MAC)
if (!widget->testAttribute(Qt::WA_WState_InPaintEvent))
dirtyOnScreen += region.translated(topLevelOffset);
return;
@ -1457,7 +1457,7 @@ void QWidgetPrivate::repaint_sys(const QRegion &rgn)
&& (usesDoubleBufferedGLContext || q->autoFillBackground());
QRegion toBePainted(noPartialUpdateSupport ? q->rect() : rgn);
#ifdef Q_WS_MAC
#ifdef Q_DEAD_CODE_FROM_QT4_MAC
// No difference between update() and repaint() on the Mac.
update_sys(toBePainted);
return;

2
src/widgets/styles/qmacstyle_mac_p.h
View File

@ -127,7 +127,7 @@ private:
friend bool qt_mac_buttonIsRenderedFlat(const QPushButton *pushButton, const QStyleOptionButton *option);
};
#endif // Q_WS_MAC
#endif // Q_DEAD_CODE_FROM_QT4_MAC
QT_END_NAMESPACE

4
src/widgets/styles/qstylefactory.cpp
View File

@ -151,7 +151,7 @@ QStyle *QStyleFactory::create(const QString& key)
#ifndef QT_NO_STYLE_MAC
if (style.startsWith(QLatin1String("macintosh"))) {
ret = new QMacStyle;
# ifdef Q_WS_MAC
# ifdef Q_DEAD_CODE_FROM_QT4_MAC
if (style == QLatin1String("macintosh"))
style += QLatin1String(" (aqua)");
# endif
@ -220,7 +220,7 @@ QStringList QStyleFactory::keys()
#endif
#ifndef QT_NO_STYLE_MAC
QString mstyle = QLatin1String("Macintosh");
# ifdef Q_WS_MAC
# ifdef Q_DEAD_CODE_FROM_QT4_MAC
mstyle += QLatin1String(" (aqua)");
# endif
if (!list.contains(mstyle))

2
src/widgets/styles/qstyleoption.cpp
View File

@ -193,7 +193,7 @@ void QStyleOption::init(const QWidget *widget)
state |= QStyle::State_Active;
if (widget->isWindow())
state |= QStyle::State_Window;
#ifdef Q_WS_MAC
#ifdef Q_DEAD_CODE_FROM_QT4_MAC
extern bool qt_mac_can_clickThrough(const QWidget *w); //qwidget_mac.cpp
if (!(state & QStyle::State_Active) && !qt_mac_can_clickThrough(widget))
state &= ~QStyle::State_Enabled;

2
src/widgets/styles/qstylesheetstyle.cpp
View File

@ -4956,7 +4956,7 @@ QSize QStyleSheetStyle::sizeFromContents(ContentsType ct, const QStyleOption *op
sz = csz + QSize(vertical ? 0 : spaceForIcon, vertical ? spaceForIcon : 0);
return subRule.boxSize(subRule.adjustSize(sz));
}
#ifdef Q_WS_MAC
#ifdef Q_DEAD_CODE_FROM_QT4_MAC
if (baseStyle()->inherits("QMacStyle")) {
//adjust the size after the call to the style because the mac style ignore the size arguments anyway.
//this might cause the (max-){width,height} property to include the native style border while they should not.

6
src/widgets/styles/qwindowscestyle.cpp
View File

@ -2222,7 +2222,7 @@ int QWindowsCEStyle::pixelMetric(PixelMetric pm, const QStyleOption *opt, const
case PM_DockWidgetTitleMargin:
ret = 2;
break;
#if defined(Q_WS_WIN)
#if defined(Q_DEAD_CODE_FROM_QT4_WIN)
// case PM_DockWidgetFrameWidth:
// ret = GetSystemMetrics(SM_CXFRAME);
// break;
@ -2230,7 +2230,7 @@ int QWindowsCEStyle::pixelMetric(PixelMetric pm, const QStyleOption *opt, const
case PM_DockWidgetFrameWidth:
ret = 4;
break;
#endif // Q_WS_WIN
#endif // Q_DEAD_CODE_FROM_QT4_WIN
break;
#endif // QT_NO_MENU
@ -2245,7 +2245,7 @@ int QWindowsCEStyle::pixelMetric(PixelMetric pm, const QStyleOption *opt, const
ret = qMax(4, QApplication::globalStrut().width());
break;
#if defined(Q_WS_WIN)
#if defined(Q_DEAD_CODE_FROM_QT4_WIN)
case PM_MDIFrameWidth:
ret = 3;
break;

6
src/widgets/styles/qwindowsmobilestyle.cpp
View File

@ -7044,12 +7044,12 @@ int QWindowsMobileStyle::pixelMetric(PixelMetric pm, const QStyleOption *opt, co
case PM_DockWidgetTitleMargin:
ret = 2;
break;
#if defined(Q_WS_WIN)
#if defined(Q_DEAD_CODE_FROM_QT4_WIN)
#else
case PM_DockWidgetFrameWidth:
ret = 4;
break;
#endif // Q_WS_WIN
#endif // Q_DEAD_CODE_FROM_QT4_WIN
break;
#endif // QT_NO_MENU
@ -7101,7 +7101,7 @@ int QWindowsMobileStyle::pixelMetric(PixelMetric pm, const QStyleOption *opt, co
ret = qMax(4, QApplication::globalStrut().width());
break;
#if defined(Q_WS_WIN)
#if defined(Q_DEAD_CODE_FROM_QT4_WIN)
case PM_MDIFrameWidth:
ret = 1;
break;

2
src/widgets/util/qflickgesture.cpp
View File

@ -455,7 +455,7 @@ QGestureRecognizer::Result QFlickGestureRecognizer::recognize(QGesture *state,
}
break;
#if defined(Q_WS_MAC)
#if defined(Q_DEAD_CODE_FROM_QT4_MAC)
// the only way to distinguish between real mouse wheels and wheel
// events generated by the native 2 finger swipe gesture is to listen
// for these events (according to Apple's Cocoa Event-Handling Guide)

6
src/widgets/util/qscroller.cpp
View File

@ -1002,12 +1002,12 @@ bool QScroller::handleInput(Input input, const QPointF &position, qint64 timesta
return false;
}
#if !defined(Q_WS_MAC)
#if !defined(Q_DEAD_CODE_FROM_QT4_MAC)
// the Mac version is implemented in qscroller_mac.mm
QPointF QScrollerPrivate::realDpi(int screen)
{
# if defined(Q_WS_X11) && !defined(QT_NO_XRANDR)
# if defined(Q_DEAD_CODE_FROM_QT4_X11) && !defined(QT_NO_XRANDR)
if (X11 && X11->use_xrandr && X11->ptrXRRSizes && X11->ptrXRRRootToScreen) {
int nsizes = 0;
// QDesktopWidget is based on Xinerama screens, which do not always
@ -1033,7 +1033,7 @@ QPointF QScrollerPrivate::realDpi(int screen)
return QPointF(w->physicalDpiX(), w->physicalDpiY());
}
#endif // !Q_WS_MAC
#endif // !Q_DEAD_CODE_FROM_QT4_MAC
/*! \internal

2
src/widgets/util/qscroller_mac.mm
View File

@ -41,7 +41,7 @@
#include <QtCore/qglobal.h>
#ifdef Q_WS_MAC
#ifdef Q_DEAD_CODE_FROM_QT4_MAC
#import <Cocoa/Cocoa.h>

4
src/widgets/util/qscrollerproperties.cpp
View File

@ -34,7 +34,7 @@
#include <QPointer>
#include <QObject>
#include <QtCore/qmath.h>
#ifdef Q_WS_WIN
#ifdef Q_DEAD_CODE_FROM_QT4_WIN
# include <QLibrary>
#endif
@ -67,7 +67,7 @@ QScrollerPropertiesPrivate *QScrollerPropertiesPrivate::defaults()
spp.overshootDragDistanceFactor = qreal(1);
spp.overshootScrollDistanceFactor = qreal(0.5);
spp.overshootScrollTime = qreal(0.7);
# ifdef Q_WS_WIN
# ifdef Q_DEAD_CODE_FROM_QT4_WIN
if (QLibrary::resolve(QLatin1String("UxTheme"), "BeginPanningFeedback"))
spp.overshootScrollTime = qreal(0.35);
# endif

4
src/widgets/util/qsystemtrayicon.cpp
View File

@ -283,7 +283,7 @@ bool QSystemTrayIcon::isVisible() const
*/
bool QSystemTrayIcon::event(QEvent *e)
{
#if defined(Q_WS_X11)
#if defined(Q_DEAD_CODE_FROM_QT4_X11)
if (e->type() == QEvent::ToolTip) {
Q_D(QSystemTrayIcon);
return d->sys->deliverToolTipEvent(e);
@ -586,7 +586,7 @@ void QBalloonTip::balloon(const QPoint& pos, int msecs, bool showArrow)
}
QPainterPath path;
#if defined(QT_NO_XSHAPE) && defined(Q_WS_X11)
#if defined(QT_NO_XSHAPE) && defined(Q_DEAD_CODE_FROM_QT4_X11)
// XShape is required for setting the mask, so we just
// draw an ugly square when its not available
path.moveTo(0, 0);

30
src/widgets/widgets/qabstractscrollarea.cpp
View File

@ -54,7 +54,7 @@
#include <private/qapplication_p.h>
#ifdef Q_WS_MAC
#ifdef Q_DEAD_CODE_FROM_QT4_MAC
#include <private/qt_mac_p.h>
#include <private/qt_cocoa_helpers_mac_p.h>
#endif
@ -162,7 +162,7 @@ QAbstractScrollAreaPrivate::QAbstractScrollAreaPrivate()
shownOnce(false), inResize(false), sizeAdjustPolicy(QAbstractScrollArea::AdjustIgnored),
viewport(0), cornerWidget(0), left(0), top(0), right(0), bottom(0),
xoffset(0), yoffset(0), viewportFilter(0)
#ifdef Q_WS_WIN
#ifdef Q_DEAD_CODE_FROM_QT4_WIN
, singleFingerPanEnabled(false)
#endif
{
@ -308,7 +308,7 @@ void QAbstractScrollAreaPrivate::init()
#endif
}
#ifdef Q_WS_WIN
#ifdef Q_DEAD_CODE_FROM_QT4_WIN
void QAbstractScrollAreaPrivate::setSingleFingerPanEnabled(bool on)
{
singleFingerPanEnabled = on;
@ -316,7 +316,7 @@ void QAbstractScrollAreaPrivate::setSingleFingerPanEnabled(bool on)
if (dd)
dd->winSetupGestures();
}
#endif // Q_WS_WIN
#endif // Q_DEAD_CODE_FROM_QT4_WIN
void QAbstractScrollAreaPrivate::layoutChildren()
{
@ -337,7 +337,7 @@ void QAbstractScrollAreaPrivate::layoutChildren()
const int hscrollOverlap = hbar->style()->pixelMetric(QStyle::PM_ScrollView_ScrollBarOverlap, &opt, hbar);
const int vscrollOverlap = vbar->style()->pixelMetric(QStyle::PM_ScrollView_ScrollBarOverlap, &opt, vbar);
#ifdef Q_WS_MAC
#ifdef Q_DEAD_CODE_FROM_QT4_MAC
QWidget * const window = q->window();
// Use small scroll bars for tool windows, to match the native size grip.
@ -380,7 +380,7 @@ void QAbstractScrollAreaPrivate::layoutChildren()
// If the scroll bars are at the very right and bottom of the window we
// move their positions to be aligned with the size grip.
#ifdef Q_WS_MAC
#ifdef Q_DEAD_CODE_FROM_QT4_MAC
// Check if a native sizegrip is present.
bool hasMacReverseSizeGrip = false;
bool hasMacSizeGrip = false;
@ -433,7 +433,7 @@ void QAbstractScrollAreaPrivate::layoutChildren()
if (hasCornerWidget && ((needv && vscrollOverlap == 0) || (needh && hscrollOverlap == 0)))
cornerOffset = extPoint;
#ifdef Q_WS_MAC
#ifdef Q_DEAD_CODE_FROM_QT4_MAC
// Also move the scroll bars if they are covered by the native Mac size grip.
if (hasMacSizeGrip)
cornerOffset = extPoint;
@ -448,7 +448,7 @@ void QAbstractScrollAreaPrivate::layoutChildren()
// (transparent) sizegrip in the area where a corner widget would be.
if ((needv && needh && hasCornerWidget == false && hscrollOverlap == 0 && vscrollOverlap == 0)
|| ((needv || needh)
#ifdef Q_WS_MAC
#ifdef Q_DEAD_CODE_FROM_QT4_MAC
&& hasMacSizeGrip
#endif
)
@ -458,7 +458,7 @@ void QAbstractScrollAreaPrivate::layoutChildren()
cornerPaintingRect = QRect();
}
#ifdef Q_WS_MAC
#ifdef Q_DEAD_CODE_FROM_QT4_MAC
if (hasMacReverseSizeGrip)
reverseCornerPaintingRect = QRect(controlsRect.bottomRight() + QPoint(1, 1) - extPoint, extSize);
else
@ -483,7 +483,7 @@ void QAbstractScrollAreaPrivate::layoutChildren()
if (needh) {
QRect horizontalScrollBarRect(QPoint(controlsRect.left() + vHeaderRight, cornerPoint.y()), QPoint(cornerPoint.x() - 1, controlsRect.bottom()));
#ifdef Q_WS_MAC
#ifdef Q_DEAD_CODE_FROM_QT4_MAC
if (hasMacReverseSizeGrip)
horizontalScrollBarRect.adjust(vsbExt, 0, 0, 0);
#endif
@ -603,7 +603,7 @@ void QAbstractScrollArea::setViewport(QWidget *widget)
d->viewport->setParent(this);
d->viewport->setFocusProxy(this);
d->viewport->installEventFilter(d->viewportFilter.data());
#ifndef Q_WS_MAC
#ifndef Q_DEAD_CODE_FROM_QT4_MAC
#ifndef QT_NO_GESTURES
d->viewport->grabGesture(Qt::PanGesture);
#endif
@ -1030,7 +1030,7 @@ bool QAbstractScrollArea::event(QEvent *e)
QPainter p(this);
style()->drawPrimitive(QStyle::PE_PanelScrollAreaCorner, &option, &p, this);
}
#ifdef Q_WS_MAC
#ifdef Q_DEAD_CODE_FROM_QT4_MAC
if (d->reverseCornerPaintingRect.isValid()) {
option.rect = d->reverseCornerPaintingRect;
QPainter p(this);
@ -1109,7 +1109,7 @@ bool QAbstractScrollArea::event(QEvent *e)
hBar->setValue(se->contentPos().x());
vBar->setValue(se->contentPos().y());
#ifdef Q_WS_WIN
#ifdef Q_DEAD_CODE_FROM_QT4_WIN
typedef BOOL (*PtrBeginPanningFeedback)(HWND);
typedef BOOL (*PtrUpdatePanningFeedback)(HWND, LONG, LONG, BOOL);
typedef BOOL (*PtrEndPanningFeedback)(HWND, BOOL);
@ -1533,13 +1533,13 @@ void QAbstractScrollAreaPrivate::_q_vslide(int y)
void QAbstractScrollAreaPrivate::_q_showOrHideScrollBars()
{
layoutChildren();
#ifdef Q_WS_WIN
#ifdef Q_DEAD_CODE_FROM_QT4_WIN
// Need to re-subscribe to gestures as the content changes to make sure we
// enable/disable panning when needed.
QWidgetPrivate *dd = static_cast<QWidgetPrivate *>(QObjectPrivate::get(viewport));
if (dd)
dd->winSetupGestures();
#endif // Q_WS_WIN
#endif // Q_DEAD_CODE_FROM_QT4_WIN
}
QPoint QAbstractScrollAreaPrivate::contentsOffset() const

4
src/widgets/widgets/qabstractscrollarea_p.h
View File

@ -75,7 +75,7 @@ public:
QWidget *viewport;
QWidget *cornerWidget;
QRect cornerPaintingRect;
#ifdef Q_WS_MAC
#ifdef Q_DEAD_CODE_FROM_QT4_MAC
QRect reverseCornerPaintingRect;
#endif
int left, top, right, bottom; // viewport margin
@ -102,7 +102,7 @@ public:
{ return q_func()->viewportEvent(event); }
QScopedPointer<QObject> viewportFilter;
#ifdef Q_WS_WIN
#ifdef Q_DEAD_CODE_FROM_QT4_WIN
bool singleFingerPanEnabled;
void setSingleFingerPanEnabled(bool on = true);
#endif

2
src/widgets/widgets/qabstractslider.cpp
View File

@ -710,7 +710,7 @@ bool QAbstractSliderPrivate::scrollByDelta(Qt::Orientation orientation, Qt::Keyb
offset_accumulated = 0;
offset_accumulated += stepsToScrollF;
#ifndef Q_WS_MAC
#ifndef Q_DEAD_CODE_FROM_QT4_MAC
// Don't scroll more than one page in any case:
stepsToScroll = qBound(-pageStep, int(offset_accumulated), pageStep);
#else

2
src/widgets/widgets/qcalendarwidget.cpp
View File

@ -1558,7 +1558,7 @@ protected:
{
Q_UNUSED(e)
#ifndef Q_WS_MAC
#ifndef Q_DEAD_CODE_FROM_QT4_MAC
QStyleOptionToolButton opt;
initStyleOption(&opt);

4
src/widgets/widgets/qcombobox.cpp
View File

@ -59,7 +59,7 @@
#include <private/qabstractitemmodel_p.h>
#include <private/qabstractscrollarea_p.h>
#include <qdebug.h>
#if defined(Q_WS_MAC) && !defined(QT_NO_EFFECTS) && !defined(QT_NO_STYLE_MAC)
#if defined(Q_DEAD_CODE_FROM_QT4_MAC) && !defined(QT_NO_EFFECTS) && !defined(QT_NO_STYLE_MAC)
#include <private/qcore_mac_p.h>
#include <private/qmacstyle_mac_p.h>
#include <private/qt_cocoa_helpers_mac_p.h>
@ -397,7 +397,7 @@ void QComboBoxPrivateContainer::leaveEvent(QEvent *)
{
// On Mac using the Mac style we want to clear the selection
// when the mouse moves outside the popup.
#ifdef Q_WS_MAC
#ifdef Q_DEAD_CODE_FROM_QT4_MAC
QStyleOptionComboBox opt = comboStyleOption();
if (combo->style()->styleHint(QStyle::SH_ComboBox_Popup, &opt, combo))
view->clearSelection();

2
src/widgets/widgets/qdatetimeedit.cpp
View File

@ -1125,7 +1125,7 @@ void QDateTimeEdit::keyPressEvent(QKeyEvent *event)
select = false;
break;
}
#ifdef Q_WS_MAC
#ifdef Q_DEAD_CODE_FROM_QT4_MAC
else
#ifdef QT_KEYPAD_NAVIGATION
if (!QApplication::keypadNavigationEnabled())

2
src/widgets/widgets/qdialogbuttonbox.cpp
View File

@ -411,7 +411,7 @@ QPushButton *QDialogButtonBoxPrivate::createButton(QDialogButtonBox::StandardBut
qWarning("QDialogButtonBox::createButton: Invalid ButtonRole, button not added");
}
#ifdef Q_WS_MAC
#ifdef Q_DEAD_CODE_FROM_QT4_MAC
// Since mnemonics is off by default on Mac, we add a Cmd-D
// shortcut here to e.g. make the "Don't Save" button work nativly:
if (sbutton == QDialogButtonBox::Discard)

10
src/widgets/widgets/qdockarealayout.cpp
View File

@ -1934,7 +1934,7 @@ bool QDockAreaLayoutInfo::restoreState(QDataStream &stream, QList<QDockWidget*>
QDockAreaLayoutItem item(new QDockWidgetItem(widget));
if (flags & StateFlagFloating) {
bool drawer = false;
#ifdef Q_WS_MAC // drawer support
#ifdef Q_DEAD_CODE_FROM_QT4_MAC // drawer support
extern bool qt_mac_is_macdrawer(const QWidget *); //qwidget_mac.cpp
extern bool qt_mac_set_drawer_preferred_edge(QWidget *, Qt::DockWidgetArea); //qwidget_mac.cpp
drawer = qt_mac_is_macdrawer(widget);
@ -1949,7 +1949,7 @@ bool QDockAreaLayoutInfo::restoreState(QDataStream &stream, QList<QDockWidget*>
int x, y, w, h;
stream >> x >> y >> w >> h;
#ifdef Q_WS_MAC // drawer support
#ifdef Q_DEAD_CODE_FROM_QT4_MAC // drawer support
if (drawer) {
mainWindow->window()->createWinId();
widget->window()->createWinId();
@ -2057,7 +2057,7 @@ void QDockAreaLayoutInfo::updateSeparatorWidgets() const
}
j++;
#ifndef Q_WS_MAC
#ifndef Q_DEAD_CODE_FROM_QT4_MAC
sepWidget->raise();
#endif
QRect sepRect = separatorRect(i).adjusted(-2, -2, 2, 2);
@ -2979,7 +2979,7 @@ bool QDockAreaLayout::restoreDockWidget(QDockWidget *dockWidget)
dockWidget->d_func()->setWindowState(true, true, r);
}
dockWidget->setVisible(!placeHolder->hidden);
#ifdef Q_WS_X11
#ifdef Q_DEAD_CODE_FROM_QT4_X11
if (placeHolder->window) // gets rid of the X11BypassWindowManager window flag
dockWidget->d_func()->setWindowState(true);
#endif
@ -3169,7 +3169,7 @@ void QDockAreaLayout::updateSeparatorWidgets() const
}
j++;
#ifndef Q_WS_MAC
#ifndef Q_DEAD_CODE_FROM_QT4_MAC
sepWidget->raise();
#endif
QRect sepRect = separatorRect(i).adjusted(-2, -2, 2, 2);

8
src/widgets/widgets/qdockwidget.cpp
View File

@ -52,7 +52,7 @@
#include "qdockwidget_p.h"
#include "qmainwindowlayout_p.h"
#ifdef Q_WS_MAC
#ifdef Q_DEAD_CODE_FROM_QT4_MAC
#include <private/qapplication_p.h>
#include <private/qt_mac_p.h>
#include <private/qmacstyle_mac_p.h>
@ -860,7 +860,7 @@ bool QDockWidgetPrivate::mouseMoveEvent(QMouseEvent *event)
&& (event->pos() - state->pressPos).manhattanLength()
> QApplication::startDragDistance()) {
startDrag();
#ifdef Q_WS_WIN
#ifdef Q_DEAD_CODE_FROM_QT4_WIN
grabMouseWhileInWindow();
#else
q->grabMouse();
@ -904,7 +904,7 @@ void QDockWidgetPrivate::nonClientAreaMouseEvent(QMouseEvent *event)
QRect geo = q->geometry();
QRect titleRect = q->frameGeometry();
#ifdef Q_WS_MAC
#ifdef Q_DEAD_CODE_FROM_QT4_MAC
if ((features & QDockWidget::DockWidgetVerticalTitleBar)) {
titleRect.setTop(geo.top());
titleRect.setBottom(geo.bottom());
@ -1437,7 +1437,7 @@ bool QDockWidget::event(QEvent *event)
if (d->mouseMoveEvent(static_cast<QMouseEvent *>(event)))
return true;
break;
#ifdef Q_WS_WIN
#ifdef Q_DEAD_CODE_FROM_QT4_WIN
case QEvent::Leave:
if (d->state != 0 && d->state->dragging && !d->state->nca) {
// This is a workaround for loosing the mouse on Vista.

8
src/widgets/widgets/qlineedit.cpp
View File

@ -81,7 +81,7 @@
QT_BEGIN_NAMESPACE
#ifdef Q_WS_MAC
#ifdef Q_DEAD_CODE_FROM_QT4_MAC
extern void qt_mac_secure_keyboard(bool); //qapplication_mac.cpp
#endif
@ -575,7 +575,7 @@ void QLineEdit::setEchoMode(EchoMode mode)
setInputMethodHints(imHints);
d->control->setEchoMode(mode);
update();
#ifdef Q_WS_MAC
#ifdef Q_DEAD_CODE_FROM_QT4_MAC
if (hasFocus())
qt_mac_secure_keyboard(mode == Password || mode == NoEcho);
#endif
@ -1800,7 +1800,7 @@ void QLineEdit::focusInEvent(QFocusEvent *e)
if((!hasSelectedText() && d->control->preeditAreaText().isEmpty())
|| style()->styleHint(QStyle::SH_BlinkCursorWhenTextSelected, &opt, this))
d->setCursorVisible(true);
#ifdef Q_WS_MAC
#ifdef Q_DEAD_CODE_FROM_QT4_MAC
if (d->control->echoMode() == Password || d->control->echoMode() == NoEcho)
qt_mac_secure_keyboard(true);
#endif
@ -1848,7 +1848,7 @@ void QLineEdit::focusOutEvent(QFocusEvent *e)
if (hasAcceptableInput() || d->control->fixup())
emit editingFinished();
}
#ifdef Q_WS_MAC
#ifdef Q_DEAD_CODE_FROM_QT4_MAC
if (d->control->echoMode() == Password || d->control->echoMode() == NoEcho)
qt_mac_secure_keyboard(false);
#endif

16
src/widgets/widgets/qmainwindow.cpp
View File

@ -55,7 +55,7 @@
#ifdef Q_OS_OSX
#include <qpa/qplatformnativeinterface.h>
#endif
#ifdef Q_WS_MAC
#ifdef Q_DEAD_CODE_FROM_QT4_MAC
#include <private/qt_mac_p.h>
#include <private/qt_cocoa_helpers_mac_p.h>
QT_BEGIN_NAMESPACE
@ -74,7 +74,7 @@ public:
#ifdef Q_OS_OSX
, useUnifiedToolBar(false)
#endif
#ifdef Q_WS_MAC
#ifdef Q_DEAD_CODE_FROM_QT4_MAC
, useHIToolBar(false)
, activateUnifiedToolbarAfterFullScreen(false)
#endif
@ -89,7 +89,7 @@ public:
#ifdef Q_OS_OSX
bool useUnifiedToolBar;
#endif
#ifdef Q_WS_MAC
#ifdef Q_DEAD_CODE_FROM_QT4_MAC
bool useHIToolBar;
bool activateUnifiedToolbarAfterFullScreen;
#endif
@ -1079,7 +1079,7 @@ void QMainWindow::addDockWidget(Qt::DockWidgetArea area, QDockWidget *dockwidget
d_func()->layout->removeWidget(dockwidget); // in case it was already in here
addDockWidget(area, dockwidget, orientation);
#ifdef Q_WS_MAC //drawer support
#ifdef Q_DEAD_CODE_FROM_QT4_MAC //drawer support
QMacCocoaAutoReleasePool pool;
extern bool qt_mac_is_macdrawer(const QWidget *); //qwidget_mac.cpp
if (qt_mac_is_macdrawer(dockwidget)) {
@ -1454,7 +1454,7 @@ bool QMainWindow::event(QEvent *event)
if (!d->explicitIconSize)
setIconSize(QSize());
break;
#ifdef Q_WS_MAC
#ifdef Q_DEAD_CODE_FROM_QT4_MAC
case QEvent::Show:
if (unifiedTitleAndToolBarOnMac())
d->layout->syncUnifiedToolbarVisibility();
@ -1473,7 +1473,7 @@ bool QMainWindow::event(QEvent *event)
}
}
break;
#endif // Q_WS_MAC
#endif // Q_DEAD_CODE_FROM_QT4_MAC
#if !defined(QT_NO_DOCKWIDGET) && !defined(QT_NO_CURSOR)
case QEvent::CursorChange:
// CursorChange events are triggered as mouse moves to new widgets even
@ -1529,7 +1529,7 @@ void QMainWindow::setUnifiedTitleAndToolBarOnMac(bool set)
}
#endif
#ifdef Q_WS_MAC
#ifdef Q_DEAD_CODE_FROM_QT4_MAC
Q_D(QMainWindow);
if (!isWindow() || d->useHIToolBar == set || QSysInfo::MacintoshVersion < QSysInfo::MV_10_3)
return;
@ -1564,7 +1564,7 @@ bool QMainWindow::unifiedTitleAndToolBarOnMac() const
#ifdef Q_OS_OSX
return d_func()->useUnifiedToolBar;
#endif
#ifdef Q_WS_MAC
#ifdef Q_DEAD_CODE_FROM_QT4_MAC
return d_func()->useHIToolBar && !testAttribute(Qt::WA_MacBrushedMetal) && !(windowFlags() & Qt::FramelessWindowHint);
#endif
return false;

24
src/widgets/widgets/qmainwindowlayout.cpp
View File

@ -61,7 +61,7 @@
#include <private/qapplication_p.h>
#include <private/qlayoutengine_p.h>
#ifdef Q_WS_MAC
#ifdef Q_DEAD_CODE_FROM_QT4_MAC
# include <private/qcore_mac_p.h>
# include <private/qt_cocoa_helpers_mac_p.h>
#endif
@ -830,11 +830,11 @@ void QMainWindowLayout::removeToolBar(QToolBar *toolbar)
QObject::disconnect(parentWidget(), SIGNAL(toolButtonStyleChanged(Qt::ToolButtonStyle)),
toolbar, SLOT(_q_updateToolButtonStyle(Qt::ToolButtonStyle)));
#ifdef Q_WS_MAC
#ifdef Q_DEAD_CODE_FROM_QT4_MAC
if (usesHIToolBar(toolbar)) {
removeFromMacToolbar(toolbar);
} else
#endif // Q_WS_MAC
#endif // Q_DEAD_CODE_FROM_QT4_MAC
{
removeWidget(toolbar);
}
@ -849,7 +849,7 @@ void QMainWindowLayout::addToolBar(Qt::ToolBarArea area,
bool)
{
validateToolBarArea(area);
#ifdef Q_WS_MAC
#ifdef Q_DEAD_CODE_FROM_QT4_MAC
if ((area == Qt::TopToolBarArea)
&& layoutState.mainWindow->unifiedTitleAndToolBarOnMac()) {
insertIntoMacToolbar(0, toolbar);
@ -875,11 +875,11 @@ void QMainWindowLayout::addToolBar(Qt::ToolBarArea area,
*/
void QMainWindowLayout::insertToolBar(QToolBar *before, QToolBar *toolbar)
{
#ifdef Q_WS_MAC
#ifdef Q_DEAD_CODE_FROM_QT4_MAC
if (usesHIToolBar(before)) {
insertIntoMacToolbar(before, toolbar);
} else
#endif // Q_WS_MAC
#endif // Q_DEAD_CODE_FROM_QT4_MAC
{
addChildWidget(toolbar);
QLayoutItem * item = layoutState.toolBarAreaLayout.insertToolBar(before, toolbar);
@ -908,7 +908,7 @@ Qt::ToolBarArea QMainWindowLayout::toolBarArea(QToolBar *toolbar) const
case QInternal::BottomDock: return Qt::BottomToolBarArea;
default: break;
}
#ifdef Q_WS_MAC
#ifdef Q_DEAD_CODE_FROM_QT4_MAC
if (pos == QInternal::DockCount) {
if (qtoolbarsInUnifiedToolbarList.contains(toolbar))
return Qt::TopToolBarArea;
@ -931,7 +931,7 @@ void QMainWindowLayout::getStyleOptionInfo(QStyleOptionToolBar *option, QToolBar
void QMainWindowLayout::toggleToolBarsVisible()
{
bool updateNonUnifiedParts = true;
#ifdef Q_WS_MAC
#ifdef Q_DEAD_CODE_FROM_QT4_MAC
if (layoutState.mainWindow->unifiedTitleAndToolBarOnMac()) {
// If we hit this case, someone has pressed the "toolbar button" which will
// toggle the unified toolbar visibility, because that's what the user wants.
@ -1475,7 +1475,7 @@ QSize QMainWindowLayout::minimumSize() const
const QSize sbMin = statusbar ? statusbar->minimumSize() : QSize(0, 0);
minSize = QSize(qMax(sbMin.width(), minSize.width()),
sbMin.height() + minSize.height());
#ifdef Q_WS_MAC
#ifdef Q_DEAD_CODE_FROM_QT4_MAC
const QSize storedSize = minSize;
int minWidth = 0;
foreach (QToolBar *toolbar, qtoolbarsInUnifiedToolbarList) {
@ -1676,7 +1676,7 @@ QMainWindowLayout::QMainWindowLayout(QMainWindow *mainwindow, QLayout *parentLay
#ifndef QT_NO_RUBBERBAND
, gapIndicator(new QRubberBand(QRubberBand::Rectangle, mainwindow))
#endif //QT_NO_RUBBERBAND
#ifdef Q_WS_MAC
#ifdef Q_DEAD_CODE_FROM_QT4_MAC
, blockVisiblityCheck(false)
#endif
{
@ -1709,7 +1709,7 @@ QMainWindowLayout::~QMainWindowLayout()
layoutState.deleteAllLayoutItems();
layoutState.deleteCentralWidgetItem();
#ifdef Q_WS_MAC
#ifdef Q_DEAD_CODE_FROM_QT4_MAC
cleanUpMacToolbarItems();
#endif
@ -1956,7 +1956,7 @@ bool QMainWindowLayout::restoreState(QDataStream &stream)
// HIToolbar.
bool QMainWindowLayout::usesHIToolBar(QToolBar *toolbar) const
{
#ifndef Q_WS_MAC
#ifndef Q_DEAD_CODE_FROM_QT4_MAC
Q_UNUSED(toolbar);
return false;
#else

8
src/widgets/widgets/qmainwindowlayout_p.h
View File

@ -60,7 +60,7 @@
#include "qdockarealayout_p.h"
#include "qtoolbararealayout_p.h"
#ifdef Q_WS_MAC
#ifdef Q_DEAD_CODE_FROM_QT4_MAC
// Forward defs to make avoid including Carbon.h (faster compile you know ;).
struct OpaqueHIObjectRef;
typedef struct OpaqueHIObjectRef* HIObjectRef;
@ -70,7 +70,7 @@ typedef const struct __CFString * CFStringRef;
#include <private/qunifiedtoolbarsurface_mac_p.h>
#endif // Q_WS_MAC
#endif // Q_DEAD_CODE_FROM_QT4_MAC
QT_BEGIN_NAMESPACE
@ -292,7 +292,7 @@ private:
#ifndef QT_NO_TABBAR
void updateTabBarShapes();
#endif
#ifdef Q_WS_MAC
#ifdef Q_DEAD_CODE_FROM_QT4_MAC
static OSStatus qtmacToolbarDelegate(EventHandlerCallRef, EventRef , void *);
static OSStatus qtoolbarInHIToolbarHandler(EventHandlerCallRef inCallRef, EventRef event,
void *data);
@ -325,7 +325,7 @@ public:
QUnifiedToolbarSurface *unifiedSurface;
void updateUnifiedToolbarOffset();
#endif // Q_WS_MAC
#endif // Q_DEAD_CODE_FROM_QT4_MAC
};
#if !defined(QT_NO_DOCKWIDGET) && !defined(QT_NO_DEBUG_STREAM)

8
src/widgets/widgets/qmdiarea.cpp
View File

@ -154,7 +154,7 @@
#include <QApplication>
#include <QStyle>
#if defined(Q_WS_MAC) && !defined(QT_NO_STYLE_MAC)
#if defined(Q_DEAD_CODE_FROM_QT4_MAC) && !defined(QT_NO_STYLE_MAC)
#include <private/qmacstyle_mac_p.h>
#endif
#include <QChildEvent>
@ -2491,7 +2491,7 @@ bool QMdiArea::event(QEvent *event)
{
Q_D(QMdiArea);
switch (event->type()) {
#ifdef Q_WS_WIN
#ifdef Q_DEAD_CODE_FROM_QT4_WIN
// QWidgetPrivate::hide_helper activates another sub-window when closing a
// modal dialog on Windows (see activateWindow() inside the ifdef).
case QEvent::WindowUnblocked:
@ -2555,7 +2555,7 @@ bool QMdiArea::eventFilter(QObject *object, QEvent *event)
QKeyEvent *keyEvent = static_cast<QKeyEvent *>(event);
// Ingore key events without a Ctrl modifier (except for press/release on the modifier itself).
#ifdef Q_WS_MAC
#ifdef Q_DEAD_CODE_FROM_QT4_MAC
if (!(keyEvent->modifiers() & Qt::MetaModifier) && keyEvent->key() != Qt::Key_Meta)
#else
if (!(keyEvent->modifiers() & Qt::ControlModifier) && keyEvent->key() != Qt::Key_Control)
@ -2574,7 +2574,7 @@ bool QMdiArea::eventFilter(QObject *object, QEvent *event)
// 3) Ctrl-Shift-Tab (Tab, Tab, ...) -> iterate through all windows in the opposite
// direction (activatePreviousSubWindow())
switch (keyEvent->key()) {
#ifdef Q_WS_MAC
#ifdef Q_DEAD_CODE_FROM_QT4_MAC
case Qt::Key_Meta:
#else
case Qt::Key_Control:

6
src/widgets/widgets/qmdisubwindow.cpp
View File

@ -274,7 +274,7 @@ static inline bool isHoverControl(QStyle::SubControl control)
return control != QStyle::SC_None && control != QStyle::SC_TitleBarLabel;
}
#if defined(Q_WS_WIN)
#if defined(Q_DEAD_CODE_FROM_QT4_WIN)
static inline QRgb colorref2qrgb(COLORREF col)
{
return qRgb(GetRValue(col),GetGValue(col),GetBValue(col));
@ -1921,7 +1921,7 @@ QPalette QMdiSubWindowPrivate::desktopPalette() const
QPalette newPalette = q->palette();
bool colorsInitialized = false;
#ifdef Q_WS_WIN // ask system properties on windows
#ifdef Q_DEAD_CODE_FROM_QT4_WIN // ask system properties on windows
#ifndef SPI_GETGRADIENTCAPTIONS
#define SPI_GETGRADIENTCAPTIONS 0x1008
#endif
@ -1957,7 +1957,7 @@ QPalette QMdiSubWindowPrivate::desktopPalette() const
newPalette.color(QPalette::Inactive, QPalette::Highlight));
}
}
#endif // Q_WS_WIN
#endif // Q_DEAD_CODE_FROM_QT4_WIN
if (!colorsInitialized) {
newPalette.setColor(QPalette::Active, QPalette::Highlight,
newPalette.color(QPalette::Active, QPalette::Highlight));

2
src/widgets/widgets/qplaintextedit.cpp
View File

@ -804,7 +804,7 @@ void QPlainTextEditPrivate::init(const QString &txt)
viewport->setCursor(Qt::IBeamCursor);
#endif
originalOffsetY = 0;
#ifdef Q_WS_WIN
#ifdef Q_DEAD_CODE_FROM_QT4_WIN
setSingleFingerPanEnabled(true);
#endif
}

8
src/widgets/widgets/qpushbutton.cpp
View File

@ -50,10 +50,10 @@
#include "qdebug.h"
#include "qlayoutitem.h"
#include "qdialogbuttonbox.h"
#ifdef Q_WS_MAC
#ifdef Q_DEAD_CODE_FROM_QT4_MAC
#include "private/qmacstyle_mac_p.h"
#include "private/qmacstyle_mac_p_p.h"
#endif // Q_WS_MAC
#endif // Q_DEAD_CODE_FROM_QT4_MAC
#ifndef QT_NO_ACCESSIBILITY
#include "qaccessible.h"
@ -673,7 +673,7 @@ bool QPushButton::event(QEvent *e)
return QAbstractButton::event(e);
}
#ifdef Q_WS_MAC
#ifdef Q_DEAD_CODE_FROM_QT4_MAC
/*! \reimp */
bool QPushButton::hitButton(const QPoint &pos) const
{
@ -702,7 +702,7 @@ bool QPushButtonPrivate::hitButton(const QPoint &pos)
q->rect().height() - QMacStylePrivate::PushButtonBottomOffset);
return roundedRect.contains(pos);
}
#endif // Q_WS_MAC
#endif // Q_DEAD_CODE_FROM_QT4_MAC
QT_END_NAMESPACE

4
src/widgets/widgets/qpushbutton.h
View File

@ -80,9 +80,9 @@ public Q_SLOTS:
protected:
bool event(QEvent *e) Q_DECL_OVERRIDE;
#ifdef Q_WS_MAC
#ifdef Q_DEAD_CODE_FROM_QT4_MAC
bool hitButton(const QPoint &pos) const;
#endif // Q_WS_MAC
#endif // Q_DEAD_CODE_FROM_QT4_MAC
void paintEvent(QPaintEvent *) Q_DECL_OVERRIDE;
void keyPressEvent(QKeyEvent *) Q_DECL_OVERRIDE;
void focusInEvent(QFocusEvent *) Q_DECL_OVERRIDE;

2
src/widgets/widgets/qpushbutton_p.h
View File

@ -64,7 +64,7 @@ public:
inline void init() { resetLayoutItemMargins(); }
static QPushButtonPrivate* get(QPushButton *b) { return b->d_func(); }
#ifdef Q_WS_MAC
#ifdef Q_DEAD_CODE_FROM_QT4_MAC
bool hitButton(const QPoint &pos);
#endif
#ifndef QT_NO_MENU

8
src/widgets/widgets/qrubberband.cpp
View File

@ -41,7 +41,7 @@
#include "qstyle.h"
#include "qstyleoption.h"
#ifdef Q_WS_MAC
#ifdef Q_DEAD_CODE_FROM_QT4_MAC
# include <private/qt_mac_p.h>
# include <private/qt_cocoa_helpers_mac_p.h>
#endif
@ -136,12 +136,12 @@ QRubberBand::QRubberBand(Shape s, QWidget *p)
Q_D(QRubberBand);
d->shape = s;
setAttribute(Qt::WA_TransparentForMouseEvents);
#ifndef Q_WS_WIN
#ifndef Q_DEAD_CODE_FROM_QT4_WIN
setAttribute(Qt::WA_NoSystemBackground);
#endif //Q_WS_WIN
#endif //Q_DEAD_CODE_FROM_QT4_WIN
setAttribute(Qt::WA_WState_ExplicitShowHide);
setVisible(false);
#ifdef Q_WS_MAC
#ifdef Q_DEAD_CODE_FROM_QT4_MAC
if (isWindow()) {
createWinId();
extern OSWindowRef qt_mac_window_for(const QWidget *); //qwidget_mac.cpp

18
src/widgets/widgets/qsizegrip.cpp
View File

@ -46,7 +46,7 @@
#include "qdebug.h"
#include <QDesktopWidget>
#ifdef Q_WS_MAC
#ifdef Q_DEAD_CODE_FROM_QT4_MAC
#include <private/qt_mac_p.h>
#endif
@ -76,7 +76,7 @@ public:
Qt::Corner m_corner;
bool gotMousePress;
QPointer<QWidget> tlw;
#ifdef Q_WS_MAC
#ifdef Q_DEAD_CODE_FROM_QT4_MAC
void updateMacSizer(bool hide) const;
#endif
Qt::Corner corner() const;
@ -114,7 +114,7 @@ public:
updateTopLevelWidget();
if (tlw && showSizeGrip) {
Qt::WindowStates sizeGripNotVisibleState = Qt::WindowFullScreen;
#ifndef Q_WS_MAC
#ifndef Q_DEAD_CODE_FROM_QT4_MAC
sizeGripNotVisibleState |= Qt::WindowMaximized;
#endif
// Don't show the size grip if the tlw is maximized or in full screen mode.
@ -136,7 +136,7 @@ QSizeGripPrivate::QSizeGripPrivate()
{
}
#ifdef Q_WS_MAC
#ifdef Q_DEAD_CODE_FROM_QT4_MAC
void QSizeGripPrivate::updateMacSizer(bool hide) const
{
Q_Q(const QSizeGrip);
@ -219,7 +219,7 @@ void QSizeGripPrivate::init()
Q_Q(QSizeGrip);
m_corner = q->isLeftToRight() ? Qt::BottomRightCorner : Qt::BottomLeftCorner;
#if !defined(QT_NO_CURSOR) && !defined(Q_WS_MAC)
#if !defined(QT_NO_CURSOR) && !defined(Q_DEAD_CODE_FROM_QT4_MAC)
q->setCursor(m_corner == Qt::TopLeftCorner || m_corner == Qt::BottomRightCorner
? Qt::SizeFDiagCursor : Qt::SizeBDiagCursor);
#endif
@ -432,7 +432,7 @@ void QSizeGrip::moveEvent(QMoveEvent * /*moveEvent*/)
return;
d->m_corner = d->corner();
#if !defined(QT_NO_CURSOR) && !defined(Q_WS_MAC)
#if !defined(QT_NO_CURSOR) && !defined(Q_DEAD_CODE_FROM_QT4_MAC)
setCursor(d->m_corner == Qt::TopLeftCorner || d->m_corner == Qt::BottomRightCorner
? Qt::SizeFDiagCursor : Qt::SizeBDiagCursor);
#endif
@ -443,7 +443,7 @@ void QSizeGrip::moveEvent(QMoveEvent * /*moveEvent*/)
*/
void QSizeGrip::showEvent(QShowEvent *showEvent)
{
#ifdef Q_WS_MAC
#ifdef Q_DEAD_CODE_FROM_QT4_MAC
d_func()->updateMacSizer(false);
#endif
QWidget::showEvent(showEvent);
@ -454,7 +454,7 @@ void QSizeGrip::showEvent(QShowEvent *showEvent)
*/
void QSizeGrip::hideEvent(QHideEvent *hideEvent)
{
#ifdef Q_WS_MAC
#ifdef Q_DEAD_CODE_FROM_QT4_MAC
d_func()->updateMacSizer(true);
#endif
QWidget::hideEvent(hideEvent);
@ -478,7 +478,7 @@ bool QSizeGrip::eventFilter(QObject *o, QEvent *e)
return QWidget::eventFilter(o, e);
}
Qt::WindowStates sizeGripNotVisibleState = Qt::WindowFullScreen;
#ifndef Q_WS_MAC
#ifndef Q_DEAD_CODE_FROM_QT4_MAC
sizeGripNotVisibleState |= Qt::WindowMaximized;
#endif
// Don't show the size grip if the tlw is maximized or in full screen mode.

4
src/widgets/widgets/qstatusbar.cpp
View File

@ -81,7 +81,7 @@ public:
int savedStrut;
#ifdef Q_WS_MAC
#ifdef Q_DEAD_CODE_FROM_QT4_MAC
QPoint dragStart;
#endif
@ -740,7 +740,7 @@ bool QStatusBar::event(QEvent *e)
// On Mac OS X Leopard it is possible to drag the window by clicking
// on the tool bar on most applications.
#ifndef Q_WS_MAC
#ifndef Q_DEAD_CODE_FROM_QT4_MAC
return QWidget::event(e);
#else
if (QSysInfo::MacintoshVersion <= QSysInfo::MV_10_4)

8
src/widgets/widgets/qtabbar.cpp
View File

@ -57,7 +57,7 @@
#ifndef QT_NO_TABBAR
#ifdef Q_WS_MAC
#ifdef Q_DEAD_CODE_FROM_QT4_MAC
#include <private/qt_mac_p.h>
#include <private/qt_cocoa_helpers_mac_p.h>
#endif
@ -1802,7 +1802,7 @@ void QTabBar::mousePressEvent(QMouseEvent *event)
d->moveTabFinished(d->pressedIndex);
d->pressedIndex = d->indexAtPos(event->pos());
#ifdef Q_WS_MAC
#ifdef Q_DEAD_CODE_FROM_QT4_MAC
d->previousPressedIndex = d->pressedIndex;
#endif
if (d->validIndex(d->pressedIndex)) {
@ -1885,7 +1885,7 @@ void QTabBar::mouseMoveEvent(QMouseEvent *event)
update();
}
#ifdef Q_WS_MAC
#ifdef Q_DEAD_CODE_FROM_QT4_MAC
} else if (!d->documentMode && event->buttons() == Qt::LeftButton && d->previousPressedIndex != -1) {
int newPressedIndex = d->indexAtPos(event->pos());
if (d->pressedIndex == -1 && d->previousPressedIndex == newPressedIndex) {
@ -1988,7 +1988,7 @@ void QTabBar::mouseReleaseEvent(QMouseEvent *event)
event->ignore();
return;
}
#ifdef Q_WS_MAC
#ifdef Q_DEAD_CODE_FROM_QT4_MAC
d->previousPressedIndex = -1;
#endif
if (d->movable && d->dragInProgress && d->validIndex(d->pressedIndex)) {

4
src/widgets/widgets/qtabbar_p.h
View File

@ -71,7 +71,7 @@ public:
selectionBehaviorOnRemove(QTabBar::SelectRightTab), paintWithOffsets(true), movable(false),
dragInProgress(false), documentMode(false), autoHide(false), changeCurrentOnDrag(false),
switchTabCurrentIndex(-1), switchTabTimerId(0), movingTab(0)
#ifdef Q_WS_MAC
#ifdef Q_DEAD_CODE_FROM_QT4_MAC
, previousPressedIndex(-1)
#endif
{}
@ -202,7 +202,7 @@ public:
int switchTabTimerId;
QWidget *movingTab;
#ifdef Q_WS_MAC
#ifdef Q_DEAD_CODE_FROM_QT4_MAC
int previousPressedIndex;
#endif
// shared by tabwidget and qtabbar

2
src/widgets/widgets/qtextedit.cpp
View File

@ -178,7 +178,7 @@ void QTextEditPrivate::init(const QString &html)
#ifndef QT_NO_CURSOR
viewport->setCursor(Qt::IBeamCursor);
#endif
#ifdef Q_WS_WIN
#ifdef Q_DEAD_CODE_FROM_QT4_WIN
setSingleFingerPanEnabled(true);
#endif
}

2
src/widgets/widgets/qtoolbar.cpp
View File

@ -316,7 +316,7 @@ bool QToolBarPrivate::mouseMoveEvent(QMouseEvent *event)
startDrag(moving);
if (!moving && !wasDragging) {
#ifdef Q_WS_WIN
#ifdef Q_DEAD_CODE_FROM_QT4_WIN
grabMouseWhileInWindow();
#else
q->grabMouse();

2
src/widgets/widgets/qwidgetlinecontrol.cpp
View File

@ -66,7 +66,7 @@ int QWidgetLineControl::redoTextLayout() const
QTextLine l = m_textLayout.createLine();
m_textLayout.endLayout();
#if defined(Q_WS_MAC)
#if defined(Q_DEAD_CODE_FROM_QT4_MAC)
if (m_threadChecks)
m_textLayoutThread = QThread::currentThread();
#endif

8
src/widgets/widgets/qwidgetlinecontrol_p.h
View File

@ -83,7 +83,7 @@ public:
m_selstart(0), m_selend(0), m_passwordEchoEditing(false)
, m_passwordEchoTimer(0)
, m_passwordMaskDelay(-1)
#if defined(Q_WS_MAC)
#if defined(Q_DEAD_CODE_FROM_QT4_MAC)
, m_threadChecks(false)
, m_textLayoutThread(0)
#endif
@ -372,14 +372,14 @@ public:
QTextLayout *textLayout() const
{
#if defined(Q_WS_MAC)
#if defined(Q_DEAD_CODE_FROM_QT4_MAC)
if (m_threadChecks && QThread::currentThread() != m_textLayoutThread)
redoTextLayout();
#endif
return &m_textLayout;
}
#if defined(Q_WS_MAC)
#if defined(Q_DEAD_CODE_FROM_QT4_MAC)
void setThreadChecks(bool threadChecks)
{
m_threadChecks = threadChecks;
@ -503,7 +503,7 @@ private:
}
int redoTextLayout() const;
#if defined(Q_WS_MAC)
#if defined(Q_DEAD_CODE_FROM_QT4_MAC)
bool m_threadChecks;
mutable QThread *m_textLayoutThread;
#endif

4
src/widgets/widgets/qwidgetresizehandler.cpp
View File

@ -114,7 +114,7 @@ bool QWidgetResizeHandler::eventFilter(QObject *o, QEvent *ee)
if (!widget->rect().contains(widget->mapFromGlobal(e->globalPos())))
return false;
if (e->button() == Qt::LeftButton) {
#if defined(Q_WS_X11)
#if defined(Q_DEAD_CODE_FROM_QT4_X11)
/*
Implicit grabs do not stop the X server from changing
the cursor in children, which looks *really* bad when
@ -128,7 +128,7 @@ bool QWidgetResizeHandler::eventFilter(QObject *o, QEvent *ee)
# else
widget->grabMouse();
# endif // QT_NO_CURSOR
#endif // Q_WS_X11
#endif // Q_DEAD_CODE_FROM_QT4_X11
buttonDown = false;
emit activate();
bool me = movingEnabled;

6
tests/auto/gui/image/qpixmap/tst_qpixmap.cpp
View File

@ -281,7 +281,7 @@ void tst_QPixmap::fromImage()
image.fill(0x7f7f7f7f);
const QPixmap pixmap = QPixmap::fromImage(image);
#ifdef Q_WS_X11
#ifdef Q_DEAD_CODE_FROM_QT4_X11
if (pixmap.handle()->classId() == QPlatformPixmap::X11Class && !pixmap.x11PictureHandle())
QSKIP("Requires XRender support");
#endif
@ -510,7 +510,7 @@ void tst_QPixmap::fill()
else
pm = QPixmap(400, 400);
#if defined(Q_WS_X11)
#if defined(Q_DEAD_CODE_FROM_QT4_X11)
if (!bitmap && pm.handle()->classId() == QPlatformPixmap::X11Class && !pm.x11PictureHandle())
QSKIP("Requires XRender support");
#endif
@ -540,7 +540,7 @@ void tst_QPixmap::fill()
void tst_QPixmap::fill_transparent()
{
QPixmap pixmap(10, 10);
#ifdef Q_WS_X11
#ifdef Q_DEAD_CODE_FROM_QT4_X11
if (pixmap.handle()->classId() == QPlatformPixmap::X11Class && !pixmap.x11PictureHandle())
QSKIP("Requires XRender support");
#endif

4
tests/auto/gui/painting/qcolor/tst_qcolor.cpp
View File

@ -102,7 +102,7 @@ private slots:
void achromaticHslHue();
#ifdef Q_WS_X11
#ifdef Q_DEAD_CODE_FROM_QT4_X11
void setallowX11ColorNames();
#endif
};
@ -1373,7 +1373,7 @@ void tst_QColor::achromaticHslHue()
QCOMPARE(hsl.hslHue(), -1);
}
#ifdef Q_WS_X11
#ifdef Q_DEAD_CODE_FROM_QT4_X11
void tst_QColor::setallowX11ColorNames()
{
#if defined(Q_OS_IRIX)

2
tests/auto/gui/painting/qpainter/tst_qpainter.cpp
View File

@ -501,7 +501,7 @@ void tst_QPainter::drawPixmap_comp()
destPm.fill(c1);
srcPm.fill(c2);
#if defined(Q_WS_X11)
#if defined(Q_DEAD_CODE_FROM_QT4_X11)
if (!destPm.x11PictureHandle())
QSKIP("Requires XRender support");
#endif

6
tests/auto/gui/painting/qregion/tst_qregion.cpp
View File

@ -38,7 +38,7 @@
#include <qbitmap.h>
#include <qpainter.h>
#include <qpolygon.h>
#ifdef Q_WS_X11
#ifdef Q_DEAD_CODE_FROM_QT4_X11
#include <private/qt_x11_p.h>
#endif
@ -82,7 +82,7 @@ private slots:
void isEmpty_data();
void isEmpty();
#if defined(Q_WS_X11) && defined(QT_BUILD_INTERNAL)
#if defined(Q_DEAD_CODE_FROM_QT4_X11) && defined(QT_BUILD_INTERNAL)
void clipRectangles();
#endif
@ -848,7 +848,7 @@ void tst_QRegion::isEmpty()
QVERIFY(region.rects().isEmpty());
}
#if defined(Q_WS_X11) && defined(QT_BUILD_INTERNAL)
#if defined(Q_DEAD_CODE_FROM_QT4_X11) && defined(QT_BUILD_INTERNAL)
void tst_QRegion::clipRectangles()
{
QRegion region(30, 30, 30, 30);

2
tests/auto/opengl/qglthreads/tst_qglthreads.cpp
View File

@ -728,7 +728,7 @@ void tst_QGLThreads::painterOnPixmapInThread()
if (!QGuiApplicationPrivate::platformIntegration()->hasCapability(QPlatformIntegration::ThreadedOpenGL)
|| !QGuiApplicationPrivate::platformIntegration()->hasCapability(QPlatformIntegration::ThreadedPixmaps))
QSKIP("No platformsupport for ThreadedOpenGL or ThreadedPixmaps");
#ifdef Q_WS_X11
#ifdef Q_DEAD_CODE_FROM_QT4_X11
QSKIP("Drawing text in threads onto X11 drawables currently crashes on some X11 servers.");
#endif
PaintThreadManager<PixmapWrapper> painterThreads(5);

4
tests/auto/other/lancelot/paintcommands.cpp
View File

@ -2385,7 +2385,7 @@ void PaintCommands::command_surface_begin(QRegExp re)
m_painter = new QPainter(m_surface_glpaintdevice);
m_painter->fillRect(QRect(0, 0, qRound(w), qRound(h)), Qt::transparent);
#endif
#ifdef Q_WS_X11
#ifdef Q_DEAD_CODE_FROM_QT4_X11
} else if (m_type == WidgetType) {
m_surface_pixmap = QPixmap(qRound(w), qRound(h));
m_surface_pixmap.fill(Qt::transparent);
@ -2436,7 +2436,7 @@ void PaintCommands::command_surface_end(QRegExp)
m_painter->beginNativePainting();
m_painter->endNativePainting();
#endif
#ifdef Q_WS_X11
#ifdef Q_DEAD_CODE_FROM_QT4_X11
} else if (m_type == WidgetType) {
m_painter->drawPixmap(m_surface_rect.topLeft(), m_surface_pixmap);
m_surface_pixmap = QPixmap();

2
tests/auto/widgets/graphicsview/qgraphicsproxywidget/tst_qgraphicsproxywidget.cpp
View File

@ -2780,7 +2780,7 @@ void tst_QGraphicsProxyWidget::windowOpacity()
// disabled on platforms without alpha channel support in QPixmap (e.g.,
// X11 without XRender).
int paints = 0;
#ifdef Q_WS_X11
#ifdef Q_DEAD_CODE_FROM_QT4_X11
paints = !X11->use_xrender;
#endif
QTRY_COMPARE(eventSpy.counts[QEvent::UpdateRequest], 0);

2
tests/auto/widgets/itemviews/qabstractitemview/tst_qabstractitemview.cpp
View File

@ -1117,7 +1117,7 @@ void tst_QAbstractItemView::setItemDelegate()
centerOnScreen(&v);
moveCursorAway(&v);
v.show();
#ifdef Q_WS_X11
#ifdef Q_DEAD_CODE_FROM_QT4_X11
QCursor::setPos(v.geometry().center());
#endif
QApplication::setActiveWindow(&v);

4
tests/auto/widgets/kernel/qwidget_window/tst_qwidget_window.cpp
View File

@ -336,7 +336,7 @@ void tst_QWidget_window::tst_windowFilePath()
void tst_QWidget_window::tst_showWithoutActivating()
{
#ifndef Q_WS_X11
#ifndef Q_DEAD_CODE_FROM_QT4_X11
QSKIP("This test is X11-only.");
#else
QWidget w;
@ -359,7 +359,7 @@ void tst_QWidget_window::tst_showWithoutActivating()
// Note the use of the , before window because we want the XGetInputFocus to be re-executed
// in each iteration of the inside loop of the QTRY_COMPARE macro
#endif // Q_WS_X11
#endif // Q_DEAD_CODE_FROM_QT4_X11
}
void tst_QWidget_window::tst_paintEventOnSecondShow()

2
tests/auto/widgets/widgets/qmdiarea/tst_qmdiarea.cpp
View File

@ -487,7 +487,7 @@ void tst_QMdiArea::subWindowActivated2()
// Check that we only emit _one_ signal and the active window
// is unchanged after hide/show.
mdiArea.hide();
#ifdef Q_WS_X11
#ifdef Q_DEAD_CODE_FROM_QT4_X11
qt_x11_wait_for_window_manager(&mdiArea);
#endif
QTest::qWait(100);

2
tests/auto/widgets/widgets/qmdisubwindow/tst_qmdisubwindow.cpp
View File

@ -56,7 +56,7 @@
#include "../../../qtest-config.h"
QT_BEGIN_NAMESPACE
#if !defined(Q_WS_WIN)
#if !defined(Q_DEAD_CODE_FROM_QT4_WIN)
extern bool qt_tab_all_widgets();
#endif
QT_END_NAMESPACE

2
tests/benchmarks/gui/graphicsview/qgraphicsview/benchapps/chipTest/view.cpp
View File

@ -35,7 +35,7 @@
#include <QtGui>
#ifdef Q_WS_WIN
#ifdef Q_DEAD_CODE_FROM_QT4_WIN
#define CALLGRIND_START_INSTRUMENTATION {}
#define CALLGRIND_STOP_INSTRUMENTATION {}
#else

6
tests/benchmarks/gui/graphicsview/qgraphicsview/benchapps/moveItems/main.cpp
View File

@ -32,14 +32,14 @@
****************************************************************************/
#include <QtGui>
#ifdef Q_WS_WIN
#ifdef Q_DEAD_CODE_FROM_QT4_WIN
#define CALLGRIND_START_INSTRUMENTATION {}
#define CALLGRIND_STOP_INSTRUMENTATION {}
#else
#include "valgrind/callgrind.h"
#endif
#ifdef Q_WS_X11
#ifdef Q_DEAD_CODE_FROM_QT4_X11
extern void qt_x11_wait_for_window_manager(QWidget *);
#endif
@ -94,7 +94,7 @@ int main(int argc, char *argv[])
View view(&scene, item);
view.resize(300, 300);
view.show();
#ifdef Q_WS_X11
#ifdef Q_DEAD_CODE_FROM_QT4_X11
qt_x11_wait_for_window_manager(&view);
#endif

2
tests/benchmarks/gui/graphicsview/qgraphicsview/benchapps/scrolltest/main.cpp
View File

@ -32,7 +32,7 @@
****************************************************************************/
#include <QtGui>
#ifdef Q_WS_WIN
#ifdef Q_DEAD_CODE_FROM_QT4_WIN
#define CALLGRIND_START_INSTRUMENTATION {}
#define CALLGRIND_STOP_INSTRUMENTATION {}
#else

2
tests/manual/bearerex/bearerex.h
View File

@ -38,7 +38,7 @@
#include "ui_detailedinfodialog.h"
#if defined(Q_WS_MAEMO_6)
#if defined(Q_DEAD_CODE_FROM_QT4_MAEMO_6)
#include "ui_bearerex_maemo.h"
#include "ui_sessiondialog_maemo.h"
#else

2
tests/manual/lance/main.cpp
View File

@ -332,7 +332,7 @@ int main(int argc, char **argv)
checkers_background = false;
}
} else {
#if defined (Q_WS_WIN)
#if defined (Q_DEAD_CODE_FROM_QT4_WIN)
QString input = QString::fromLocal8Bit(argv[i]);
if (input.indexOf('*') >= 0) {
QFileInfo info(input);

2
tests/manual/textrendering/glyphshaping/main.cpp
View File

@ -165,7 +165,7 @@ bool dumpHtml(const QString &pathName)
QString platformName = QString::fromLatin1(
#if defined(Q_OS_WIN)
"Win32"
#elif defined(Q_WS_X11)
#elif defined(Q_DEAD_CODE_FROM_QT4_X11)
"X11"
#else
""