mirror of
https://github.com/YACReader/yacreader
synced 2025-06-04 01:28:55 -04:00
merged develop
This commit is contained in:
commit
6df834d5c9
@ -288,7 +288,8 @@ void ServerConfigDialog::generateQR(const QString & serverAddress)
|
||||
qrCode->clear();
|
||||
qrGenerator = new QProcess();
|
||||
QStringList attributes;
|
||||
attributes << "-o" << "-" /*QCoreApplication::applicationDirPath()+"/utils/tmp.png"*/ << "-s" << "8" << "-l" << "H" << "-m" << "0" << serverAddress;
|
||||
int pixels = devicePixelRatio() * 8;
|
||||
attributes << "-o" << "-" /*QCoreApplication::applicationDirPath()+"/utils/tmp.png"*/ << "-s" << QString::number(pixels) << "-l" << "H" << "-m" << "0" << serverAddress;
|
||||
connect(qrGenerator,SIGNAL(finished(int,QProcess::ExitStatus)),this,SLOT(updateImage(void)));
|
||||
connect(qrGenerator,SIGNAL(error(QProcess::ProcessError)),this,SLOT(openingError(QProcess::ProcessError))); //TODO: implement openingError
|
||||
#if defined Q_OS_UNIX && !defined Q_OS_MAC
|
||||
@ -312,6 +313,8 @@ void ServerConfigDialog::updateImage()
|
||||
pMask.fill( QColor(66, 66, 66) );
|
||||
pMask.setMask( p.createMaskFromColor( Qt::white ) );
|
||||
|
||||
pMask.setDevicePixelRatio(devicePixelRatio());
|
||||
|
||||
*qrCodeImage = pMask;
|
||||
|
||||
qrCode->setPixmap(*qrCodeImage);
|
||||
|
Loading…
x
Reference in New Issue
Block a user