From 81ed8051e0ee027f1a74aa75cc0cfd2b3ae6377f Mon Sep 17 00:00:00 2001 From: Jarek Kobus Date: Wed, 11 Nov 2009 17:40:56 +0100 Subject: Fix compilation with namespace RevBy: hjk --- src/script/bridge/qscriptdeclarativeclass.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/script/bridge/qscriptdeclarativeclass.cpp b/src/script/bridge/qscriptdeclarativeclass.cpp index b5d9bf5..49e0919 100644 --- a/src/script/bridge/qscriptdeclarativeclass.cpp +++ b/src/script/bridge/qscriptdeclarativeclass.cpp @@ -354,3 +354,4 @@ QScriptContext *QScriptDeclarativeClass::context() const return d_ptr->context; } +QT_END_NAMESPACE -- cgit v0.12 From fac026f1f7f0eff03f8ca8e05d760d639aeabcaa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thorbj=C3=B8rn=20Lindeijer?= Date: Sun, 15 Nov 2009 21:46:56 +0100 Subject: doc: Removed usage of Qt 3 support member from example code This code is used in the documentation for QRegion::isEmpty. It shouldn't mention isNull, since isEmpty replaces it in the case of QRegion (unlike QRect). --- doc/src/snippets/code/src_gui_painting_qregion_unix.cpp | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/doc/src/snippets/code/src_gui_painting_qregion_unix.cpp b/doc/src/snippets/code/src_gui_painting_qregion_unix.cpp index fb1f363..ea42e70 100644 --- a/doc/src/snippets/code/src_gui_painting_qregion_unix.cpp +++ b/doc/src/snippets/code/src_gui_painting_qregion_unix.cpp @@ -41,19 +41,15 @@ //! [0] QRegion r1(10, 10, 20, 20); -r1.isNull(); // false r1.isEmpty(); // false -QRegion r2(40, 40, 20, 20); QRegion r3; -r3.isNull(); // true r3.isEmpty(); // true +QRegion r2(40, 40, 20, 20); r3 = r1.intersected(r2); // r3: intersection of r1 and r2 -r3.isNull(); // false r3.isEmpty(); // true r3 = r1.united(r2); // r3: union of r1 and r2 -r3.isNull(); // false r3.isEmpty(); // false //! [0] -- cgit v0.12 From 60a37296cf553fbfb96afc90c7ce84cd386bc151 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thorbj=C3=B8rn=20Lindeijer?= Date: Mon, 16 Nov 2009 17:56:13 +0100 Subject: Fixed QGtkStyle menu bars being one pixel too narrow Probably due to the font height being reduced by one pixel earlier, the menu bar now seems to need both pixels added by the QCleanLooks style. Previously it was ignoring this and adding only one, resulting in a menu bar that was one pixel too narrow compared to a real GTK one. Reviewed-by: mae --- src/gui/styles/qgtkstyle.cpp | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/gui/styles/qgtkstyle.cpp b/src/gui/styles/qgtkstyle.cpp index 1c78a47..34c7ac8 100644 --- a/src/gui/styles/qgtkstyle.cpp +++ b/src/gui/styles/qgtkstyle.cpp @@ -3198,10 +3198,6 @@ QSize QGtkStyle::sizeFromContents(ContentsType type, const QStyleOption *option, } break; - case CT_MenuBarItem://cleanlooks adds 2 pixels - newSize = QWindowsStyle::sizeFromContents(type, option, size, widget) + QSize(0, 1); - break; - case CT_LineEdit: { GtkWidget *gtkEntry = d->gtkWidget(QLS("GtkEntry")); newSize = size + QSize(2*gtkEntry->style->xthickness, 2*gtkEntry->style->ythickness); -- cgit v0.12