diff options
author | Sergio Ahumada <sergio.ahumada@nokia.com> | 2011-08-18 06:26:06 (GMT) |
---|---|---|
committer | Sergio Ahumada <sergio.ahumada@nokia.com> | 2011-08-18 06:26:06 (GMT) |
commit | 06ef461b5374c42370fc350f53dba76a5d4c62f4 (patch) | |
tree | eb33081ef8f5f3a81c3f2ce14a73090fd610ab91 /doc | |
parent | 5e435bfcad5a05c775c9d45edbd2659c87416754 (diff) | |
parent | 4b90559d0a8b693241dd79682d0d31362497468b (diff) | |
download | Qt-06ef461b5374c42370fc350f53dba76a5d4c62f4.zip Qt-06ef461b5374c42370fc350f53dba76a5d4c62f4.tar.gz Qt-06ef461b5374c42370fc350f53dba76a5d4c62f4.tar.bz2 |
Merge remote-tracking branch 'review/master'
Diffstat (limited to 'doc')
-rw-r--r-- | doc/src/snippets/qcolumnview/main.cpp | 2 | ||||
-rw-r--r-- | doc/src/snippets/textdocument-imagedrop/main.cpp | 2 | ||||
-rw-r--r-- | doc/src/snippets/textdocument-imagedrop/textedit.h | 6 |
3 files changed, 5 insertions, 5 deletions
diff --git a/doc/src/snippets/qcolumnview/main.cpp b/doc/src/snippets/qcolumnview/main.cpp index c39a4bb..fecff12 100644 --- a/doc/src/snippets/qcolumnview/main.cpp +++ b/doc/src/snippets/qcolumnview/main.cpp @@ -76,4 +76,4 @@ int main(int argc, char *argv[]) columnView.show(); return app.exec(); -}
\ No newline at end of file +} diff --git a/doc/src/snippets/textdocument-imagedrop/main.cpp b/doc/src/snippets/textdocument-imagedrop/main.cpp index 24cd2de..0cdf3a1 100644 --- a/doc/src/snippets/textdocument-imagedrop/main.cpp +++ b/doc/src/snippets/textdocument-imagedrop/main.cpp @@ -49,4 +49,4 @@ int main(int argc, char * argv[]) textEdit->show(); return app.exec(); -}
\ No newline at end of file +} diff --git a/doc/src/snippets/textdocument-imagedrop/textedit.h b/doc/src/snippets/textdocument-imagedrop/textedit.h index 9e0492b..9db9f17 100644 --- a/doc/src/snippets/textdocument-imagedrop/textedit.h +++ b/doc/src/snippets/textdocument-imagedrop/textedit.h @@ -46,11 +46,11 @@ class TextEdit : public QTextEdit { Q_OBJECT - -public: + +public: TextEdit(QWidget *parent=0); bool canInsertFromMimeData( const QMimeData *source ) const; void insertFromMimeData( const QMimeData *source ); }; -#endif
\ No newline at end of file +#endif |