diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-04-21 11:33:06 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-04-21 11:33:06 (GMT) |
| commit | e2173fcede540c2042e240942b8ba8221ff613e3 (patch) | |
| tree | 0f985f91c4a4f48002ec38f1761ce67ba47e9681 /doc/src/examples/customwidgetplugin.qdoc | |
| parent | 3fdfbe1731c4e6a072a905bf341b7fab17cc27d3 (diff) | |
| parent | 1e4d824462b44315944a27ec328f7e400a67c96c (diff) | |
| download | Qt-e2173fcede540c2042e240942b8ba8221ff613e3.zip Qt-e2173fcede540c2042e240942b8ba8221ff613e3.tar.gz Qt-e2173fcede540c2042e240942b8ba8221ff613e3.tar.bz2 | |
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-water-team
* 'master' of git://scm.dev.nokia.troll.no/qt/qt-water-team: (819 commits)
Fix tst_QTableWidget::task219380_removeLastRow
Make sure #ifdef'd tests still have main() function
Long live QRawFont!
QtDBus: Add unit tests for QDBusAbstractAdaptor
QtDBus: Add unit tests for QDBusInterface
QtDBus: Add unit tests for QDBusAbstractInterface
QtDBus: Register QDBusServer connection name in QDBusConnectionManager
QtDBus: Skip bus name check for peer-to-peer connection
QtDBus: Fix minor coding style issues
QtDBus: Add default constructor to QDBusServer
QtDBus: Add unit tests for peer-to-peer connection
QtDBus: Add method QDBusConnection::disconnectFromPeer()
QtDBus: Add method QDBusConnection::connectToPeer()
QtDBus: Fix QDBusConnection::disconnectFromBus() for peer-to-peer connections
QtDBus: Fix bus in peer-to-peer connections should not be used
QtDBus: Fix empty service name in peer-to-peer connections
QtDBus: Fix registering objects using path '/' in peer-to-peer connections
QtDBus: Fix QDBusServer to handle correctly new dbus connections
QtDBus: Cleaning comments, spacing, etc.
Use s/static/Q_GLOBAL_STATIC/g in QScroller
...
Diffstat (limited to 'doc/src/examples/customwidgetplugin.qdoc')
| -rw-r--r-- | doc/src/examples/customwidgetplugin.qdoc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/src/examples/customwidgetplugin.qdoc b/doc/src/examples/customwidgetplugin.qdoc index f972500..5b6aab6 100644 --- a/doc/src/examples/customwidgetplugin.qdoc +++ b/doc/src/examples/customwidgetplugin.qdoc @@ -89,7 +89,7 @@ target path for the project and adding it to the list of items to install: - \snippet doc/src/snippets/code/doc_src_examples_customwidgetplugin.qdoc 0 + \snippet doc/src/snippets/code/doc_src_examples_customwidgetplugin.pro 0 The custom widget is created as a library, and will be installed alongside the other \QD plugins when the project is installed |