mirror of
https://bitbucket.org/smil3y/katie.git
synced 2025-02-24 10:52:56 +00:00
remove mac and xlc support leftovers
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
This commit is contained in:
parent
7e8ce50081
commit
598bb8cebd
3 changed files with 0 additions and 34 deletions
4
src/3rdparty/harfbuzz/src/harfbuzz-shaper.h
vendored
4
src/3rdparty/harfbuzz/src/harfbuzz-shaper.h
vendored
|
@ -44,11 +44,7 @@ HB_BEGIN_HEADER
|
|||
memory consumption as HB_CharAttributes and HB_GlyphAttributes will not have
|
||||
a 4 byte alignment
|
||||
*/
|
||||
#ifdef __xlC__
|
||||
typedef unsigned hb_bitfield;
|
||||
#else
|
||||
typedef hb_uint8 hb_bitfield;
|
||||
#endif
|
||||
|
||||
typedef enum {
|
||||
HB_Script_Common,
|
||||
|
|
|
@ -1079,18 +1079,6 @@ QRect QItemDelegate::rect(const QStyleOptionViewItem &option,
|
|||
|
||||
/*!
|
||||
\internal
|
||||
|
||||
Note that on Mac, if /usr/include/AssertMacros.h is included prior
|
||||
to QItemDelegate, and the application is building in debug mode, the
|
||||
check(assertion) will conflict with QItemDelegate::check.
|
||||
|
||||
To avoid this problem, add
|
||||
|
||||
#ifdef check
|
||||
#undef check
|
||||
#endif
|
||||
|
||||
after including AssertMacros.h
|
||||
*/
|
||||
QRect QItemDelegate::check(const QStyleOptionViewItem &option,
|
||||
const QRect &bounding, const QVariant &value) const
|
||||
|
|
|
@ -2087,8 +2087,6 @@ WId QWidget::effectiveWinId() const
|
|||
The style sheet contains a textual description of customizations to the
|
||||
widget's style, as described in the \l{Qt Style Sheets} document.
|
||||
|
||||
Since Qt 4.5, Qt style sheets fully supports Mac OS X.
|
||||
|
||||
\warning Qt style sheets are currently not supported for custom QStyle
|
||||
subclasses. We plan to address this in some future release.
|
||||
|
||||
|
@ -4762,7 +4760,6 @@ void QWidgetPrivate::render(QPaintDevice *target, const QPoint &targetOffset,
|
|||
if (paintRegion.isEmpty())
|
||||
return;
|
||||
|
||||
#ifndef Q_WS_MAC
|
||||
QPainter *oldSharedPainter = inRenderWithPainter ? sharedPainter() : 0;
|
||||
|
||||
// Use the target's shared painter if set (typically set when doing
|
||||
|
@ -4775,7 +4772,6 @@ void QWidgetPrivate::render(QPaintDevice *target, const QPoint &targetOffset,
|
|||
setSharedPainter(targetPainter);
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
// Use the target's redirected device if set and adjust offset and paint
|
||||
// region accordingly. This is typically the case when people call render
|
||||
|
@ -4817,17 +4813,12 @@ void QWidgetPrivate::render(QPaintDevice *target, const QPoint &targetOffset,
|
|||
return;
|
||||
}
|
||||
|
||||
#ifndef Q_WS_MAC
|
||||
// Render via backingstore.
|
||||
drawWidget(target, paintRegion, offset, flags, sharedPainter());
|
||||
|
||||
// Restore shared painter.
|
||||
if (oldSharedPainter)
|
||||
setSharedPainter(oldSharedPainter);
|
||||
#else
|
||||
// Render via backingstore (no shared painter).
|
||||
drawWidget(target, paintRegion, offset, flags, 0);
|
||||
#endif
|
||||
}
|
||||
|
||||
void QWidgetPrivate::paintSiblingsRecursive(QPaintDevice *pdev, const QObjectList& siblings, int index, const QRegion &rgn,
|
||||
|
@ -8704,15 +8695,6 @@ void QWidget::setParent(QWidget *parent, Qt::WindowFlags f)
|
|||
QApplication::sendEvent(parent, &e);
|
||||
}
|
||||
|
||||
//### already hidden above ---> must probably do something smart on the mac
|
||||
// #ifdef Q_WS_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);
|
||||
// #else
|
||||
// q->setAttribute(Qt::WA_WState_Hidden);
|
||||
//#endif
|
||||
|
||||
if (parent && d->sendChildEvents && d->polished) {
|
||||
QChildEvent e(QEvent::ChildPolished, this);
|
||||
QCoreApplication::sendEvent(parent, &e);
|
||||
|
|
Loading…
Add table
Reference in a new issue