Commit 91a96e0d authored by David Faure's avatar David Faure
Browse files

Merge remote-tracking branch 'origin/release/19.12'

parents 90ead1d8 57145559
......@@ -23,7 +23,7 @@
#ifndef TOPLEVEL_H
#define TOPLEVEL_H
#include <qdatetime.h>
#include <QElapsedTimer>
#include <QLabel>
#include <QProcess>
#include <QUrl>
......@@ -284,7 +284,7 @@ private:
// for status progress display
QString _progressMsg;
QTime _progressStart;
QElapsedTimer _progressStart;
QProgressBar* _progressBar;
// toplevel configuration options
......
......@@ -23,7 +23,7 @@
#ifndef QCGTOPLEVEL_H
#define QCGTOPLEVEL_H
#include <qdatetime.h>
#include <QElapsedTimer>
#include <QLabel>
#include <QMainWindow>
#include <QStringList>
......@@ -205,7 +205,7 @@ private:
QStatusBar* _statusbar;
QLabel* _statusLabel;
QString _progressMsg;
QTime _progressStart;
QElapsedTimer _progressStart;
QProgressBar* _progressBar;
MultiView* _multiView;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment