diff options
Diffstat (limited to 'src/widgets/doc/snippets')
| -rw-r--r-- | src/widgets/doc/snippets/code/doc_src_styles.cpp | 2 | ||||
| -rw-r--r-- | src/widgets/doc/snippets/code/src_gui_kernel_qapplication.cpp | 1 | ||||
| -rw-r--r-- | src/widgets/doc/snippets/macmainwindow.mm | 4 |
3 files changed, 4 insertions, 3 deletions
diff --git a/src/widgets/doc/snippets/code/doc_src_styles.cpp b/src/widgets/doc/snippets/code/doc_src_styles.cpp index b10c8751117..a70ed6b11d0 100644 --- a/src/widgets/doc/snippets/code/doc_src_styles.cpp +++ b/src/widgets/doc/snippets/code/doc_src_styles.cpp @@ -81,7 +81,7 @@ state |= QStyle::State_MouseOver; if (widget->window()->isActiveWindow()) state |= QStyle::State_Active; -#ifdef Q_DEAD_CODE_FROM_QT4_MAC +#if 0 // Used to be included in Qt4 for Q_WS_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; diff --git a/src/widgets/doc/snippets/code/src_gui_kernel_qapplication.cpp b/src/widgets/doc/snippets/code/src_gui_kernel_qapplication.cpp index c39a0d83bb5..a907a0421fc 100644 --- a/src/widgets/doc/snippets/code/src_gui_kernel_qapplication.cpp +++ b/src/widgets/doc/snippets/code/src_gui_kernel_qapplication.cpp @@ -77,6 +77,7 @@ QApplication::setStyle(QStyleFactory::create("Fusion")); //! [1] +// ### fixme: Qt 6: Remove [2] //! [2] int main(int argc, char *argv[]) { diff --git a/src/widgets/doc/snippets/macmainwindow.mm b/src/widgets/doc/snippets/macmainwindow.mm index f74f8453c7a..d848e6442d0 100644 --- a/src/widgets/doc/snippets/macmainwindow.mm +++ b/src/widgets/doc/snippets/macmainwindow.mm @@ -41,7 +41,7 @@ #include <QtGui> -#ifdef Q_DEAD_CODE_FROM_QT4_MAC +#if 0 // Used to be included in Qt4 for Q_WS_MAC #include <Carbon/Carbon.h> @@ -289,4 +289,4 @@ QAbstractItemModel *MacMainWindow::createDocumentModel() return model; } -#endif // Q_DEAD_CODE_FROM_QT4_MAC +#endif |