diff options
| author | kh1 <karsten.heimrich@digia.com> | 2012-12-11 13:06:52 +0100 |
|---|---|---|
| committer | Karsten Heimrich <karsten.heimrich@digia.com> | 2012-12-11 14:05:44 +0100 |
| commit | c93ba0bdfc505e143c6b87cbcb7d0188670741ee (patch) | |
| tree | c99f266ba4fbd5af4e549edb791ea443ae09907f /src/libs/installer/adminauthorization_x11.cpp | |
| parent | 0615fd8fafc707bc16a9a869ae723a91a3f3f864 (diff) | |
Qt5 compile fix on Unix.
Change-Id: Ib860b9531dd74cf7022b6df77cb35aa8c3f1f0f2
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
Diffstat (limited to 'src/libs/installer/adminauthorization_x11.cpp')
| -rw-r--r-- | src/libs/installer/adminauthorization_x11.cpp | 23 |
1 files changed, 17 insertions, 6 deletions
diff --git a/src/libs/installer/adminauthorization_x11.cpp b/src/libs/installer/adminauthorization_x11.cpp index 804e14a18..7b478cc78 100644 --- a/src/libs/installer/adminauthorization_x11.cpp +++ b/src/libs/installer/adminauthorization_x11.cpp @@ -35,9 +35,9 @@ #include <QtCore/QFile> #include <QDebug> -#include <QtGui/QApplication> -#include <QtGui/QInputDialog> -#include <QtGui/QMessageBox> +#include <QApplication> +#include <QInputDialog> +#include <QMessageBox> #include <cstdlib> #include <sys/resource.h> @@ -71,7 +71,12 @@ bool AdminAuthorization::authorize() static QString getPassword(QWidget *) { - if (QApplication::type() == QApplication::GuiClient) { +#if QT_VERSION < 0x050000 + if (QApplication::type() == QApplication::GuiClient) +#else + if (qobject_cast<QApplication*> (qApp) != 0) +#endif + { bool ok = false; const QString result = QInputDialog::getText(0, QObject::tr("Authorization required"), QObject::tr("Enter your password to authorize for sudo:"), @@ -88,11 +93,17 @@ static QString getPassword(QWidget *) static void printError(QWidget *parent, const QString &value) { +#if QT_VERSION < 0x050000 if (QApplication::type() == QApplication::GuiClient) +#else + if (qobject_cast<QApplication*> (qApp) != 0) +#endif + { QMessageBox::critical(parent, QObject::tr( "Error acquiring admin rights" ), value, - QMessageBox::Ok, QMessageBox::Ok); - else + QMessageBox::Ok, QMessageBox::Ok); + } else { std::cout << value.toStdString() << std::endl; + } } bool AdminAuthorization::execute(QWidget *parent, const QString &program, const QStringList &arguments) |