w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2025-05-29 21:02:26 -04:00
Code Issues Packages Projects Releases Wiki Activity

Switch off nag window for develop

Browse Source
This commit is contained in:
Bill Somerville 2019-01-16 20:44:04 +00:00
parent bab80a1ac2
commit 5137b47c0a
1 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
widgets/mainwindow.cpp
View File

@ -946,14 +946,10 @@ MainWindow::MainWindow(QDir const& temp_directory, bool multiple,
splashTimer.setSingleShot (true); splashTimer.setSingleShot (true);
splashTimer.start (20 * 1000); splashTimer.start (20 * 1000);
<<<<<<< HEAD
if(QCoreApplication::applicationVersion().contains("-devel") or if(QCoreApplication::applicationVersion().contains("-devel") or
QCoreApplication::applicationVersion().contains("-rc")) { QCoreApplication::applicationVersion().contains("-rc")) {
QTimer::singleShot (0, this, SLOT (not_GA_warning_message ())); // QTimer::singleShot (0, this, SLOT (not_GA_warning_message ()));
} }
=======
//QTimer::singleShot (0, this, SLOT (not_GA_warning_message ()));
>>>>>>> hotfix-2.0.1-rc1
if(!ui->cbMenus->isChecked()) { if(!ui->cbMenus->isChecked()) {
ui->cbMenus->setChecked(true); ui->cbMenus->setChecked(true);