Merge remote branch 'gerrit/master' into refactor

Conflicts:
	examples/opengl/cube/main.cpp
	examples/widgets/applicationicon/main.cpp
	examples/widgets/orientation/main.cpp
	src/gui/image/qicon.cpp
	src/gui/image/qimage.h
	src/gui/image/qpixmap.h
	src/gui/image/qpixmap_mac.cpp
	src/gui/kernel/qapplication.cpp
	src/gui/kernel/qpalette.cpp
	src/gui/kernel/qwidget.cpp
	src/gui/styles/qmacstyle_mac.mm
	src/gui/widgets/qmenubar.cpp
	src/gui/widgets/qslider.cpp
	src/opengl/qwindowsurface_gl.cpp
	tests/auto/qvariant/qvariant.pro
	tests/benchmarks/corelib/kernel/qobject/qobject.pro
	tests/benchmarks/gui/animation/qanimation/qanimation.pro
	tests/benchmarks/gui/graphicsview/qgraphicsanchorlayout/qgraphicsanchorlayout.pro
	tests/benchmarks/gui/graphicsview/qgraphicsitem/qgraphicsitem.pro
	tests/benchmarks/gui/graphicsview/qgraphicsscene/qgraphicsscene.pro
	tests/benchmarks/gui/graphicsview/qgraphicsview/qgraphicsview.pro
	tests/benchmarks/gui/graphicsview/qgraphicswidget/qgraphicswidget.pro
	tests/benchmarks/gui/image/qimagereader/qimagereader.pro
	tests/benchmarks/gui/itemviews/qtableview/qtableview.pro
	tests/benchmarks/gui/kernel/qapplication/qapplication.pro
	tests/benchmarks/gui/kernel/qwidget/qwidget.pro
	tests/benchmarks/gui/painting/qpainter/qpainter.pro
	tests/benchmarks/gui/painting/qtbench/qtbench.pro
	tests/benchmarks/gui/painting/qtracebench/qtracebench.pro
	tests/benchmarks/gui/text/qtext/qtext.pro

Change-Id: I4b911c795ecb29d73b6a7fd18819711b49478a30

7 files changed, 3 insertions, 140 deletions

diff --git a/src/widgets/platforms/mac/qfontdatabase_mac.cpp b/src/widgets/platforms/mac/qfontdatabase_mac.cpp
index e1e59b79eb..6876fae630 100644
--- a/src/widgets/platforms/mac/qfontdatabase_mac.cpp
+++ b/src/widgets/platforms/mac/qfontdatabase_mac.cpp
@@ -334,7 +334,7 @@ void QFontDatabase::load(const QFontPrivate *d, int script)
         return;
 
     // set it to the actual pointsize, so QFontInfo will do the right thing
