summaryrefslogtreecommitdiffstats
path: root/tools
Commit message (Collapse)AuthorAgeFilesLines
* Merge commit 'qt/master-stable'Jason Barron2009-08-1033-105/+2903
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/corelib/kernel/qobject.cpp src/corelib/tools/qsharedpointer_impl.h src/gui/widgets/qdatetimeedit.cpp src/gui/widgets/qlinecontrol.cpp src/gui/widgets/qlineedit.cpp tests/auto/qcssparser/qcssparser.pro tests/auto/qicoimageformat/tst_qicoimageformat.cpp tests/auto/qmultiscreen/qmultiscreen.pro tests/auto/qresourceengine/qresourceengine.pro tests/auto/qresourceengine/tst_qresourceengine.cpp tests/auto/qscriptv8testsuite/tst_qscriptv8testsuite.cpp
| * nicer way to deal with missing support for template class friendsOswald Buddenhagen2009-08-062-4/+13
| |
| * Designer: Cannot edit menus in an RTL form when Designer uses LTR.Friedemann Kleint2009-08-069-62/+114
| | | | | | | | | | | | | | | | | | | | | | Use widget->layoutDirection() instead of QApplication::layoutDirection() where applicable, which caused it to break for the case that Designer's layoutDirection does not match that of a widget [property]. In addition, position the submenu correctly on the left side in the case of RTL. Reviewed-by: Jarek Kobus <jkobus@trolltech.com> Task-number: 259238
| * qdoc: Don't include internal or private classes in annotated lists.Martin Smith2009-08-061-1/+2
| |
| * qdoc: Fixed a Windows crash in HtmlGenerator::generateCompactList().Martin Smith2009-08-061-26/+17
| |
| * Merge commit 'origin/4.5'Rohan McGovern2009-08-062-0/+6
| |\ | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gui/dialogs/qfiledialog.cpp src/gui/dialogs/qfiledialog_win.cpp tests/auto/qicoimageformat/tst_qicoimageformat.cpp tests/auto/qscriptqobject/qscriptqobject.pro
| | * Fix compilation when QT_NO_HTTP is definedMarkus Goetz2009-08-052-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | Note however you still need to -nomake examples -nomake demos when configuring Qt. Reviewed-by: Thiago Task: 259179
| * | cetcpsync: unneeded error message removedJoerg Bornemann2009-08-051-1/+2
| | | | | | | | | | | | | | | If file deletion fails then I don't want to know it. cetest tries to delete files more than once.
| * | cetest compile fixJoerg Bornemann2009-08-051-2/+3
| | | | | | | | | | | | Reviewed-by: TrustMe
| * | small cleanup in cetestJoerg Bornemann2009-08-052-17/+18
| | | | | | | | | | | | Reviewed-by: TrustMe
| * | missing license header added in cetcpsyncsvrJoerg Bornemann2009-08-051-0/+40
| | | | | | | | | | | | Reviewed-by: TrustMe
| * | Workaround a crash in qdoc.Volker Hilsheimer2009-08-051-0/+5
| | | | | | | | | | | | Caused by an odd number of classes it seems.
| * | initial revision of cetcpsyncJoerg Bornemann2009-08-056-0/+996
| | | | | | | | | | | | | | | | | | | | | This is the desktop client for communicating with a Windows CE device that runs the cetcpsync server. Reviewed-By: mauricek
| * | initial revision of cetcpsyncserverJoerg Bornemann2009-08-057-0/+1398
| | | | | | | | | | | | | | | | | | | | | cetcpsync is our simple ActiveSync replacement for Windows CE devices. This is the server which has to run on the device. Reviewed-By: mauricek
| * | cetest: add support for cetcpsync (our simple ActiveSync replacement)Joerg Bornemann2009-08-055-7/+305
| | | | | | | | | | | | Reviewed-By: mauricek
| * | Make \annotatedlist <group> work also in pages that are not \group pages.Volker Hilsheimer2009-08-051-9/+6
| | | | | | | | | | | | | | | | | | The command right now only lists the classes in the group, in alphabetical order. Not ideal for integrating into overviews, where the list should be ordered by relevance.
| * | qdoc: Removed the "No such group" qdoc error.Martin Smith2009-08-051-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | This error was printed if you used a \ingroup xxx, but there was no \group xxx anywhere. Now we will stop using the \group command, but we will retain the \ingroup command for use with the \annotatedlist command.
* | | Rename Q_DECLARE_SCOPED_PRIVATE back to Q_DECLARE_PRIVATEHarald Fernengel2009-08-0624-65/+65
| | | | | | | | | | | | | | | | | | Rationale: We're using template magic now to get the private pointer in qglobal.h, so no need to have two macros. Also keeps backward compatibility with outside (KDE) code.
* | | Merge commit 'qt/master-stable'Jason Barron2009-08-069-72/+308
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure.exe doc/src/classes/qnamespace.qdoc examples/examples.pro src/corelib/kernel/qcoreevent.cpp src/corelib/kernel/qobject.cpp src/gui/kernel/qapplication.cpp src/gui/kernel/qstandardgestures.h src/gui/kernel/qwidget.cpp
| * | Merge AudioServices into mainline.Justin McPherson2009-08-051-0/+15
| | |
| * | Assistant: Use non-GUI version of QApplication for command-line tasks.ck2009-08-041-1/+15
| | | | | | | | | | | | | | | Task-number: 259136 Reviewed-by: kh
| * | qdoc: Added \annotated list command to qdoc3.Martin Smith2009-08-046-14/+40
| | | | | | | | | | | | | | | | | | | | | Now you can put "\annotatedlist xxx" anywhere in a qdoc comment, and it will generate the class list for the xxx group at that location. xxx must be a group name.
| * | Assistant: Added search history.ck2009-08-041-57/+238
| | | | | | | | | | | | | | | Task-number: 251278 Reviewed-by: kh
* | | Merge commit 'origin/master'Jason Barron2009-08-0426-65/+67
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/corelib/global/qglobal.h src/corelib/kernel/qmetatype.cpp src/corelib/kernel/qobject.cpp src/corelib/thread/qthread_unix.cpp src/gui/graphicsview/qgraphicssceneevent.h src/gui/itemviews/qheaderview.h src/gui/kernel/qapplication_qws.cpp src/gui/kernel/qgesture.h src/gui/kernel/qgesturerecognizer.h src/gui/painting/qpaintengine_raster.cpp src/network/access/qhttpnetworkreply.cpp src/network/access/qnetworkcookie.h src/network/socket/qnativesocketengine_unix.cpp
| * | | Squashed commit of the topic/exceptions branch.Harald Fernengel2009-08-0324-65/+65
| | | | | | | | | | | | | | | | | | | | Contains some smaller fixes and renaming of macros. Looks big, but isn't scary at all ;)
| * | | Enabled QtUiTools and related example building for Symbian OS.Janne Anttila2009-07-272-0/+2
| | | |
* | | | Merge commit 'qt/master-stable'Jason Barron2009-08-0436-377/+1640
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: config.tests/unix/openssl/openssl.pri demos/embedded/embedded.pro examples/itemviews/chart/chart.pro examples/network/network.pro examples/painting/painterpaths/painterpaths.pro examples/threads/mandelbrot/mandelbrot.pro qmake/project.cpp src/3rdparty/libtiff/libtiff/tif_config.h src/corelib/arch/arch.pri src/corelib/global/qglobal.cpp src/corelib/kernel/kernel.pri src/corelib/kernel/qcore_unix_p.h src/corelib/kernel/qobject.cpp src/corelib/thread/qthread_unix.cpp src/corelib/tools/qsharedpointer_impl.h src/corelib/tools/tools.pri src/gui/kernel/qaction.h src/gui/kernel/qapplication.cpp src/gui/painting/qregion.h src/gui/widgets/qlineedit.cpp src/gui/widgets/qlineedit_p.h src/network/socket/qnativesocketengine_unix.cpp tests/auto/qdir/tst_qdir.cpp tests/auto/qdiriterator/tst_qdiriterator.cpp tests/auto/qhttp/qhttp.pro tests/auto/qline/qline.pro tests/auto/qnetworkreply/tst_qnetworkreply.cpp tests/auto/qresourceengine/qresourceengine.pro tests/auto/qsharedpointer/qsharedpointer.pro tests/auto/qstring/qstring.pro tests/auto/qtcpsocket/qtcpsocket.pro tests/auto/qtcpsocket/tst_qtcpsocket.cpp
| * | | Sync with QtCreator source, add's help startup options.kh12009-08-036-40/+158
| | | | | | | | | | | | | | | | Reviewed-by: kh
| * | | Merge branch '4.5'Thiago Macieira2009-08-031-2/+4
| |\ \ \ | | | |/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/corelib/tools/qsharedpointer.cpp src/corelib/tools/qsharedpointer_impl.h src/gui/dialogs/qcolordialog.cpp src/gui/painting/qwindowsurface_raster.cpp src/network/access/qnetworkaccessmanager.cpp tests/auto/qsharedpointer/externaltests.cpp
| | * | Fix missing title quoting.kh2009-07-271-2/+4
| | | | | | | | | | | | | | | | Reviewed-by: kh
| * | | Compilare necessus estVolker Hilsheimer2009-08-011-1/+1
| | | |
| * | | Assistant: Performance fixes for help generator's pattern matching.ck2009-07-311-7/+36
| | | | | | | | | | | | | | | | | | | | | | | | Reading a help project was unacceptably slow with pattern matching. Now we do it only for filenames that contain wildcard symbols. Also, we cache the results of QDir::entryList() calls.
| * | | Fix internal documentation after QUrl change.kh2009-07-315-5/+5
| | | | | | | | | | | | | | | | Reviewed-by: kh
| * | | Fix compilation with xlC 7: operands to ?: must match.Thiago Macieira2009-07-311-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | See 3ae2cab9c8bd1790a00da2755ac036143a3a35f4 for another similar fix. Reviewed-by: Trust Me
| * | | fix infinite loop when meeting improper trId()Oswald Buddenhagen2009-07-301-1/+3
| | | |
| * | | Fix compilation with xlC 7: operands to ?: must match.Thiago Macieira2009-07-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | "../shared/qm.cpp", line 556.45: 1540-0207 (S) No common type found for operands with type "const char [7]" and "QByteArray". Reviewed-by: Trust Me
| * | | Merge branch 'master' of git://git-nokia.trolltech.com.au/qtsoftware/qt/qtAaron Kennedy2009-07-305-7/+18
| |\ \ \
| | * | | Remove "no-stl" from the build key and add compatibility for old plugins.Thiago Macieira2009-07-291-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | STL support hasn't had binary compatibility effects for the entire lifetime of Qt 4, so it should never have been there. It is a legacy thing I am now correcting. When inspecting a plugin, remove the "no-stl" from its loaded build key. That indicates a pre-4.6 build, since now Qt no longer adds it to its own build keys. Note that you have to remove the 4.6 plugin cache from $HOME/.config/Trolltech.conf or the registry for this change to work (if you compile Qt with -no-stl). Otherwise, plugins that have already been scanned will fail to load. Reviewed-by: Bradley T. Hughes
| | * | | qdoc: Added -obsoletelinks flag to opt in for reporting obsolete links.Martin Smith2009-07-294-5/+18
| | | | |
| * | | | Merge QML specific qdoc changesAaron Kennedy2009-07-2919-312/+1413
| |/ / / | | | | | | | | | | | | Reviewed-by: Martin Smith
* | | | Merge commit 'qt/master-stable'Jason Barron2009-07-304-11/+29
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | Conflicts: demos/demos.pro src/gui/graphicsview/qgraphicsitem_p.h
| * | | qdoc: Added superscript obsolete to obsolete links.Martin Smith2009-07-282-2/+12
| | | | | | | | | | | | | | | | Only for obsolete links from non-obsolete things.
| * | | Assistant/helpconverter: Remove hard-coded version check in ADP file.ck2009-07-282-9/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The AdpReader checked for a version attribute == 3.2.0. This has been replaced by a check for >= 3.2.0 Task-number: 258551 Reviewed-by: kh
* | | | Merge commit 'qt/master-stable'Jason Barron2009-07-298-210/+296
|\ \ \ \ | |/ / /
| * | | Assistant: Removed redundancy in index reader classes.ck2009-07-278-210/+296
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Moved common parts of QHelpSearchIndexReader{Default,Clucene} into a new common base class QHelpSearchIndexReader. Reviewed-by: kh
* | | | Merge commit 'qt/master-stable'Jason Barron2009-07-284-9/+50
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure.exe src/corelib/io/io.pri src/corelib/io/qfilesystemwatcher.cpp tests/auto/qfileinfo/tst_qfileinfo.cpp tools/configure/configureapp.cpp
| * | | qdoc: Fixed all references to obsolete QHttp classes.Martin Smith2009-07-241-3/+11
| | | |
| * | | Merge branch '4.5' of scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-07-242-5/+26
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/3rdparty/webkit/VERSION src/3rdparty/webkit/WebCore/ChangeLog src/3rdparty/webkit/WebCore/bridge/qt/qt_instance.cpp src/3rdparty/webkit/WebCore/bridge/qt/qt_instance.h src/3rdparty/webkit/WebCore/page/DragController.cpp src/3rdparty/webkit/WebKit/qt/Api/qwebframe.cpp src/3rdparty/webkit/WebKit/qt/ChangeLog src/3rdparty/webkit/WebKit/qt/tests/qwebpage/tst_qwebpage.cpp src/gui/painting/qpaintengineex_p.h tools/linguist/lupdate/main.cpp
| | * | Enabled setting of DESIGNABLE=false-properties using FormWindowCursor APIFriedemann Kleint2009-07-231-4/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Regression breakage introduced by the PropertySheet::isEnabled handling in 4.5. Task-number: 253278 Reviewed-by: Jarek Kobus <jkobus@trolltech.com>
| | * | Recognize .jui file format in lupdateEskil Abrahamsen Blomfeldt2009-07-231-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The translator had been installed for the jui format, but the extension wasn't recognized. Task-number: 258547 Reviewed-by: Gunnar