Merge commit 'origin/1.2'

This commit is contained in:
con
2009-06-04 10:59:01 +02:00
60 changed files with 380 additions and 308 deletions

View File

@@ -405,7 +405,7 @@ void FunctionArgumentWidget::updateHintText()
m_popupFrame->setFixedWidth(m_popupFrame->minimumSizeHint().width());
const QDesktopWidget *desktop = QApplication::desktop();
#ifdef Q_OS_MAC
#ifdef Q_WS_MAC
const QRect screen = desktop->availableGeometry(desktop->screenNumber(m_editor->widget()));
#else
const QRect screen = desktop->screenGeometry(desktop->screenNumber(m_editor->widget()));