-    req.pointSize = qRound(qt_mac_pointsize(d->request, d->dpi));
+    req.pointSize = qt_mac_pointsize(d->request, d->dpi);
 
     QFontEngine *e = QFontCache::instance()->findEngine(key);
     if(!e && qt_enable_test_font && req.family == QLatin1String("__Qt__Box__Engine__")) {
diff --git a/src/widgets/platforms/mac/qfontengine_coretext.mm b/src/widgets/platforms/mac/qfontengine_coretext.mm
index 303da8d363..9943229787 100644
--- a/src/widgets/platforms/mac/qfontengine_coretext.mm
+++ b/src/widgets/platforms/mac/qfontengine_coretext.mm
@@ -750,8 +750,8 @@ QImage QCoreTextFontEngine::imageForGlyph(glyph_t glyph, QFixed subPixelPosition
 
     CGContextSetFont(ctx, cgFont);
 
-    qreal pos_x = -br.x.toReal() + subPixelPosition.toReal();
-    qreal pos_y = im.height() + br.y.toReal() - 1;
+    qreal pos_x = -br.x.truncate() + subPixelPosition.toReal();
+    qreal pos_y = im.height() + br.y.toReal();
     CGContextSetTextPosition(ctx, pos_x, pos_y);
 
     CGSize advance;
diff --git a/src/widgets/widgets/qcheckbox.cpp b/src/widgets/widgets/qcheckbox.cpp
index 9904a15ac0..c6d1317147 100644
--- a/src/widgets/widgets/qcheckbox.cpp
+++ b/src/widgets/widgets/qcheckbox.cpp
@@ -135,15 +135,6 @@ public:
 */
 
 /*!
-    \enum QCheckBox::ToggleState
-    \compat
-
-    \value Off  Use Qt::Unchecked instead.
-    \value NoChange  Use Qt::PartiallyChecked instead.
-    \value On  Use Qt::Checked instead.
-*/
-
-/*!
     \fn void QCheckBox::stateChanged(int state)
 
     This signal is emitted whenever the check box's state changes, i.e.
@@ -423,25 +414,4 @@ QCheckBox::QCheckBox(const QString &text, QWidget *parent, const char* name)
 #endif
 
 
-/*!
-    \fn void QCheckBox::setNoChange()
-    \compat
-
-    Use setCheckState() instead.
-*/
-
-/*!
-    \fn void QCheckBox::setState(ToggleState state)
-    \compat
-
-    Use setCheckState() instead.
-*/
-
-/*!
-    \fn QCheckBox::ToggleState QCheckBox::state() const
-    \compat
-
-    Use checkState() instead.
-*/
-
 QT_END_NAMESPACE
diff --git a/src/widgets/widgets/qcombobox.cpp b/src/widgets/widgets/qcombobox.cpp
index 621cae92da..bf6730e9e3 100644
--- a/src/widgets/widgets/qcombobox.cpp
+++ b/src/widgets/widgets/qcombobox.cpp
@@ -3217,63 +3217,6 @@ QVariant QComboBox::inputMethodQuery(Qt::InputMethodQuery query) const
 */
 
 /*!
-    \fn QComboBox::InsertPolicy QComboBox::insertionPolicy() const
-    \compat
-
-    Use QComboBox::insertPolicy instead.
-*/
-
-/*!
-    \fn void QComboBox::setInsertionPolicy(InsertPolicy policy)
-    \compat
-
-    Use QComboBox::insertPolicy instead.
-*/
-
-/*!
-    \fn void QComboBox::setCurrentText(const QString &text)
-    \compat
-
-    Use setItemText() instead.
-
-    \sa currentIndex()
-*/
-
-/*!
-    \fn QString QComboBox::text(int index) const
-    \compat
-
-    Use itemText() instead.
-*/
-
-/*!
-    \fn QPixmap QComboBox::pixmap(int index) const
-    \compat
-
-    Use itemIcon() instead.
-*/
-
-/*!
-    \fn void QComboBox::insertStringList(const QStringList &list, int index)
-    \compat
-
-    Use insertItems() instead.
-*/
-
-/*!
-    \fn void QComboBox::insertItem(const QString &text, int index)
-    \compat
-*/
-
-/*!
-    \fn void QComboBox::clearEdit()
-    \compat
-
-    Use clearEditText() instead.
-*/
-
-
-/*!
     \property QComboBox::frame
     \brief whether the combo box draws itself with a frame
 
@@ -3351,13 +3294,6 @@ void QComboBox::setModelColumn(int visibleColumn)
     Use the editTextChanged(const QString &text) signal instead.
 */
 
-/*!
-    \typedef QComboBox::Policy
-    \compat
-
-    Use QComboBox::InsertPolicy instead.
-*/
-
 QT_END_NAMESPACE
 
 #include "moc_qcombobox.cpp"
diff --git a/src/widgets/widgets/qsplashscreen.cpp b/src/widgets/widgets/qsplashscreen.cpp
index 2da4a8b33d..e051878db9 100644
--- a/src/widgets/widgets/qsplashscreen.cpp
+++ b/src/widgets/widgets/qsplashscreen.cpp
@@ -297,21 +297,6 @@ void QSplashScreen::drawContents(QPainter *painter)
     }
 }
 
-/*!
-    \fn void QSplashScreen::message(const QString &message, int alignment,
-                                    const QColor &color)
-    \compat
-
-    Use showMessage() instead.
-*/
-
-/*!
-    \fn void QSplashScreen::clear()
-    \compat
-
-    Use clearMessage() instead.
-*/
-
 /*! \reimp */
 bool QSplashScreen::event(QEvent *e)
 {
diff --git a/src/widgets/widgets/qsplitter.cpp b/src/widgets/widgets/qsplitter.cpp
index 1222b07354..5d5897311b 100644
--- a/src/widgets/widgets/qsplitter.cpp
+++ b/src/widgets/widgets/qsplitter.cpp
@@ -1532,21 +1532,6 @@ void QSplitter::setOpaqueResize(bool on)
 */
 
 /*!
-    \enum QSplitter::ResizeMode
-    \compat
-
-    This enum describes the different resizing behaviors child
-    widgets can have:
-
-    \value Auto   The widget will be resized according to the stretch factors set in its sizePolicy().
-    \value Stretch  The widget will be resized when the splitter itself is resized.
-    \value KeepSize  QSplitter will try to keep the widget's size unchanged.
-    \value FollowSizeHint  QSplitter will resize the widget when the widget's size hint changes.
-
-    Use setStretchFactor() instead.
-*/
-
-/*!
     \fn void QSplitter::setCollapsible(QWidget *widget, bool collapsible)
 
     Use setCollapsible(indexOf(\a widget, \a collapsible)) instead.
diff --git a/src/widgets/widgets/qtoolbutton.cpp b/src/widgets/widgets/qtoolbutton.cpp
index 0d765d25cd..f023f8af0f 100644
--- a/src/widgets/widgets/qtoolbutton.cpp
+++ b/src/widgets/widgets/qtoolbutton.cpp
@@ -464,19 +464,6 @@ QSize QToolButton::minimumSizeHint() const
 }
 
 /*!
-    \enum QToolButton::TextPosition
-    \compat
-
-    This enum describes the position of the tool button's text label in
-    relation to the tool button's icon.
-
-    \value BesideIcon The text appears beside the icon.
-    \value BelowIcon The text appears below the icon.
-    \omitvalue Right
-    \omitvalue Under
-*/
-
-/*!
     \property QToolButton::toolButtonStyle
     \brief whether the tool button displays an icon only, text only,
     or text beside/below the icon.