Replace qrand with QRandomGenerator when using Qt 5.10 or higher

ext/libstrawberry-common/core/closure.cpp

@@ -19,6 +19,9 @@
 #include <QList>
 #include <QTimer>
 #include <QGenericArgument>
+#if QT_VERSION >= QT_VERSION_CHECK(5, 10, 0)
+#  include <QRandomGenerator>
+#endif
 
 #include "closure.h"
 
@@ -72,6 +75,13 @@ void DoAfter(QObject *receiver, const char *slot, int msec) {
 }
 
 void DoInAMinuteOrSo(QObject *receiver, const char *slot) {
+
+#if QT_VERSION >= QT_VERSION_CHECK(5, 10, 0)
+  int msec = (60 + QRandomGenerator::global()->bounded(1, 60)) * kMsecPerSec;
+#else
   int msec = (60 + (qrand() % 60)) * kMsecPerSec;
+#endif
+
   DoAfter(receiver, slot, msec);
+
 }

ext/libstrawberry-common/core/workerpool.h

@@ -33,6 +33,9 @@
 #include <QString>
 #include <QStringList>
 #include <QAtomicInt>
+#if QT_VERSION >= QT_VERSION_CHECK(5, 10, 0)
+#  include <QRandomGenerator>
+#endif
 
 #include "core/logging.h"
 
@@ -264,7 +267,11 @@ void WorkerPool<HandlerType>::StartOneWorker(Worker *worker) {
 
   // Create a server, find an unused name and start listening
   forever {
+#if QT_VERSION >= QT_VERSION_CHECK(5, 10, 0)
+    const int unique_number = QRandomGenerator::global()->bounded((int)(quint64(this) & 0xFFFFFFFF));
+#else
     const int unique_number = qrand() ^ ((int)(quint64(this) & 0xFFFFFFFF));
+#endif
     const QString name = QString("%1_%2").arg(local_server_name_).arg(unique_number);
 
     if (worker->local_server_->listen(name)) {

ext/strawberry-tagreader/main.cpp

@@ -46,9 +46,11 @@ int main(int argc, char **argv) {
   }
 
   // Seed random number generator
+#if QT_VERSION < QT_VERSION_CHECK(5, 10, 0)
   timeval time;
   gettimeofday(&time, nullptr);
   qsrand((time.tv_sec * 1000) + (time.tv_usec / 1000));
+#endif
 
   logging::Init();
   qLog(Info) << "TagReader worker connecting to" << args[1];
@@ -61,7 +63,9 @@ int main(int argc, char **argv) {
     return 1;
   }
 
+#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0)
   QSslSocket::addDefaultCaCertificates(QSslCertificate::fromPath(":/certs/godaddy-root.pem", QSsl::Pem));
+#endif
 
   TagReaderWorker worker(&socket);
 

ext/strawberry-tagreader/tagreaderworker.cpp

@@ -35,14 +35,6 @@ void TagReaderWorker::MessageArrived(const pb::tagreader::Message& message) {
 
   pb::tagreader::Message reply;
 
-#if 0
-  // Crash every few requests
-  if (qrand() % 10 == 0) {
-    qLog(Debug) << "Crashing on request ID" << message.id();
-    abort();
-  }
-#endif
-
   if (message.has_read_file_request()) {
     tag_reader_.ReadFile(QStringFromStdString(message.read_file_request().filename()), reply.mutable_read_file_response()->mutable_metadata());
   }