diff options
| author | Michael Brasser <michael.brasser@nokia.com> | 2009-07-02 03:40:10 (GMT) |
|---|---|---|
| committer | Michael Brasser <michael.brasser@nokia.com> | 2009-07-02 03:40:10 (GMT) |
| commit | fcfeee14047b87eeb4de49188a997fbfeed73773 (patch) | |
| tree | 8e5f732783a90b2187728f5e955efb11304a420c /doc/src/snippets | |
| parent | 8aba610c22c44bf36eb2e539a06b65753c48bbc2 (diff) | |
| parent | 6c9647f6673fd5738001c5bbe416b116442fbc41 (diff) | |
| download | Qt-fcfeee14047b87eeb4de49188a997fbfeed73773.zip Qt-fcfeee14047b87eeb4de49188a997fbfeed73773.tar.gz Qt-fcfeee14047b87eeb4de49188a997fbfeed73773.tar.bz2 | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declarativeui
Conflicts:
configure.exe
src/gui/kernel/qevent.cpp
src/gui/kernel/qevent_p.h
tools/qdoc3/codemarker.cpp
tools/qdoc3/cppcodemarker.cpp
tools/qdoc3/generator.cpp
Diffstat (limited to 'doc/src/snippets')
| -rw-r--r-- | doc/src/snippets/code/src_gui_qproxystyle.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/doc/src/snippets/code/src_gui_qproxystyle.cpp b/doc/src/snippets/code/src_gui_qproxystyle.cpp index a9c55b3..46a2a5f 100644 --- a/doc/src/snippets/code/src_gui_qproxystyle.cpp +++ b/doc/src/snippets/code/src_gui_qproxystyle.cpp @@ -3,7 +3,7 @@ class MyProxyStyle : public QProxyStyle { public: - int styleHint(StyleHint hint, const QStyleOption *option = 0, + int styleHint(StyleHint hint, const QStyleOption *option = 0, const QWidget *widget = 0, QStyleHintReturn *returnData = 0) const { if (hint == QStyle::SH_UnderlineShortcut) @@ -18,7 +18,7 @@ public: #include "textedit.h" #include <QApplication> #include <QProxyStyle> - + class MyProxyStyle : public QProxyStyle { public: @@ -30,16 +30,16 @@ class MyProxyStyle : public QProxyStyle return QProxyStyle::styleHint(hint, option, widget, returnData); } }; - + int main(int argc, char **argv) { Q_INIT_RESOURCE(textedit); - + QApplication a(argc, argv); a.setStyle(new MyProxyStyle); TextEdit mw; mw.resize(700, 800); - mw.show(); + mw.show(); //... } //! [1] |