diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2009-11-17 14:27:44 (GMT) |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2009-11-17 14:27:44 (GMT) |
| commit | e76c4c03c98091ee3e509a0f9b64daba472567ff (patch) | |
| tree | c110868f3529320162315b9d082855203df641f4 | |
| parent | 5d4049764e6747f5e6336826de505b872a26bea4 (diff) | |
| parent | 60a37296cf553fbfb96afc90c7ce84cd386bc151 (diff) | |
| download | Qt-e76c4c03c98091ee3e509a0f9b64daba472567ff.zip Qt-e76c4c03c98091ee3e509a0f9b64daba472567ff.tar.gz Qt-e76c4c03c98091ee3e509a0f9b64daba472567ff.tar.bz2 | |
Merge remote branch 'tools-team/4.6' into 4.6
| -rw-r--r-- | doc/src/snippets/code/src_gui_painting_qregion_unix.cpp | 6 | ||||
| -rw-r--r-- | src/gui/styles/qgtkstyle.cpp | 4 | ||||
| -rw-r--r-- | src/script/bridge/qscriptdeclarativeclass.cpp | 1 |
3 files changed, 2 insertions, 9 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] 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); 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 |