diff options
author | Jarek Kobus <jkobus@trolltech.com> | 2009-04-02 13:08:25 (GMT) |
---|---|---|
committer | Jarek Kobus <jkobus@trolltech.com> | 2009-04-02 13:08:25 (GMT) |
commit | f399569248c6bdc9cb828471fe6bcc66b90c4535 (patch) | |
tree | ba7d20c1cf37e2152094ee43af6818823347d52a /doc/src/snippets/code | |
parent | 2b47dac1f7e0822e9ac2ef1ce98746e35faf995d (diff) | |
parent | c02ad8a6f03fb2c23e854783e7620a5a43d991c2 (diff) | |
download | Qt-f399569248c6bdc9cb828471fe6bcc66b90c4535.zip Qt-f399569248c6bdc9cb828471fe6bcc66b90c4535.tar.gz Qt-f399569248c6bdc9cb828471fe6bcc66b90c4535.tar.bz2 |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt
Diffstat (limited to 'doc/src/snippets/code')
-rw-r--r-- | doc/src/snippets/code/src_corelib_global_qglobal.cpp | 8 | ||||
-rw-r--r-- | doc/src/snippets/code/src_corelib_kernel_qmetatype.cpp | 2 | ||||
-rw-r--r-- | doc/src/snippets/code/src_gui_util_qdesktopservices.cpp | 5 |
3 files changed, 13 insertions, 2 deletions
diff --git a/doc/src/snippets/code/src_corelib_global_qglobal.cpp b/doc/src/snippets/code/src_corelib_global_qglobal.cpp index 72663e9..287181a 100644 --- a/doc/src/snippets/code/src_corelib_global_qglobal.cpp +++ b/doc/src/snippets/code/src_corelib_global_qglobal.cpp @@ -456,3 +456,11 @@ class MyClass : public QObject //! [45] QWidget w = QWidget(); //! [45] + +//! [46] + // Instead of comparing with 0.0 + qFuzzyCompare(0.0,1.0e-200); // This will return false + // Compare adding 1 to both values will fix the problem + qFuzzyCompare(1 + 0.0, 1 + 1.0e-200); // This will return true +//! [46] + diff --git a/doc/src/snippets/code/src_corelib_kernel_qmetatype.cpp b/doc/src/snippets/code/src_corelib_kernel_qmetatype.cpp index 355a237..783852b 100644 --- a/doc/src/snippets/code/src_corelib_kernel_qmetatype.cpp +++ b/doc/src/snippets/code/src_corelib_kernel_qmetatype.cpp @@ -33,7 +33,7 @@ MyStruct s2 = var.value<MyStruct>(); //! [3] int id = QMetaType::type("MyClass"); -if (id != -1) { +if (id == 0) { void *myClassPtr = QMetaType::construct(id); ... QMetaType::destroy(id, myClassPtr); diff --git a/doc/src/snippets/code/src_gui_util_qdesktopservices.cpp b/doc/src/snippets/code/src_gui_util_qdesktopservices.cpp index a9c630b..5001984 100644 --- a/doc/src/snippets/code/src_gui_util_qdesktopservices.cpp +++ b/doc/src/snippets/code/src_gui_util_qdesktopservices.cpp @@ -11,7 +11,10 @@ public slots: QDesktopServices::setUrlHandler("help", helpInstance, "showHelp"); //! [0] - //! [1] mailto:user@foo.com?subject=Test&body=Just a test //! [1] + +//! [2] +QDesktopServices::openUrl(QUrl("file:///C:/Documents and Settings/All Users/Desktop", QUrl::TolerantMode)); +//! [2] |