diff options
Diffstat (limited to 'src/printsupport/dialogs')
-rw-r--r-- | src/printsupport/dialogs/qabstractpagesetupdialog.h | 2 | ||||
-rw-r--r-- | src/printsupport/dialogs/qabstractprintdialog.h | 2 | ||||
-rw-r--r-- | src/printsupport/dialogs/qprintdialog_unix.cpp | 2 |
3 files changed, 3 insertions, 3 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('/'); |