diff options
| author | Jørgen Lind <jorgen.lind@nokia.com> | 2011-08-04 09:14:17 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-08-04 09:14:17 +0200 |
| commit | 673160b9fd7b9a75336ba293dda7e64f3d732a80 (patch) | |
| tree | b37e0216a090fbc9ac19dd55ca5e2ba1af1ef7cb /src/widgets | |
| parent | 9a652ed802d5ec1114ba97ad86eca8d2f25c53d9 (diff) | |
| parent | 92c998afb66a2ec900d50cab57929c0a97ad46ac (diff) | |
Merge "Merge remote branch 'gerrit/master' into refactor" into refactor
Diffstat (limited to 'src/widgets')
| -rw-r--r-- | src/widgets/platforms/mac/qrawfont_mac.cpp | 2 | ||||
| -rw-r--r-- | src/widgets/platforms/win/qrawfont_win.cpp | 8 | ||||
| -rw-r--r-- | src/widgets/platforms/x11/qkeymapper_x11.cpp | 2 | ||||
| -rw-r--r-- | src/widgets/widgets/qtabwidget.h | 3 |
4 files changed, 9 insertions, 6 deletions
diff --git a/src/widgets/platforms/mac/qrawfont_mac.cpp b/src/widgets/platforms/mac/qrawfont_mac.cpp index df68eb7e7a..40c719a1af 100644 --- a/src/widgets/platforms/mac/qrawfont_mac.cpp +++ b/src/widgets/platforms/mac/qrawfont_mac.cpp @@ -55,7 +55,7 @@ void QRawFontPrivate::platformCleanUp() extern int qt_defaultDpi(); void QRawFontPrivate::platformLoadFromData(const QByteArray &fontData, - int pixelSize, + qreal pixelSize, QFont::HintingPreference hintingPreference) { // Mac OS X ignores it diff --git a/src/widgets/platforms/win/qrawfont_win.cpp b/src/widgets/platforms/win/qrawfont_win.cpp index 6c62673b54..d8aa557975 100644 --- a/src/widgets/platforms/win/qrawfont_win.cpp +++ b/src/widgets/platforms/win/qrawfont_win.cpp @@ -529,7 +529,8 @@ void QRawFontPrivate::platformCleanUp() { if (fontHandle != NULL) { if (ptrRemoveFontMemResourceEx == NULL) { - void *func = QSystemLibrary::resolve(QLatin1String("gdi32"), "RemoveFontMemResourceEx"); + QFunctionPointer func = + QSystemLibrary::resolve(QLatin1String("gdi32"), "RemoveFontMemResourceEx"); ptrRemoveFontMemResourceEx = reinterpret_cast<QRawFontPrivate::PtrRemoveFontMemResourceEx>(func); } @@ -545,7 +546,7 @@ void QRawFontPrivate::platformCleanUp() } void QRawFontPrivate::platformLoadFromData(const QByteArray &_fontData, - int pixelSize, + qreal pixelSize, QFont::HintingPreference hintingPreference) { QByteArray fontData(_fontData); @@ -572,7 +573,8 @@ void QRawFontPrivate::platformLoadFromData(const QByteArray &_fontData, } if (ptrAddFontMemResourceEx == NULL || ptrRemoveFontMemResourceEx == NULL) { - void *func = QSystemLibrary::resolve(QLatin1String("gdi32"), "RemoveFontMemResourceEx"); + QFunctionPointer func = + QSystemLibrary::resolve(QLatin1String("gdi32"), "RemoveFontMemResourceEx"); ptrRemoveFontMemResourceEx = reinterpret_cast<QRawFontPrivate::PtrRemoveFontMemResourceEx>(func); diff --git a/src/widgets/platforms/x11/qkeymapper_x11.cpp b/src/widgets/platforms/x11/qkeymapper_x11.cpp index e243716f6a..455840f8b2 100644 --- a/src/widgets/platforms/x11/qkeymapper_x11.cpp +++ b/src/widgets/platforms/x11/qkeymapper_x11.cpp @@ -513,7 +513,7 @@ void QKeyMapperPrivate::clearMappings() // ### ??? // if (keyboardLayoutName.isEmpty()) - // qWarning("Qt: unable to determine keyboard layout, please talk to qt-bugs@trolltech.com"); ? + // qWarning("Qt: unable to determine keyboard layout, please talk to qt-info@nokia.com"); ? keyboardInputLocale = q_getKeyboardLocale(layoutName, variantName); keyboardInputDirection = keyboardInputLocale.textDirection(); diff --git a/src/widgets/widgets/qtabwidget.h b/src/widgets/widgets/qtabwidget.h index 447560f332..899b7a5dba 100644 --- a/src/widgets/widgets/qtabwidget.h +++ b/src/widgets/widgets/qtabwidget.h @@ -148,6 +148,8 @@ public: void clear(); + QTabBar* tabBar() const; + public Q_SLOTS: void setCurrentIndex(int index); void setCurrentWidget(QWidget *widget); @@ -165,7 +167,6 @@ protected: void keyPressEvent(QKeyEvent *); void paintEvent(QPaintEvent *); void setTabBar(QTabBar *); - QTabBar* tabBar() const; void changeEvent(QEvent *); bool event(QEvent *); void initStyleOption(QStyleOptionTabWidgetFrame *option) const; |