summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-02-0154-356/+735
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (35 commits) Fix build due to missing auto-generated files on dbus example examples/dbus: update remotecontrolledcar example examples/dbus: update dbus-chat adaptor/interface files doc: Fix typo in QEvent::ignore() documentation doc: Fix qmake-manual warn_on/warn_off references Use X/Open LFS extensions for 64-bit support on directory iteration nano-optimizations code cleanup and styling fixes QDirPrivate: remove unused q_ptr and Q_DECLARE_PUBLIC QDir: clear internal file lists cache early QDirPrivate::setPath: always initialize the file engine optimize QDir::cd() QDirPrivate::Data: remove needless clear()-s in constructors QDir::cleanPath: strip trailing slash for "/:/" on non-win platforms QDir::entry(Info)List(): really use cached data Fix QDir::operator[] documentation Move avkon component transparency check to app initialization. Fix for symbian dialog background transparency. Assistant docs: Fix link. QtHelp docs: Fix illegal namespace name. ...
| * Merge commit 'oslo1/master' into oslo1-masterRohan McGovern2010-02-01354-6151/+10886
| |\ | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/src/getting-started/installation.qdoc src/gui/dialogs/qfiledialog_win.cpp tools/assistant/tools/assistant/centralwidget.cpp tools/assistant/tools/assistant/helpviewer.cpp
| | * Merge commit 'refs/merge-requests/388' of git://gitorious.org/qt/qt into ↵David Boddie2010-01-293-1/+209
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | integration Conflicts: examples/dbus/dbus-chat/chat_adaptor.cpp examples/dbus/dbus-chat/chat_adaptor.h examples/dbus/dbus-chat/chat_interface.cpp examples/dbus/dbus-chat/chat_interface.h examples/dbus/remotecontrolledcar/car/car_adaptor.cpp examples/dbus/remotecontrolledcar/controller/car_interface.cpp
| | | * Fix build due to missing auto-generated files on dbus exampleAdemar de Souza Reis Jr2010-01-292-0/+208
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Breakage introduced by my previous commit: a1c6fdf0fe5a51b5955ea3fc5f6c3eceee24e0f8 Signed-off-by: Ademar de Souza Reis Jr <ademar.reis@openbossa.org>
| | | * examples/dbus: update remotecontrolledcar exampleAdemar de Souza Reis Jr2010-01-299-239/+26
| | | | | | | | | | | | | | | | | | | | The example was outdated, thus causing some confusion for someone who tries to follow it.
| | | * examples/dbus: update dbus-chat adaptor/interface filesAdemar de Souza Reis Jr2010-01-294-26/+23
| | | | | | | | | | | | | | | | | | | | The example was outdated, thus causing some confusion for someone who tries to follow it.
| | | * doc: Fix typo in QEvent::ignore() documentationAdemar de Souza Reis Jr2010-01-291-1/+1
| | | | | | | | | | | | | | | | Signed-off-by: Ademar de Souza Reis Jr <ademar.reis@openbossa.org>
| | | * doc: Fix qmake-manual warn_on/warn_off referencesAdemar de Souza Reis Jr2010-01-291-2/+2
| | | | | | | | | | | | | | | | Signed-off-by: Ademar de Souza Reis Jr <ademar.reis@openbossa.org>
| | * | Use X/Open LFS extensions for 64-bit support on directory iterationJoão Abecasis2010-01-295-26/+54
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This boils down to using readdir64(_r) and struct dirent64 where available. I assumed these are available in the same platforms other such extensions are already being used. AIX uses the additional type DIR64 and opendir64/closedir64 to manipulate it. Task-number: QTBUG-2781 Reviewed-by: Thiago Macieira
| | * | nano-optimizationsRitt Konstantin2010-01-291-10/+4
| | | | | | | | | | | | | | | | | | | | Merge-request: 445 Reviewed-by: João Abecasis <joao@trolltech.com>
| | * | code cleanup and styling fixesRitt Konstantin2010-01-292-159/+108
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * remove trailing whitespaces * tabs -> whitespaces * "if(" -> "if (" * "while(" -> "while (" * "for(" -> "for (" * "for (int i.*; i++)" -> "for (int i.*; ++i)" /* looks better ;) */ * minor doc fixes Merge-request: 445 Reviewed-by: João Abecasis <joao@trolltech.com>
| | * | QDirPrivate: remove unused q_ptr and Q_DECLARE_PUBLICRitt Konstantin2010-01-291-13/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | update constructor signatures; both private and protected members became public. Merge-request: 445 Reviewed-by: João Abecasis <joao@trolltech.com>
| | * | QDir: clear internal file lists cache earlyRitt Konstantin2010-01-291-4/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the cache was invalidated (setPath, refresh, detach, etc.) then there is no sense to keep it any longer. Merge-request: 445 Reviewed-by: João Abecasis <joao@trolltech.com>
| | * | QDirPrivate::setPath: always initialize the file engineRitt Konstantin2010-01-291-9/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QDir::isRelativePath() would construct a temporary file engine just to check if we could reuse the existing one. This was also making assumptions about the inner workings of the engine, that might not be valid outside QFSFileEngine. Merge-request: 445 Reviewed-by: João Abecasis <joao@trolltech.com>
| | * | optimize QDir::cd()Ritt Konstantin2010-01-291-7/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We already create a file engine for testing if dir exists. We can also use it as source for current QDir. Merge-request: 445 Reviewed-by: João Abecasis <joao@trolltech.com>
| | * | QDirPrivate::Data: remove needless clear()-s in constructorsRitt Konstantin2010-01-291-5/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Initialize members with default values in constructor, instead. Merge-request: 445 Reviewed-by: João Abecasis <joao@trolltech.com>
| | * | QDir::cleanPath: strip trailing slash for "/:/" on non-win platformsRitt Konstantin2010-01-292-3/+13
| | | | | | | | | | | | | | | | | | | | Merge-request: 445 Reviewed-by: João Abecasis <joao@trolltech.com>
| | * | QDir::entry(Info)List(): really use cached dataRitt Konstantin2010-01-291-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The test conditions for using cached file lists were wrong and preventing list reuse unless no filters or sorting flags were previously set. Merge-request: 445 Reviewed-by: João Abecasis <joao@trolltech.com>
| | * | Fix QDir::operator[] documentationRitt Konstantin2010-01-291-4/+1
| | | | | | | | | | | | | | | | | | | | Merge-request: 445 Reviewed-by: João Abecasis <joao@trolltech.com>
| * | | Merge commit 'origin/4.6' into oslo1-masterRohan McGovern2010-02-019145-21480/+43400
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/src/deployment/deployment.qdoc doc/src/getting-started/installation.qdoc examples/assistant/simpletextviewer/findfiledialog.cpp examples/assistant/simpletextviewer/findfiledialog.h examples/assistant/simpletextviewer/mainwindow.cpp examples/webkit/fancybrowser/main.cpp src/corelib/global/qglobal.h src/gui/dialogs/qfiledialog_win.cpp src/plugins/qpluginbase.pri src/qbase.pri tests/auto/selftests/expected_cmptest.txt tests/auto/selftests/expected_crashes_3.txt tests/auto/selftests/expected_longstring.txt tests/auto/selftests/expected_maxwarnings.txt tests/auto/selftests/expected_skip.txt tools/assistant/compat/config.cpp tools/assistant/compat/config.h tools/assistant/compat/docuparser.cpp tools/assistant/compat/docuparser.h tools/assistant/compat/fontsettingsdialog.cpp tools/assistant/compat/helpdialog.cpp tools/assistant/compat/helpdialog.h tools/assistant/compat/helpdialog.ui tools/assistant/compat/helpwindow.cpp tools/assistant/compat/helpwindow.h tools/assistant/compat/index.cpp tools/assistant/compat/index.h tools/assistant/compat/lib/qassistantclient.cpp tools/assistant/compat/lib/qassistantclient.h tools/assistant/compat/main.cpp tools/assistant/compat/mainwindow.cpp tools/assistant/compat/mainwindow.h tools/assistant/compat/mainwindow.ui tools/assistant/compat/profile.cpp tools/assistant/compat/profile.h tools/assistant/compat/tabbedbrowser.cpp tools/assistant/compat/tabbedbrowser.h tools/assistant/compat/tabbedbrowser.ui tools/assistant/compat/topicchooser.cpp tools/assistant/compat/topicchooser.ui tools/assistant/lib/qhelpsearchquerywidget.cpp tools/assistant/tools/assistant/centralwidget.cpp tools/assistant/tools/assistant/doc/assistant.qdocconf tools/assistant/tools/assistant/helpviewer.cpp tools/linguist/lupdate/main.cpp tools/qdoc3/test/assistant.qdocconf tools/qdoc3/test/designer.qdocconf tools/qdoc3/test/linguist.qdocconf tools/qdoc3/test/qmake.qdocconf tools/qdoc3/test/qt-build-docs.qdocconf tools/qdoc3/test/qt.qdocconf
| | * \ \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-01-227-7/+52
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public: Move avkon component transparency check to app initialization. Fix for symbian dialog background transparency.
| | | * | | Move avkon component transparency check to app initialization.Jani Hautakangas2010-01-224-34/+23
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Sami Merila
| | | * | | Fix for symbian dialog background transparency.Jani Hautakangas2010-01-226-7/+63
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If Avkon components support transparency then dialog background is transparent enabling rounded corners. Reviewed-by: Sami Merila
| | * | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into ↵Qt Continuous Integration System2010-01-224-7/+7
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1: Assistant docs: Fix link. QtHelp docs: Fix illegal namespace name. Assistant: Set correct mime type for text documents.
| | | * \ \ \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into ↵Qt Continuous Integration System2010-01-224-7/+7
| | | |\ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1: Assistant docs: Fix link. QtHelp docs: Fix illegal namespace name. Assistant: Set correct mime type for text documents.
| | | * | | | Assistant docs: Fix link.ck2010-01-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-4607 Reviewed-by: David Boddie
| | | * | | | QtHelp docs: Fix illegal namespace name.ck2010-01-212-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-5908 Reviewed-by: kh1
| | | * | | | Assistant: Set correct mime type for text documents.ck2010-01-211-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-6796 Reviewed-by: kh1
| | * | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-01-2220-43/+116
| | |\ \ \ \ \ | | | |_|/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: QSslSocket: Take better care on how we use the SSL buffers Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( 8f5ca3ba5da63a47d4f90bbd867d3e8453443dd3 ) Revert "Make an empty QUrl also be considered non-detached (d == 0)." SSL Certificate: don't crash when the END CERTIFICATE line ends without CRLF doc: Documented the return value for QDomNode::appendChild(). QNAM HTTP: make it give some better error messages in case of socket failure. qUncompress: Fix terminating \0 Add qttracereplay.exe to gitignore Fix missing focus rect for check and radio buttons in some GTK+ themes
| | | * | | | QSslSocket: Take better care on how we use the SSL buffersMarkus Goetz2010-01-211-3/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | .. and breaking out of a loop where we should. Reviewed-by: thiago
| | | * | | | Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ↵Simon Hausmann2010-01-214-3/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ( 8f5ca3ba5da63a47d4f90bbd867d3e8453443dd3 ) Changes in WebKit/qt since the last update: * Girish: Fix positioning of ComboBox popup in QGraphicsWebView. -- https://bugs.webkit.org/show_bug.cgi?id=33887
| | | * | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6Martin Smith2010-01-2113-30/+41
| | | |\ \ \ \
| | | | * | | | Revert "Make an empty QUrl also be considered non-detached (d == 0)."Thiago Macieira2010-01-212-21/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | as agreed with Warwick. This reverts commit 089ee7094eabb2058b478f5d2f306a69f6c0b3bf.
| | | | * | | | SSL Certificate: don't crash when the END CERTIFICATE line ends without CRLFThiago Macieira2010-01-215-4/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the file/data ends in the END CERTIFICATE line without a newline, the certificate is still valid. If it's followed by anything other than a newline, then it's no longer valid. Also add another test for the BEGIN CERTIFICATE ending without newline, to ensure we don't crash there either. Reviewed-By: Peter Hartmann
| | | | * | | | QNAM HTTP: make it give some better error messages in case of socket failure.Thiago Macieira2010-01-213-5/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-By: Peter Hartmann
| | | | * | | | qUncompress: Fix terminating \0Markus Goetz2010-01-212-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: 6666 Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
| | | | * | | | Add qttracereplay.exe to gitignoreMarkus Goetz2010-01-211-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: TrustMe
| | | * | | | | doc: Documented the return value for QDomNode::appendChild().Martin Smith2010-01-211-4/+8
| | | |/ / / / | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-7498
| | | * | | | Fix missing focus rect for check and radio buttons in some GTK+ themesJens Bache-Wiig2010-01-211-3/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some themes such as Nodoka does not draw a focus rect but instead reads the focus flag on the widget itself. Hence we have to set this flag before drawing. Task-number: QTBUG-7504 Reviewed-by: thorbjorn
| | * | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-01-2112-57/+141
| | |\ \ \ \ \ | | | |_|/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public: Update symbian def files Merge from upstream Merge from upstream Fix pro file error affecting windows builds Merge TRK client changes from upstream (QtCreator)
| | | * | | | Update symbian def filesShane Kearns2010-01-216-6/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit 5464cee529a26832517607b764e805bef96ea9f1 changes 3 private class symbols. Reviewed-by: Trust Me
| | | * | | | Merge from upstreamShane Kearns2010-01-213-23/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The patch accepted upstream has the signal and slot renamed, so there is a corresponding change to main.cpp commit 53c672fb9853fef5a00285213084f02a4253e5f3 Author: Friedemann Kleint <Friedemann.Kleint@nokia.com> Date: Thu Jan 21 15:45:40 2010 +0100 trk: Handle TrkNotifyStopped in launcher. Add signal and static utility functions to parse message. Reviewed-by: Robert Loehning <robert.loehning@nokia.com> Initial-patch-by: Shane Kearns <shane.kearns@sosco.com> Task-number: QTBUG-7444
| | | * | | | Merge from upstreamShane Kearns2010-01-213-22/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The patch accepted upstream changed a parameter from QString to QStringList. So there is a corresponding change to main.cpp to use the new API. commit b1291ecfd0ab31c41783feb645c98ce42fa87aae Author: Friedemann Kleint <Friedemann.Kleint@nokia.com> Date: Thu Jan 21 12:33:34 2010 +0100 trk: Add support for command line arguments in trk::Launcher. Initial-patch-by: Shane Kearns <shane.kearns@sosco.com> Task-number: QTBUG-7444
| | | * | | | Fix pro file error affecting windows buildsShane Kearns2010-01-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: axis
| | | * | | | Merge TRK client changes from upstream (QtCreator)Shane Kearns2010-01-212-5/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | commit 1b77161e7183cdd4b5493698b4cddc727468f0f5 Author: hjk <qtc-committer@nokia.com> Date: Fri Jan 15 12:01:26 2010 +0100 debugger: clean up verbosity settings in trk adapter commit 4d7341becac684f5feb908e45d8b1756b4823c20 Author: hjk <qtc-committer@nokia.com> Date: Wed Jan 13 14:48:29 2010 +0100 debugger: whitespace commit d3cdfe813444b6afca483c7d13ac80c4c8eda62b Author: hjk <qtc-committer@nokia.com> Date: Wed Jan 13 14:46:13 2010 +0100 debugger: add some debug output to trk device commit 7cd27f2eecd5f77bc35f6b705c6f0422b09e534d Author: hjk <qtc-committer@nokia.com> Date: Mon Jan 4 13:17:38 2010 +0100 debugger: add list of thread ids to TRK session state object Reviewed-by: Shane Kearns
* | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-01-292-0/+4
|\ \ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Carbon: crash problem in QWidgetPrivate::hide_sys, v2 Carbon: crash problem in QWidgetPrivate::hide_sys
| * | | | | | Carbon: crash problem in QWidgetPrivate::hide_sys, v2Richard Moe Gustavsen2010-01-292-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | See change: f842ec12706. Needed some ekstra checks for the cocoa port as well. Task-number: QTBUG-4227 Reviewed-by: Prasanth
| * | | | | | Carbon: crash problem in QWidgetPrivate::hide_sysRichard Moe Gustavsen2010-01-291-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The crash occurs because we at one point try to assign a widget that is marked as 'about to be deleted' to a QPointer, after clearguards has been called. The correct fix is to avoid such an assignment in the first place. Task-number: QTBUG-4227 Reviewed-by: Prasanth
* | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-01-2916-270/+52
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Fix header labels on mac with rtl examples/dbus: update remotecontrolledcar example examples/dbus: update dbus-chat adaptor/interface files doc: Fix typo in QEvent::ignore() documentation doc: Fix qmake-manual warn_on/warn_off references
| * | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-01-2916-270/+52
| |\ \ \ \ \ \ |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Fix header labels on mac with rtl examples/dbus: update remotecontrolledcar example examples/dbus: update dbus-chat adaptor/interface files doc: Fix typo in QEvent::ignore() documentation doc: Fix qmake-manual warn_on/warn_off references