4 files changed, 15 insertions, 5 deletions
diff --git a/src/printsupport/dialogs/qabstractpagesetupdialog.h b/src/printsupport/dialogs/qabstractpagesetupdialog.h
index fce0d883dc..7f9286b676 100644
--- a/src/printsupport/dialogs/qabstractpagesetupdialog.h
+++ b/src/printsupport/dialogs/qabstractpagesetupdialog.h
@@ -54,7 +54,7 @@ QT_BEGIN_NAMESPACE
 class QAbstractPageSetupDialogPrivate;
 class QPrinter;
 
-// ### Qt 5: Remove this class
+// ### QtPrintNG: merge this class with QPageSetupDialog
 class Q_PRINTSUPPORT_EXPORT QAbstractPageSetupDialog : public QDialog
 {
     Q_DECLARE_PRIVATE(QAbstractPageSetupDialog)
diff --git a/src/printsupport/dialogs/qabstractprintdialog.h b/src/printsupport/dialogs/qabstractprintdialog.h
index 564216aa26..9d7318eedf 100644
--- a/src/printsupport/dialogs/qabstractprintdialog.h
+++ b/src/printsupport/dialogs/qabstractprintdialog.h
@@ -54,7 +54,7 @@ QT_BEGIN_NAMESPACE
 class QAbstractPrintDialogPrivate;
 class QPrinter;
 
-// ### Qt 5: remove this class
+// ### QtPrintNG: merge this class with QPrintDialog
 class Q_PRINTSUPPORT_EXPORT QAbstractPrintDialog : public QDialog
 {
     Q_DECLARE_PRIVATE(QAbstractPrintDialog)
diff --git a/src/printsupport/dialogs/qprintdialog_unix.cpp b/src/printsupport/dialogs/qprintdialog_unix.cpp
index 75c9664d1d..f7689c1620 100644
--- a/src/printsupport/dialogs/qprintdialog_unix.cpp
+++ b/src/printsupport/dialogs/qprintdialog_unix.cpp
@@ -825,7 +825,7 @@ void QUnixPrintWidgetPrivate::applyPrinterProperties(QPrinter *p)
         return;
     printer = p;
     if (p->outputFileName().isEmpty()) {
-        QString home = QString::fromLocal8Bit(qgetenv("HOME").constData());
+        QString home = QDir::homePath();
         QString cur = QDir::currentPath();
         if (home.at(home.length()-1) != QLatin1Char('/'))
             home += QLatin1Char('/');
diff --git a/src/printsupport/kernel/qplatformprintersupport_qpa.cpp b/src/printsupport/kernel/qplatformprintersupport_qpa.cpp
index b6f65ee893..1ed28b8090 100644
--- a/src/printsupport/kernel/qplatformprintersupport_qpa.cpp
+++ b/src/printsupport/kernel/qplatformprintersupport_qpa.cpp
@@ -49,6 +49,16 @@
 
 QT_BEGIN_NAMESPACE
 
+/*!
+    \class QPlatformPrinterSupport
+    \since 5.0
+    \internal
+    \preliminary
+    \ingroup qpa
+
+    \brief The QPlatformPrinterSupport class provides an abstraction for print support.
+ */
+
 QPlatformPrinterSupport::QPlatformPrinterSupport()
 {
 }
@@ -128,9 +138,9 @@ void QPlatformPrinterSupport::setPrinterInfoCupsPrinterIndex(QPrinterInfo *p, in
     Converts QSizeF in millimeters to a predefined PaperSize (returns Custom if
     the size isn't a standard size)
 */
+extern QPrinter::PaperSize qSizeFTopaperSize(const QSizeF &);
 QPrinter::PaperSize QPlatformPrinterSupport::convertQSizeFToPaperSize(const QSizeF &sizef)
 {
-    extern QPrinter::PaperSize qSizeFTopaperSize(const QSizeF &);
     return qSizeFTopaperSize(sizef);
 }
 
@@ -138,9 +148,9 @@ QPrinter::PaperSize QPlatformPrinterSupport::convertQSizeFToPaperSize(const QSiz
     Converts a predefined PaperSize to a QSizeF in millimeters (returns
     QSizeF(0.0, 0.0) if PaperSize is Custom)
 */
+extern QSizeF qt_paperSizeToQSizeF(QPrinter::PaperSize size);
 QSizeF QPlatformPrinterSupport::convertPaperSizeToQSizeF(QPrinter::PaperSize paperSize)
 {
-    extern QSizeF qt_paperSizeToQSizeF(QPrinter::PaperSize size);
     return qt_paperSizeToQSizeF(paperSize);
 }