AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging

Browse Source 
* 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging:
  Don't crash if windowmanager is not initialized
  Compile fix for 64bit Linux.
This commit is contained in:
Qt Continuous Integration System 2011-05-20 00:58:20 +10:00
commit f60b3e90e6
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/plugins/platforms/wayland/windowmanager_integration/qwaylandwindowmanagerintegration.cpp
View File

@ -79,6 +79,7 @@ void QWaylandWindowManagerIntegration::wlHandleListenerGlobal(wl_display *displa
void QWaylandWindowManagerIntegration::mapClientToProcess(long long processId)
{
wl_windowmanager_map_client_to_process(mWaylandWindowManager, (uint32_t) processId);
if (mWaylandWindowManager)
wl_windowmanager_map_client_to_process(mWaylandWindowManager, (uint32_t) processId);
}

2
tests/benchmarks/corelib/tools/qstring/main.cpp
View File

@ -921,7 +921,7 @@ static inline int ucstrncmp_short_tail(const ushort *p1, const ushort *p2, int l
return 0;
}
static inline int bsf_nonzero(register long val)
static inline int bsf_nonzero(register int val)
{
int result;
# ifdef Q_CC_GNU