Core: Remove 'properties' feature
Even QtCore alone cannot be built without the properties feature since Qt 5.5. While fixing this is easy, other modules like dbus, networking are also using QObject::property() and friends liberally. All in all I doubt that anybody will miss the feature (otherwise it would have been fixed in the last decade). Change-Id: Iaf3cc20bda54ee2ff3b809fac8fa82b94ecc88c0 Reviewed-by: Lars Knoll <lars.knoll@qt.io> Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
This commit is contained in:
parent
b99fdae5f5
commit
8275611766
@ -679,12 +679,6 @@ qt_feature("threadsafe-cloexec"
|
|||||||
)
|
)
|
||||||
qt_feature_definition("threadsafe-cloexec" "QT_THREADSAFE_CLOEXEC" VALUE "1")
|
qt_feature_definition("threadsafe-cloexec" "QT_THREADSAFE_CLOEXEC" VALUE "1")
|
||||||
qt_feature_config("threadsafe-cloexec" QMAKE_PUBLIC_QT_CONFIG)
|
qt_feature_config("threadsafe-cloexec" QMAKE_PUBLIC_QT_CONFIG)
|
||||||
qt_feature("properties" PUBLIC
|
|
||||||
SECTION "Kernel"
|
|
||||||
LABEL "Properties"
|
|
||||||
PURPOSE "Supports scripting Qt-based applications."
|
|
||||||
)
|
|
||||||
qt_feature_definition("properties" "QT_NO_PROPERTIES" NEGATE VALUE "1")
|
|
||||||
qt_feature("regularexpression" PUBLIC
|
qt_feature("regularexpression" PUBLIC
|
||||||
SECTION "Kernel"
|
SECTION "Kernel"
|
||||||
LABEL "QRegularExpression"
|
LABEL "QRegularExpression"
|
||||||
@ -861,7 +855,7 @@ qt_feature("animation" PUBLIC
|
|||||||
SECTION "Utilities"
|
SECTION "Utilities"
|
||||||
LABEL "Animation"
|
LABEL "Animation"
|
||||||
PURPOSE "Provides a framework for animations."
|
PURPOSE "Provides a framework for animations."
|
||||||
CONDITION QT_FEATURE_properties AND QT_FEATURE_easingcurve
|
CONDITION QT_FEATURE_easingcurve
|
||||||
)
|
)
|
||||||
qt_feature_definition("animation" "QT_NO_ANIMATION" NEGATE VALUE "1")
|
qt_feature_definition("animation" "QT_NO_ANIMATION" NEGATE VALUE "1")
|
||||||
qt_feature("gestures" PUBLIC
|
qt_feature("gestures" PUBLIC
|
||||||
|
@ -4048,8 +4048,6 @@ int QObjectPrivate::signalIndex(const char *signalName,
|
|||||||
Properties
|
Properties
|
||||||
*****************************************************************************/
|
*****************************************************************************/
|
||||||
|
|
||||||
#ifndef QT_NO_PROPERTIES
|
|
||||||
|
|
||||||
/*!
|
/*!
|
||||||
Sets the value of the object's \a name property to \a value.
|
Sets the value of the object's \a name property to \a value.
|
||||||
|
|
||||||
@ -4163,9 +4161,6 @@ QList<QByteArray> QObject::dynamicPropertyNames() const
|
|||||||
return QList<QByteArray>();
|
return QList<QByteArray>();
|
||||||
}
|
}
|
||||||
|
|
||||||
#endif // QT_NO_PROPERTIES
|
|
||||||
|
|
||||||
|
|
||||||
/*****************************************************************************
|
/*****************************************************************************
|
||||||
QObject debugging output routines.
|
QObject debugging output routines.
|
||||||
*****************************************************************************/
|
*****************************************************************************/
|
||||||
|
@ -397,13 +397,11 @@ public:
|
|||||||
void dumpObjectTree() const;
|
void dumpObjectTree() const;
|
||||||
void dumpObjectInfo() const;
|
void dumpObjectInfo() const;
|
||||||
|
|
||||||
#ifndef QT_NO_PROPERTIES
|
|
||||||
bool setProperty(const char *name, const QVariant &value);
|
bool setProperty(const char *name, const QVariant &value);
|
||||||
QVariant property(const char *name) const;
|
QVariant property(const char *name) const;
|
||||||
QList<QByteArray> dynamicPropertyNames() const;
|
QList<QByteArray> dynamicPropertyNames() const;
|
||||||
QBindingStorage *bindingStorage() { return &d_ptr->bindingStorage; }
|
QBindingStorage *bindingStorage() { return &d_ptr->bindingStorage; }
|
||||||
const QBindingStorage *bindingStorage() const { return &d_ptr->bindingStorage; }
|
const QBindingStorage *bindingStorage() const { return &d_ptr->bindingStorage; }
|
||||||
#endif // QT_NO_PROPERTIES
|
|
||||||
|
|
||||||
Q_SIGNALS:
|
Q_SIGNALS:
|
||||||
void destroyed(QObject * = nullptr);
|
void destroyed(QObject * = nullptr);
|
||||||
|
@ -1158,7 +1158,6 @@ qt_feature("accessibility" PUBLIC
|
|||||||
SECTION "Utilities"
|
SECTION "Utilities"
|
||||||
LABEL "Accessibility"
|
LABEL "Accessibility"
|
||||||
PURPOSE "Provides accessibility support."
|
PURPOSE "Provides accessibility support."
|
||||||
CONDITION QT_FEATURE_properties
|
|
||||||
)
|
)
|
||||||
qt_feature_definition("accessibility" "QT_NO_ACCESSIBILITY" NEGATE VALUE "1")
|
qt_feature_definition("accessibility" "QT_NO_ACCESSIBILITY" NEGATE VALUE "1")
|
||||||
qt_feature("multiprocess" PRIVATE
|
qt_feature("multiprocess" PRIVATE
|
||||||
|
@ -1281,7 +1281,6 @@ static void init_platform(const QString &pluginNamesWithArguments, const QString
|
|||||||
if (!QGuiApplicationPrivate::platform_theme)
|
if (!QGuiApplicationPrivate::platform_theme)
|
||||||
QGuiApplicationPrivate::platform_theme = new QPlatformTheme;
|
QGuiApplicationPrivate::platform_theme = new QPlatformTheme;
|
||||||
|
|
||||||
#ifndef QT_NO_PROPERTIES
|
|
||||||
// Set arguments as dynamic properties on the native interface as
|
// Set arguments as dynamic properties on the native interface as
|
||||||
// boolean 'foo' or strings: 'foo=bar'
|
// boolean 'foo' or strings: 'foo=bar'
|
||||||
if (!platformArguments.isEmpty()) {
|
if (!platformArguments.isEmpty()) {
|
||||||
@ -1296,7 +1295,6 @@ static void init_platform(const QString &pluginNamesWithArguments, const QString
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
#endif
|
|
||||||
|
|
||||||
const auto platformIntegration = QGuiApplicationPrivate::platformIntegration();
|
const auto platformIntegration = QGuiApplicationPrivate::platformIntegration();
|
||||||
fontSmoothingGamma = platformIntegration->styleHint(QPlatformIntegration::FontSmoothingGamma).toReal();
|
fontSmoothingGamma = platformIntegration->styleHint(QPlatformIntegration::FontSmoothingGamma).toReal();
|
||||||
|
@ -191,14 +191,12 @@ static QSet<QByteArray> keywords()
|
|||||||
<< "cmake"
|
<< "cmake"
|
||||||
;
|
;
|
||||||
|
|
||||||
#if QT_CONFIG(properties)
|
|
||||||
QCoreApplication *app = QCoreApplication::instance();
|
QCoreApplication *app = QCoreApplication::instance();
|
||||||
if (app) {
|
if (app) {
|
||||||
const QVariant platformName = app->property("platformName");
|
const QVariant platformName = app->property("platformName");
|
||||||
if (platformName.isValid())
|
if (platformName.isValid())
|
||||||
set << platformName.toByteArray();
|
set << platformName.toByteArray();
|
||||||
}
|
}
|
||||||
#endif
|
|
||||||
|
|
||||||
return set;
|
return set;
|
||||||
}
|
}
|
||||||
|
@ -1022,8 +1022,6 @@ void Generator::generateMetacall()
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (cdef->propertyList.size()) {
|
if (cdef->propertyList.size()) {
|
||||||
|
|
||||||
fprintf(out, "\n#ifndef QT_NO_PROPERTIES\n ");
|
|
||||||
if (needElse)
|
if (needElse)
|
||||||
fprintf(out, "else ");
|
fprintf(out, "else ");
|
||||||
fprintf(out,
|
fprintf(out,
|
||||||
@ -1032,7 +1030,6 @@ void Generator::generateMetacall()
|
|||||||
" || _c == QMetaObject::RegisterPropertyMetaType) {\n"
|
" || _c == QMetaObject::RegisterPropertyMetaType) {\n"
|
||||||
" qt_static_metacall(this, _c, _id, _a);\n"
|
" qt_static_metacall(this, _c, _id, _a);\n"
|
||||||
" _id -= %d;\n }", int(cdef->propertyList.count()));
|
" _id -= %d;\n }", int(cdef->propertyList.count()));
|
||||||
fprintf(out, "\n#endif // QT_NO_PROPERTIES");
|
|
||||||
}
|
}
|
||||||
if (methodList.size() || cdef->propertyList.size())
|
if (methodList.size() || cdef->propertyList.size())
|
||||||
fprintf(out, "\n ");
|
fprintf(out, "\n ");
|
||||||
@ -1283,8 +1280,6 @@ void Generator::generateStaticMetacall()
|
|||||||
needReset |= !p.reset.isEmpty();
|
needReset |= !p.reset.isEmpty();
|
||||||
hasBindableProperties |= !p.bind.isEmpty();
|
hasBindableProperties |= !p.bind.isEmpty();
|
||||||
}
|
}
|
||||||
fprintf(out, "\n#ifndef QT_NO_PROPERTIES\n ");
|
|
||||||
|
|
||||||
if (needElse)
|
if (needElse)
|
||||||
fprintf(out, "else ");
|
fprintf(out, "else ");
|
||||||
fprintf(out, "if (_c == QMetaObject::ReadProperty) {\n");
|
fprintf(out, "if (_c == QMetaObject::ReadProperty) {\n");
|
||||||
@ -1429,7 +1424,6 @@ void Generator::generateStaticMetacall()
|
|||||||
fprintf(out, " }\n");
|
fprintf(out, " }\n");
|
||||||
}
|
}
|
||||||
fprintf(out, " }");
|
fprintf(out, " }");
|
||||||
fprintf(out, "\n#endif // QT_NO_PROPERTIES");
|
|
||||||
needElse = true;
|
needElse = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -42,7 +42,7 @@ qt_feature("style-stylesheet" PUBLIC
|
|||||||
SECTION "Styles"
|
SECTION "Styles"
|
||||||
LABEL "QStyleSheetStyle"
|
LABEL "QStyleSheetStyle"
|
||||||
PURPOSE "Provides a widget style which is configurable via CSS."
|
PURPOSE "Provides a widget style which is configurable via CSS."
|
||||||
CONDITION QT_FEATURE_style_windows AND QT_FEATURE_properties AND QT_FEATURE_cssparser
|
CONDITION QT_FEATURE_style_windows AND QT_FEATURE_cssparser
|
||||||
)
|
)
|
||||||
qt_feature_definition("style-stylesheet" "QT_NO_STYLE_STYLESHEET" NEGATE VALUE "1")
|
qt_feature_definition("style-stylesheet" "QT_NO_STYLE_STYLESHEET" NEGATE VALUE "1")
|
||||||
qt_feature("effects" PRIVATE
|
qt_feature("effects" PRIVATE
|
||||||
@ -355,7 +355,7 @@ qt_feature("textedit" PUBLIC
|
|||||||
SECTION "Widgets"
|
SECTION "Widgets"
|
||||||
LABEL "QTextEdit"
|
LABEL "QTextEdit"
|
||||||
PURPOSE "Supports rich text editing."
|
PURPOSE "Supports rich text editing."
|
||||||
CONDITION QT_FEATURE_scrollarea AND QT_FEATURE_properties AND QT_FEATURE_widgettextcontrol
|
CONDITION QT_FEATURE_scrollarea AND QT_FEATURE_widgettextcontrol
|
||||||
)
|
)
|
||||||
qt_feature_definition("textedit" "QT_NO_TEXTEDIT" NEGATE VALUE "1")
|
qt_feature_definition("textedit" "QT_NO_TEXTEDIT" NEGATE VALUE "1")
|
||||||
qt_feature("syntaxhighlighter" PUBLIC
|
qt_feature("syntaxhighlighter" PUBLIC
|
||||||
@ -468,7 +468,7 @@ qt_feature("wizard" PUBLIC
|
|||||||
SECTION "Dialogs"
|
SECTION "Dialogs"
|
||||||
LABEL "QWizard"
|
LABEL "QWizard"
|
||||||
PURPOSE "Provides a framework for multi-page click-through dialogs."
|
PURPOSE "Provides a framework for multi-page click-through dialogs."
|
||||||
CONDITION ( QT_FEATURE_dialog ) AND ( QT_FEATURE_pushbutton ) AND ( QT_FEATURE_properties ) AND ( QT_FEATURE_label )
|
CONDITION ( QT_FEATURE_dialog ) AND ( QT_FEATURE_pushbutton ) AND ( QT_FEATURE_label )
|
||||||
)
|
)
|
||||||
qt_feature_definition("wizard" "QT_NO_WIZARD" NEGATE VALUE "1")
|
qt_feature_definition("wizard" "QT_NO_WIZARD" NEGATE VALUE "1")
|
||||||
qt_feature("listview" PUBLIC
|
qt_feature("listview" PUBLIC
|
||||||
@ -496,7 +496,7 @@ qt_feature("datawidgetmapper" PUBLIC
|
|||||||
SECTION "ItemViews"
|
SECTION "ItemViews"
|
||||||
LABEL "QDataWidgetMapper"
|
LABEL "QDataWidgetMapper"
|
||||||
PURPOSE "Provides mapping between a section of a data model to widgets."
|
PURPOSE "Provides mapping between a section of a data model to widgets."
|
||||||
CONDITION QT_FEATURE_itemviews AND QT_FEATURE_properties
|
CONDITION QT_FEATURE_itemviews
|
||||||
)
|
)
|
||||||
qt_feature_definition("datawidgetmapper" "QT_NO_DATAWIDGETMAPPER" NEGATE VALUE "1")
|
qt_feature_definition("datawidgetmapper" "QT_NO_DATAWIDGETMAPPER" NEGATE VALUE "1")
|
||||||
qt_feature("columnview" PUBLIC
|
qt_feature("columnview" PUBLIC
|
||||||
|
@ -118,9 +118,7 @@ private slots:
|
|||||||
private:
|
private:
|
||||||
void keyPressEvent(QKeyEvent *event) override {
|
void keyPressEvent(QKeyEvent *event) override {
|
||||||
if ((event->key() == Qt::Key_Return || event->key() == Qt::Key_Enter) && !hasAcceptableInput()) {
|
if ((event->key() == Qt::Key_Return || event->key() == Qt::Key_Enter) && !hasAcceptableInput()) {
|
||||||
#ifndef QT_NO_PROPERTIES
|
|
||||||
setProperty("value", property("value"));
|
setProperty("value", property("value"));
|
||||||
#endif
|
|
||||||
} else {
|
} else {
|
||||||
QSpinBox::keyPressEvent(event);
|
QSpinBox::keyPressEvent(event);
|
||||||
}
|
}
|
||||||
@ -153,9 +151,7 @@ private slots:
|
|||||||
private:
|
private:
|
||||||
void keyPressEvent(QKeyEvent *event) override {
|
void keyPressEvent(QKeyEvent *event) override {
|
||||||
if ((event->key() == Qt::Key_Return || event->key() == Qt::Key_Enter) && !hasAcceptableInput()) {
|
if ((event->key() == Qt::Key_Return || event->key() == Qt::Key_Enter) && !hasAcceptableInput()) {
|
||||||
#ifndef QT_NO_PROPERTIES
|
|
||||||
setProperty("value", property("value"));
|
setProperty("value", property("value"));
|
||||||
#endif
|
|
||||||
} else {
|
} else {
|
||||||
QDoubleSpinBox::keyPressEvent(event);
|
QDoubleSpinBox::keyPressEvent(event);
|
||||||
}
|
}
|
||||||
|
@ -522,10 +522,6 @@ QWidget *QItemDelegate::createEditor(QWidget *parent,
|
|||||||
|
|
||||||
void QItemDelegate::setEditorData(QWidget *editor, const QModelIndex &index) const
|
void QItemDelegate::setEditorData(QWidget *editor, const QModelIndex &index) const
|
||||||
{
|
{
|
||||||
#ifdef QT_NO_PROPERTIES
|
|
||||||
Q_UNUSED(editor);
|
|
||||||
Q_UNUSED(index);
|
|
||||||
#else
|
|
||||||
QVariant v = index.data(Qt::EditRole);
|
QVariant v = index.data(Qt::EditRole);
|
||||||
QByteArray n = editor->metaObject()->userProperty().name();
|
QByteArray n = editor->metaObject()->userProperty().name();
|
||||||
|
|
||||||
@ -534,7 +530,6 @@ void QItemDelegate::setEditorData(QWidget *editor, const QModelIndex &index) con
|
|||||||
v = QVariant(editor->property(n).metaType());
|
v = QVariant(editor->property(n).metaType());
|
||||||
editor->setProperty(n, v);
|
editor->setProperty(n, v);
|
||||||
}
|
}
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/*!
|
/*!
|
||||||
@ -552,11 +547,6 @@ void QItemDelegate::setModelData(QWidget *editor,
|
|||||||
QAbstractItemModel *model,
|
QAbstractItemModel *model,
|
||||||
const QModelIndex &index) const
|
const QModelIndex &index) const
|
||||||
{
|
{
|
||||||
#ifdef QT_NO_PROPERTIES
|
|
||||||
Q_UNUSED(model);
|
|
||||||
Q_UNUSED(editor);
|
|
||||||
Q_UNUSED(index);
|
|
||||||
#else
|
|
||||||
Q_D(const QItemDelegate);
|
Q_D(const QItemDelegate);
|
||||||
Q_ASSERT(model);
|
Q_ASSERT(model);
|
||||||
Q_ASSERT(editor);
|
Q_ASSERT(editor);
|
||||||
@ -566,7 +556,6 @@ void QItemDelegate::setModelData(QWidget *editor,
|
|||||||
model->data(index, Qt::EditRole).userType());
|
model->data(index, Qt::EditRole).userType());
|
||||||
if (!n.isEmpty())
|
if (!n.isEmpty())
|
||||||
model->setData(index, editor->property(n), Qt::EditRole);
|
model->setData(index, editor->property(n), Qt::EditRole);
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/*!
|
/*!
|
||||||
|
@ -458,10 +458,6 @@ QWidget *QStyledItemDelegate::createEditor(QWidget *parent,
|
|||||||
*/
|
*/
|
||||||
void QStyledItemDelegate::setEditorData(QWidget *editor, const QModelIndex &index) const
|
void QStyledItemDelegate::setEditorData(QWidget *editor, const QModelIndex &index) const
|
||||||
{
|
{
|
||||||
#ifdef QT_NO_PROPERTIES
|
|
||||||
Q_UNUSED(editor);
|
|
||||||
Q_UNUSED(index);
|
|
||||||
#else
|
|
||||||
QVariant v = index.data(Qt::EditRole);
|
QVariant v = index.data(Qt::EditRole);
|
||||||
QByteArray n = editor->metaObject()->userProperty().name();
|
QByteArray n = editor->metaObject()->userProperty().name();
|
||||||
|
|
||||||
@ -470,7 +466,6 @@ void QStyledItemDelegate::setEditorData(QWidget *editor, const QModelIndex &inde
|
|||||||
v = QVariant(editor->property(n).metaType());
|
v = QVariant(editor->property(n).metaType());
|
||||||
editor->setProperty(n, v);
|
editor->setProperty(n, v);
|
||||||
}
|
}
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/*!
|
/*!
|
||||||
@ -487,11 +482,6 @@ void QStyledItemDelegate::setModelData(QWidget *editor,
|
|||||||
QAbstractItemModel *model,
|
QAbstractItemModel *model,
|
||||||
const QModelIndex &index) const
|
const QModelIndex &index) const
|
||||||
{
|
{
|
||||||
#ifdef QT_NO_PROPERTIES
|
|
||||||
Q_UNUSED(model);
|
|
||||||
Q_UNUSED(editor);
|
|
||||||
Q_UNUSED(index);
|
|
||||||
#else
|
|
||||||
Q_D(const QStyledItemDelegate);
|
Q_D(const QStyledItemDelegate);
|
||||||
Q_ASSERT(model);
|
Q_ASSERT(model);
|
||||||
Q_ASSERT(editor);
|
Q_ASSERT(editor);
|
||||||
@ -501,7 +491,6 @@ void QStyledItemDelegate::setModelData(QWidget *editor,
|
|||||||
model->data(index, Qt::EditRole).userType());
|
model->data(index, Qt::EditRole).userType());
|
||||||
if (!n.isEmpty())
|
if (!n.isEmpty())
|
||||||
model->setData(index, editor->property(n), Qt::EditRole);
|
model->setData(index, editor->property(n), Qt::EditRole);
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/*!
|
/*!
|
||||||
|
@ -9236,7 +9236,6 @@ bool QWidget::event(QEvent *event)
|
|||||||
d->renderToTextureReallyDirty = 1;
|
d->renderToTextureReallyDirty = 1;
|
||||||
#endif
|
#endif
|
||||||
break;
|
break;
|
||||||
#ifndef QT_NO_PROPERTIES
|
|
||||||
case QEvent::DynamicPropertyChange: {
|
case QEvent::DynamicPropertyChange: {
|
||||||
const QByteArray &propName = static_cast<QDynamicPropertyChangeEvent *>(event)->propertyName();
|
const QByteArray &propName = static_cast<QDynamicPropertyChangeEvent *>(event)->propertyName();
|
||||||
if (propName.length() == 13 && !qstrncmp(propName, "_q_customDpi", 12)) {
|
if (propName.length() == 13 && !qstrncmp(propName, "_q_customDpi", 12)) {
|
||||||
@ -9254,7 +9253,6 @@ bool QWidget::event(QEvent *event)
|
|||||||
windowHandle()->setProperty(propName, property(propName));
|
windowHandle()->setProperty(propName, property(propName));
|
||||||
Q_FALLTHROUGH();
|
Q_FALLTHROUGH();
|
||||||
}
|
}
|
||||||
#endif
|
|
||||||
default:
|
default:
|
||||||
return QObject::event(event);
|
return QObject::event(event);
|
||||||
}
|
}
|
||||||
|
@ -1433,9 +1433,7 @@ QRectF QWidgetTextControlPrivate::rectForPosition(int position) const
|
|||||||
int cursorWidth;
|
int cursorWidth;
|
||||||
{
|
{
|
||||||
bool ok = false;
|
bool ok = false;
|
||||||
#ifndef QT_NO_PROPERTIES
|
|
||||||
cursorWidth = docLayout->property("cursorWidth").toInt(&ok);
|
cursorWidth = docLayout->property("cursorWidth").toInt(&ok);
|
||||||
#endif
|
|
||||||
if (!ok)
|
if (!ok)
|
||||||
cursorWidth = 1;
|
cursorWidth = 1;
|
||||||
}
|
}
|
||||||
@ -2468,24 +2466,16 @@ void QWidgetTextControl::setOverwriteMode(bool overwrite)
|
|||||||
|
|
||||||
int QWidgetTextControl::cursorWidth() const
|
int QWidgetTextControl::cursorWidth() const
|
||||||
{
|
{
|
||||||
#ifndef QT_NO_PROPERTIES
|
|
||||||
Q_D(const QWidgetTextControl);
|
Q_D(const QWidgetTextControl);
|
||||||
return d->doc->documentLayout()->property("cursorWidth").toInt();
|
return d->doc->documentLayout()->property("cursorWidth").toInt();
|
||||||
#else
|
|
||||||
return 1;
|
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void QWidgetTextControl::setCursorWidth(int width)
|
void QWidgetTextControl::setCursorWidth(int width)
|
||||||
{
|
{
|
||||||
Q_D(QWidgetTextControl);
|
Q_D(QWidgetTextControl);
|
||||||
#ifdef QT_NO_PROPERTIES
|
|
||||||
Q_UNUSED(width);
|
|
||||||
#else
|
|
||||||
if (width == -1)
|
if (width == -1)
|
||||||
width = QApplication::style()->pixelMetric(QStyle::PM_TextCursorWidth, nullptr);
|
width = QApplication::style()->pixelMetric(QStyle::PM_TextCursorWidth, nullptr);
|
||||||
d->doc->documentLayout()->setProperty("cursorWidth", width);
|
d->doc->documentLayout()->setProperty("cursorWidth", width);
|
||||||
#endif
|
|
||||||
d->repaintCursor();
|
d->repaintCursor();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1481,9 +1481,7 @@ int TestObject::qt_metacall(QMetaObject::Call _c, int _id, void **_a)
|
|||||||
if (_id < ownMethodCount)
|
if (_id < ownMethodCount)
|
||||||
qt_static_metacall(this, _c, _id, _a);
|
qt_static_metacall(this, _c, _id, _a);
|
||||||
_id -= ownMethodCount;
|
_id -= ownMethodCount;
|
||||||
}
|
} else if (_c == QMetaObject::ReadProperty) {
|
||||||
#ifndef QT_NO_PROPERTIES
|
|
||||||
else if (_c == QMetaObject::ReadProperty) {
|
|
||||||
void *_v = _a[0];
|
void *_v = _a[0];
|
||||||
switch (_id) {
|
switch (_id) {
|
||||||
case 0: *reinterpret_cast< int*>(_v) = intProp(); break;
|
case 0: *reinterpret_cast< int*>(_v) = intProp(); break;
|
||||||
@ -1506,7 +1504,6 @@ int TestObject::qt_metacall(QMetaObject::Call _c, int _id, void **_a)
|
|||||||
} else if (_c == QMetaObject::ResetProperty) {
|
} else if (_c == QMetaObject::ResetProperty) {
|
||||||
_id -= ownPropertyCount;
|
_id -= ownPropertyCount;
|
||||||
}
|
}
|
||||||
#endif // QT_NO_PROPERTIES
|
|
||||||
return _id;
|
return _id;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1481,14 +1481,12 @@ void tst_QComboBox::setCurrentText()
|
|||||||
else
|
else
|
||||||
QCOMPARE(testWidget->currentText(), QString("foo"));
|
QCOMPARE(testWidget->currentText(), QString("foo"));
|
||||||
|
|
||||||
#ifndef QT_NO_PROPERTIES
|
|
||||||
// verify WRITE for currentText property
|
// verify WRITE for currentText property
|
||||||
testWidget->setCurrentIndex(0);
|
testWidget->setCurrentIndex(0);
|
||||||
const QByteArray n("currentText");
|
const QByteArray n("currentText");
|
||||||
QCOMPARE(testWidget->property(n).toString(), QString("foo"));
|
QCOMPARE(testWidget->property(n).toString(), QString("foo"));
|
||||||
testWidget->setProperty(n, QString("bar"));
|
testWidget->setProperty(n, QString("bar"));
|
||||||
QCOMPARE(testWidget->property(n).toString(), QString("bar"));
|
QCOMPARE(testWidget->property(n).toString(), QString("bar"));
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void tst_QComboBox::currentTextChanged_data()
|
void tst_QComboBox::currentTextChanged_data()
|
||||||
|
Loading…
x
Reference in New Issue
Block a user