fix compilation with various -no-feature-* options
Change-Id: Ic1975db497613e3efe50be4246c167efe10d8e31 Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>bb10
parent
835c3e94f6
commit
4d5fb551d6
|
|
@ -49,6 +49,8 @@
|
|||
|
||||
QT_BEGIN_NAMESPACE
|
||||
|
||||
#ifndef QT_NO_PDF
|
||||
|
||||
// This map is used for symbol fonts to get the correct glyph names for the latin range
|
||||
static const unsigned short symbol_map[0x100] = {
|
||||
0x0000, 0x0001, 0x0002, 0x0003, 0x0004, 0x0005, 0x0006, 0x0007,
|
||||
|
|
@ -90,7 +92,7 @@ static const unsigned short symbol_map[0x100] = {
|
|||
|
||||
// ---------------------------- PS/PDF helper methods -----------------------------------
|
||||
|
||||
#ifndef QT_NO_PDF
|
||||
|
||||
|
||||
QByteArray QFontSubset::glyphName(unsigned short unicode, bool symbol)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -1720,6 +1720,8 @@ QStringList QTextHtmlStyleSelector::nodeNames(NodePtr node) const
|
|||
|
||||
#endif // QT_NO_CSSPARSER
|
||||
|
||||
#ifndef QT_NO_CSSPARSER
|
||||
|
||||
static inline int findAttribute(const QStringList &attributes, const QString &name)
|
||||
{
|
||||
int idx = -1;
|
||||
|
|
@ -1729,8 +1731,6 @@ static inline int findAttribute(const QStringList &attributes, const QString &na
|
|||
return idx;
|
||||
}
|
||||
|
||||
#ifndef QT_NO_CSSPARSER
|
||||
|
||||
QString QTextHtmlStyleSelector::attribute(NodePtr node, const QString &name) const
|
||||
{
|
||||
const QStringList &attributes = parser->at(node.id).attributes;
|
||||
|
|
|
|||
|
|
@ -55,6 +55,8 @@
|
|||
#include <QtDBus/QDBusConnection>
|
||||
#include <QtDBus/QDBusVariant>
|
||||
|
||||
#include <QtGui/qtgui-config.h>
|
||||
|
||||
QT_BEGIN_NAMESPACE
|
||||
|
||||
class QDBusServiceWatcher;
|
||||
|
|
|
|||
|
|
@ -42,8 +42,9 @@
|
|||
#define QCOCOASYSTEMTRAYICON_P_H
|
||||
|
||||
#include <QtCore/qglobal.h>
|
||||
#include <QtGui/qtguiglobal.h>
|
||||
|
||||
#ifndef QT_NO_SYSTEMTRAYICON
|
||||
#if QT_CONFIG(systemtrayicon)
|
||||
|
||||
#include "QtCore/qstring.h"
|
||||
#include "QtGui/qpa/qplatformsystemtrayicon.h"
|
||||
|
|
|
|||
|
|
@ -386,6 +386,8 @@ bool QAbstractItemDelegate::helpEvent(QHelpEvent *event,
|
|||
const QModelIndex &index)
|
||||
{
|
||||
Q_D(QAbstractItemDelegate);
|
||||
Q_UNUSED(d);
|
||||
Q_UNUSED(index);
|
||||
Q_UNUSED(option);
|
||||
|
||||
if (!event || !view)
|
||||
|
|
|
|||
|
|
@ -50,8 +50,12 @@
|
|||
|
||||
QT_BEGIN_NAMESPACE
|
||||
|
||||
QWidgetAnimator::QWidgetAnimator(QMainWindowLayout *layout) : m_mainWindowLayout(layout)
|
||||
QWidgetAnimator::QWidgetAnimator(QMainWindowLayout *layout)
|
||||
#if QT_CONFIG(mainwindow)
|
||||
: m_mainWindowLayout(layout)
|
||||
#endif
|
||||
{
|
||||
Q_UNUSED(layout)
|
||||
}
|
||||
|
||||
void QWidgetAnimator::abort(QWidget *w)
|
||||
|
|
|
|||
|
|
@ -81,7 +81,9 @@ private Q_SLOTS:
|
|||
private:
|
||||
typedef QHash<QWidget*, QPointer<QPropertyAnimation> > AnimationMap;
|
||||
AnimationMap m_animation_map;
|
||||
#if QT_CONFIG(mainwindow)
|
||||
QMainWindowLayout *m_mainWindowLayout;
|
||||
#endif
|
||||
};
|
||||
|
||||
QT_END_NAMESPACE
|
||||
|
|
|
|||
Loading…
Reference in New Issue