diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-12-25 03:02:19 +0100 |
---|---|---|
committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-12-25 03:02:19 +0100 |
commit | 0a185f62659cecf15ddefcf8748f73ec79b609fb (patch) | |
tree | f9397c2d2eaa73adacb7a1208f24825a31a6f58a /tests/applications/positioning_backend/main.cpp | |
parent | e7bb8f636086c04acd97e4eb3c42e7c6c05dc8f2 (diff) | |
parent | 100e0416e7faff954221df9ef97920ba512712c0 (diff) |
Merge remote-tracking branch 'origin/5.12' into dev
Change-Id: Ic8ccf43538ad411edce061f24f05c627dab50a6b
Diffstat (limited to 'tests/applications/positioning_backend/main.cpp')
-rw-r--r-- | tests/applications/positioning_backend/main.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/tests/applications/positioning_backend/main.cpp b/tests/applications/positioning_backend/main.cpp index 930f1c9c..52115556 100644 --- a/tests/applications/positioning_backend/main.cpp +++ b/tests/applications/positioning_backend/main.cpp @@ -26,6 +26,7 @@ ** ****************************************************************************/ #include "widget.h" +#include "logwidget.h" #include <QLabel> #include <QApplication> @@ -34,14 +35,16 @@ int main(int argc, char *argv[]) { QApplication a(argc, argv); - Widget *w1 = new Widget; - Widget *w2 = new Widget; + LogWidget *log = new LogWidget; + Widget *w1 = new Widget(log); + Widget *w2 = new Widget(log); QTabWidget tabWidget; tabWidget.setTabPosition(QTabWidget::South); tabWidget.addTab(w1, "Instance 1"); tabWidget.addTab(w2, "Instance 2"); + tabWidget.addTab(log, "Logs"); tabWidget.show(); return a.exec(); |