diff options
| author | Mikkel Krautz <mikkel@krautz.dk> | 2013-06-25 23:00:39 +0400 |
|---|---|---|
| committer | Mikkel Krautz <mikkel@krautz.dk> | 2013-06-29 18:56:41 +0400 |
| commit | 4bbc56119e72742f260ab4c1727848afafcd0a88 (patch) | |
| tree | b8d62ecbf29019a0a810f035a7470a5618adef62 /plugins | |
| parent | 26b05974aa7d9da0ce250b2b6a2ec9b78cc7b1a7 (diff) | |
mumble: fix Linux build for Qt 4 and Qt 5.
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/manual/manual.cpp | 18 |
1 files changed, 17 insertions, 1 deletions
diff --git a/plugins/manual/manual.cpp b/plugins/manual/manual.cpp index cf5a09666..6c5ca541c 100644 --- a/plugins/manual/manual.cpp +++ b/plugins/manual/manual.cpp @@ -247,10 +247,18 @@ static void unlock() { static void config(HWND h) { if (mDlg) { +#if defined(Q_OS_WIN) && QT_VERSION >= 0x050000 mDlg->setParent(QWidget::find(reinterpret_cast<WId>(h)), Qt::Dialog); +#else + mDlg->setParent(QWidget::find(h), Qt::Dialog); +#endif mDlg->qpbUnhinge->setEnabled(true); } else { +#if defined(Q_OS_WIN) && QT_VERSION >= 0x050000 mDlg = new Manual(QWidget::find(reinterpret_cast<WId>(h))); +#else + mDlg = new Manual(QWidget::find(h)); +#endif } mDlg->show(); @@ -288,7 +296,15 @@ static std::wstring description(L"Manual placement plugin"); static std::wstring shortname(L"Manual placement"); static void about(HWND h) { - QMessageBox::about(QWidget::find(reinterpret_cast<WId>(h)), QString::fromStdWString(description), QString::fromStdWString(longdesc())); + QMessageBox::about( +#if defined(Q_OS_WIN) && QT_VERSION >= 0x050000 + QWidget::find(reinterpret_cast<WId>(h)), +#else + QWidget::find(h), +#endif + QString::fromStdWString(description), + QString::fromStdWString(longdesc()) + ); } static MumblePlugin manual = { |