Index: qelectrotech.pro =================================================================== --- qelectrotech.pro (revision 5241) +++ qelectrotech.pro (working copy) @@ -31,7 +31,7 @@ QET_LANG_PATH = 'lang/' QET_LICENSE_PATH = './' # Liste des ressources Windows - RC_FILE = qelectrotech.rc + #RC_FILE = qelectrotech.rc } macx { # Chemins MacOS X Index: sources/diagramprintdialog.cpp =================================================================== --- sources/diagramprintdialog.cpp (revision 5241) +++ sources/diagramprintdialog.cpp (working copy) @@ -354,7 +354,25 @@ */ void DiagramPrintDialog::print(const QList &diagrams, bool fit_page, const ExportProperties options) { //qDebug() << "Demande d'impression de " << diagrams.count() << "schemas."; - +#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0) + #ifdef Q_OS_WIN + #ifdef QT_DEBUG + qDebug() << "--"; + qDebug() << "DiagramPrintDialog::print printer_->resolution() before " << printer_->resolution(); + qDebug() << "DiagramPrintDialog::print screennumber " << QApplication::desktop()->screenNumber(); + #endif + + QScreen *srn = QApplication::screens().at(QApplication::desktop()->screenNumber()); + qreal dotsPerInch = (qreal)srn->logicalDotsPerInch(); + printer_->setResolution(dotsPerInch); + + #ifdef QT_DEBUG + qDebug() << "DiagramPrintDialog::print dotsPerInch " << dotsPerInch; + qDebug() << "DiagramPrintDialog::print printer_->resolution() after" << printer_->resolution(); + qDebug() << "--"; + #endif + #endif +#endif // QPainter utiliser pour effectuer le rendu QPainter qp(printer_); Index: sources/main.cpp =================================================================== --- sources/main.cpp (revision 5241) +++ sources/main.cpp (working copy) @@ -32,14 +32,10 @@ QCoreApplication::setApplicationName("QElectroTech"); //Creation and execution of the application //HighDPI -#if QT_VERSION >= QT_VERSION_CHECK (5, 6, 0) -#if defined Q_OS_MAC - QApplication::setAttribute (Qt::AA_EnableHighDpiScaling); -#elif !defined(Q_OS_MAC) - QApplication::setAttribute (Qt::AA_DisableHighDpiScaling); +#if QT_VERSION >= QT_VERSION_CHECK(5, 6, 0) + QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling); #else - qputenv("QT_DEVICE_PIXEL_RATIO", QByteArray("1")); + qputenv("QT_DEVICE_PIXEL_RATIO", QByteArray("auto")); #endif -#endif return(QETApp(argc, argv).exec()); }