diff options
| author | Marc Mutz <marc.mutz@kdab.com> | 2012-08-09 13:43:56 (GMT) |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-04-23 11:59:42 (GMT) |
| commit | dc5db85ca4f95a0cfe682d90693d05a74af63f55 (patch) | |
| tree | 6f77a20b5c5cdfde37adc4f2d9a268a8e358378b /src | |
| parent | 527a61afacabd0e0c83fd4f9a85404fc2513a988 (diff) | |
| download | Qt-dc5db85ca4f95a0cfe682d90693d05a74af63f55.zip Qt-dc5db85ca4f95a0cfe682d90693d05a74af63f55.tar.gz Qt-dc5db85ca4f95a0cfe682d90693d05a74af63f55.tar.bz2 | |
QSystemTrayIcon: fix narrowing warning
GCC complained:
warning: narrowing conversion of
‘((QSystemTrayIconSys*)this)->QSystemTrayIconSys::<anonymous>.QWidget::winId()’
from ‘WId {aka long long unsigned int}’ to ‘long int’ inside { } [-Wnarrowing]
Cherry-picked from qtbase/55819341a9fd899c3f105bd067dd2d1528c9efef.
Change-Id: Idb4caa09be160b8fed626bb154d6bf86c1a97f1c
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/gui/util/qsystemtrayicon_x11.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/util/qsystemtrayicon_x11.cpp b/src/gui/util/qsystemtrayicon_x11.cpp index 1cf833a..df5c785 100644 --- a/src/gui/util/qsystemtrayicon_x11.cpp +++ b/src/gui/util/qsystemtrayicon_x11.cpp @@ -240,7 +240,7 @@ void QSystemTrayIconSys::addToTray() // GNOME, NET WM Specification static Atom netwm_tray_atom = XInternAtom(display, "_NET_SYSTEM_TRAY_OPCODE", False); - long l[5] = { CurrentTime, SYSTEM_TRAY_REQUEST_DOCK, winId(), 0, 0 }; + long l[5] = { CurrentTime, SYSTEM_TRAY_REQUEST_DOCK, static_cast<long>(winId()), 0, 0 }; XEvent ev; memset(&ev, 0, sizeof(ev)); ev.xclient.type = ClientMessage; |