diff options
| author | Crystalwarrior <varsash@gmail.com> | 2021-01-19 16:04:58 +0300 |
|---|---|---|
| committer | Crystalwarrior <varsash@gmail.com> | 2021-01-19 16:04:58 +0300 |
| commit | 1b016ddf91cb8b065215d046e7e0b4064b5d8633 (patch) | |
| tree | 39ea2ed35b536bdd5a06141398eb3bc379fccd09 /src/networkmanager.cpp | |
| parent | 07993a621b046985ee39ddef1427d8b4cc6042b1 (diff) | |
| parent | 0926f3c15842a71002c0ec374fd54832469036d8 (diff) | |
Merge branch 'master' into feature/timerclock
# Conflicts:
# include/courtroom.h
Diffstat (limited to 'src/networkmanager.cpp')
| -rw-r--r-- | src/networkmanager.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/networkmanager.cpp b/src/networkmanager.cpp index cf89d0ab..5e29e219 100644 --- a/src/networkmanager.cpp +++ b/src/networkmanager.cpp @@ -131,7 +131,7 @@ void NetworkManager::on_srv_lookup() qDebug() << "Connecting to " << record.target() << ":" << record.port(); #endif ms_socket->connectToHost(record.target(), record.port()); - QTime timer; + QElapsedTimer timer; timer.start(); do { ao_app->processEvents(); |