diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-03-02 17:14:46 +0100 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-03-04 09:14:35 +0100 |
| commit | fc7418d293fa3e9fceead80fab78844980726dea (patch) | |
| tree | ee7bc5f52ec8113ab646927633682de41ca859b4 | |
| parent | 3dc4d2a3b22eefa11ac1b8a3a908b0a6721ed3d9 (diff) | |
Fix deprecation warnings
Use split behavior enumeration from Qt, fixing:
qdbusmodel.cpp:308:75: warning: 'SkipEmptyParts' is deprecated [-Wdeprecated-declarations]
Remove the dock widget feature settings from Linguist since
all features are enabled by default, fixing:
mainwindow.cpp:302:45: warning: 'AllDockWidgetFeatures' is deprecated [-Wdeprecated-declarations]
Change-Id: I72ada0dcbc81792d8643fc0948d86ea08847a8ec
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
| -rw-r--r-- | src/linguist/linguist/mainwindow.cpp | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/src/linguist/linguist/mainwindow.cpp b/src/linguist/linguist/mainwindow.cpp index 7cc9fc740..26a3d03f2 100644 --- a/src/linguist/linguist/mainwindow.cpp +++ b/src/linguist/linguist/mainwindow.cpp @@ -299,7 +299,6 @@ MainWindow::MainWindow() m_contextDock = new QDockWidget(this); m_contextDock->setObjectName(QLatin1String("ContextDockWidget")); m_contextDock->setAllowedAreas(Qt::AllDockWidgetAreas); - m_contextDock->setFeatures(QDockWidget::AllDockWidgetFeatures); m_contextDock->setWindowTitle(tr("Context")); m_contextDock->setAcceptDrops(true); m_contextDock->installEventFilter(this); @@ -329,7 +328,6 @@ MainWindow::MainWindow() m_messagesDock = new QDockWidget(this); m_messagesDock->setObjectName(QLatin1String("StringsDockWidget")); m_messagesDock->setAllowedAreas(Qt::AllDockWidgetAreas); - m_messagesDock->setFeatures(QDockWidget::AllDockWidgetFeatures); m_messagesDock->setWindowTitle(tr("Strings")); m_messagesDock->setAcceptDrops(true); m_messagesDock->installEventFilter(this); @@ -366,7 +364,6 @@ MainWindow::MainWindow() m_phrasesDock = new QDockWidget(this); m_phrasesDock->setObjectName(QLatin1String("PhrasesDockwidget")); m_phrasesDock->setAllowedAreas(Qt::AllDockWidgetAreas); - m_phrasesDock->setFeatures(QDockWidget::AllDockWidgetFeatures); m_phrasesDock->setWindowTitle(tr("Phrases and guesses")); m_phraseView = new PhraseView(m_dataModel, &m_phraseDict, this); @@ -376,7 +373,6 @@ MainWindow::MainWindow() m_sourceAndFormDock = new QDockWidget(this); m_sourceAndFormDock->setObjectName(QLatin1String("SourceAndFormDock")); m_sourceAndFormDock->setAllowedAreas(Qt::AllDockWidgetAreas); - m_sourceAndFormDock->setFeatures(QDockWidget::AllDockWidgetFeatures); m_sourceAndFormDock->setWindowTitle(tr("Sources and Forms")); m_sourceAndFormView = new QStackedWidget(this); m_sourceAndFormDock->setWidget(m_sourceAndFormView); @@ -391,7 +387,6 @@ MainWindow::MainWindow() m_errorsDock = new QDockWidget(this); m_errorsDock->setObjectName(QLatin1String("ErrorsDockWidget")); m_errorsDock->setAllowedAreas(Qt::AllDockWidgetAreas); - m_errorsDock->setFeatures(QDockWidget::AllDockWidgetFeatures); m_errorsDock->setWindowTitle(tr("Warnings")); m_errorsView = new ErrorsView(m_dataModel, this); m_errorsDock->setWidget(m_errorsView); |