From 399c44a133b8a2a409e30c271be74c93c42d992b Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Mon, 10 Apr 2006 10:49:36 +0000 Subject: Merge from Subversion: * qt/qt-dbus.qdocconf: Update Trolltech's webpage link to something that exists (r526315) * qt/qdbusinternalfilters.cpp: Correctly detect non-scriptable slots/signals (r526316) * qt/qdbusinternalfilters.cpp: Fix the setProperty call and also return an unknown-method error if the parameters don't match for org.freedesktop.DBus.Properties. (r526842) * qt/examples/dbus.cpp: Allow passing of QVariants (r526843) * qt/qdbusintegrator.cpp: Restore the proper order of delivery: don't make method returns be delivered on priority (r528150) --- qt/qt-dbus.qdocconf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'qt/qt-dbus.qdocconf') diff --git a/qt/qt-dbus.qdocconf b/qt/qt-dbus.qdocconf index 5c5ef6ca..db9fcd6e 100644 --- a/qt/qt-dbus.qdocconf +++ b/qt/qt-dbus.qdocconf @@ -126,7 +126,7 @@ HTML.postheader = "\n" \ "
\n" \ - "\n" \ + "\n" \ "\n" \ "\n" \ "
Copyright © 2006 TrolltechCopyright © 2006 Trolltech 
QtDBus \\version
" -- cgit