From 104408f3daf7e62dc33f6573282af9ccc2d1c440 Mon Sep 17 00:00:00 2001 From: Stephan Binner Date: Mon, 27 Feb 2017 15:06:12 +0100 Subject: [PATCH] Add feature.commandlinkbutton Change-Id: I057ed507552c74a787e5bcdaa28a18c667eecd43 Reviewed-by: Oswald Buddenhagen --- src/widgets/configure.json | 6 ++++++ src/widgets/widgets/qcommandlinkbutton.h | 2 ++ src/widgets/widgets/widgets.pri | 10 ++++++++-- 3 files changed, 16 insertions(+), 2 deletions(-) diff --git a/src/widgets/configure.json b/src/widgets/configure.json index ee296ccbe0..f27a23fd04 100644 --- a/src/widgets/configure.json +++ b/src/widgets/configure.json @@ -117,6 +117,12 @@ "condition": "features.tableview", "output": [ "publicFeature", "feature" ] }, + "commandlinkbutton": { + "label": "QCommandLinkButton", + "purpose": "Provides a Vista style command link button.", + "section": "Widgets", + "output": [ "publicFeature" ] + }, "datetimeedit": { "label": "QDateTimeEdit", "purpose": "Supports editing dates and times.", diff --git a/src/widgets/widgets/qcommandlinkbutton.h b/src/widgets/widgets/qcommandlinkbutton.h index 4f81651ce4..d8215a256e 100644 --- a/src/widgets/widgets/qcommandlinkbutton.h +++ b/src/widgets/widgets/qcommandlinkbutton.h @@ -43,6 +43,8 @@ #include #include +QT_REQUIRE_CONFIG(commandlinkbutton); + QT_BEGIN_NAMESPACE diff --git a/src/widgets/widgets/widgets.pri b/src/widgets/widgets/widgets.pri index abba3e0472..fc002c126a 100644 --- a/src/widgets/widgets/widgets.pri +++ b/src/widgets/widgets/widgets.pri @@ -13,7 +13,6 @@ HEADERS += \ widgets/qcheckbox.h \ widgets/qcombobox.h \ widgets/qcombobox_p.h \ - widgets/qcommandlinkbutton.h \ widgets/qdatetimeedit.h \ widgets/qdatetimeedit_p.h \ widgets/qdial.h \ @@ -92,7 +91,6 @@ SOURCES += \ widgets/qcalendarwidget.cpp \ widgets/qcheckbox.cpp \ widgets/qcombobox.cpp \ - widgets/qcommandlinkbutton.cpp \ widgets/qdatetimeedit.cpp \ widgets/qdial.cpp \ widgets/qdialogbuttonbox.cpp \ @@ -145,6 +143,14 @@ SOURCES += \ widgets/qtoolbararealayout.cpp \ widgets/qplaintextedit.cpp +qtConfig(commandlinkbutton) { + HEADERS += \ + widgets/qcommandlinkbutton.h + + SOURCES += \ + widgets/qcommandlinkbutton.cpp +} + macx { HEADERS += \ widgets/qmacnativewidget_mac.h \