Windows: fix depreceation warnings

- winsock2.h should be included before windows.h
- QProcess::execute('name') -> QProcess::execute('name', args);
This commit is contained in:
Floris Bos 2023-05-22 10:44:13 +02:00
parent 64d271b092
commit e490ec1c4d
4 changed files with 7 additions and 3 deletions

View file

@ -153,7 +153,7 @@ bool DownloadThread::_openAndPrepareDevice()
qDebug() << "Removing partition table from Windows drive #" << _nr << "(" << _filename << ")"; qDebug() << "Removing partition table from Windows drive #" << _nr << "(" << _filename << ")";
QProcess proc; QProcess proc;
proc.start("diskpart"); proc.start("diskpart", QStringList());
proc.waitForStarted(); proc.waitForStarted();
proc.write("select disk "+_nr+"\r\n" proc.write("select disk "+_nr+"\r\n"
"clean\r\n" "clean\r\n"

View file

@ -6,6 +6,10 @@
* Copyright (C) 2020 Raspberry Pi Ltd * Copyright (C) 2020 Raspberry Pi Ltd
*/ */
#ifdef _WIN32
#include <winsock2.h>
#endif
#include <QString> #include <QString>
#include <QThread> #include <QThread>
#include <QFile> #include <QFile>

View file

@ -48,7 +48,7 @@ void DriveFormatThread::run()
"select partition 1\r\n" "select partition 1\r\n"
"set id=0e\r\n" "set id=0e\r\n"
"assign\r\n"; "assign\r\n";
proc.start("diskpart"); proc.start("diskpart", QStringList());
proc.waitForStarted(); proc.waitForStarted();
proc.write(diskpartCmds); proc.write(diskpartCmds);
proc.closeWriteChannel(); proc.closeWriteChannel();

View file

@ -3,9 +3,9 @@
* Copyright (C) 2020 Raspberry Pi Ltd * Copyright (C) 2020 Raspberry Pi Ltd
*/ */
#include "downloadextractthread.h"
#include "imagewriter.h" #include "imagewriter.h"
#include "drivelistitem.h" #include "drivelistitem.h"
#include "downloadextractthread.h"
#include "dependencies/drivelist/src/drivelist.hpp" #include "dependencies/drivelist/src/drivelist.hpp"
#include "dependencies/sha256crypt/sha256crypt.h" #include "dependencies/sha256crypt/sha256crypt.h"
#include "driveformatthread.h" #include "driveformatthread.h"