Merge branch 'master' of git@scm.dev.nokia.troll.no:creator/mainline

This commit is contained in:
hjk
2009-01-07 17:41:43 +01:00

View File

@@ -260,9 +260,9 @@ void CompletionWidget::updatePositionAndSize(int startPos)
const QRect cursorRect = m_editor->cursorRect(startPos); const QRect cursorRect = m_editor->cursorRect(startPos);
const QDesktopWidget *desktop = QApplication::desktop(); const QDesktopWidget *desktop = QApplication::desktop();
#ifdef Q_OS_MAC #ifdef Q_OS_MAC
const QRect screen = desktop->availableGeometry(desktop->screenNumber(this)); const QRect screen = desktop->availableGeometry(desktop->screenNumber(m_editorWidget));
#else #else
const QRect screen = desktop->screenGeometry(desktop->screenNumber(this)); const QRect screen = desktop->screenGeometry(desktop->screenNumber(m_editorWidget));
#endif #endif
QPoint pos = cursorRect.bottomLeft(); QPoint pos = cursorRect.bottomLeft();