merged

YACReader/main.cpp

@@ -14,8 +14,6 @@
 #include "configuration.h"
 #include "exit_check.h"
 
-#include <QtPlatformHeaders/QWindowsWindowFunctions>
-
 #include "QsLog.h"
 #include "QsLogDest.h"
 
@@ -143,12 +141,6 @@ int main(int argc, char * argv[])
 	app.installTranslator(&translator);
 	MainWindowViewer * mwv = new MainWindowViewer();
 
-    QWindow * w = mwv->windowHandle();
-
-    QString s_data = QString::fromLocal8Bit(QWindowsWindowFunctions::setHasBorderInFullScreenIdentifier());
-
-    qDebug() << s_data << "---";
-
 	//parser code for comic loading needs to be processed after MainWindowViewer creation
 	//if we have a valid request, open it - if not, load normally
 	if (argc > 1)

YACReader/viewer.cpp

@@ -22,9 +22,6 @@
 
 #include <QFile>
 
-#include <QtPlatformHeaders/QWindowsWindowFunctions>
-
-
 Viewer::Viewer(QWidget * parent)
 :QScrollArea(parent),
 currentPage(0),
@@ -128,9 +125,6 @@ zoom(100)
 	informationLabel = new PageLabelWidget(this);
 
 	setAcceptDrops(true);
-
-    if(this->windowHandle())
-    QWindowsWindowFunctions::setHasBorderInFullScreen(this->windowHandle(), true);
 }
 
 Viewer::~Viewer()

YACReaderLibrary/server_config_dialog.cpp

@@ -85,8 +85,8 @@ ServerConfigDialog::ServerConfigDialog(QWidget * parent)
 	qrCodeImage = new QPixmap();
 	qrCode = new QLabel(this);
     qrCode->move(64, 112);
-	qrCode->setFixedSize(200,200);
+    qrCode->setFixedSize(200,200);
-	qrCode->setScaledContents(true);
+    qrCode->setScaledContents(true);
 
     QLabel * title1 = new QLabel(tr("Server connectivity information"),this);
     title1->move(332, 61);
@@ -287,8 +287,9 @@ void ServerConfigDialog::generateQR(const QString & serverAddress)
 {
 	qrCode->clear();
 	qrGenerator = new QProcess();
-	QStringList attributes;
+    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);