summaryrefslogtreecommitdiffstats
path: root/tools
Commit message (Collapse)AuthorAgeFilesLines
* 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
| * | | configure shows Windows CE specific build steps when its doneJoerg Bornemann2009-07-231-2/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For cross compilation of Qt for Windows CE the user must call setcepaths before nmake. Now configure shows a helpful message if the xplatform configure switch was used. Task-number: 257352 Reviewed-by: thartman
* | | | Merge commit 'qt/master-stable'Jason Barron2009-07-2798-1084/+2477
|\ \ \ \ | |/ / / | | | / | |_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure.exe qmake/Makefile.unix qmake/generators/makefile.cpp src/corelib/global/qglobal.h src/corelib/kernel/kernel.pri src/corelib/kernel/qcoreevent.cpp src/corelib/kernel/qsharedmemory_unix.cpp src/gui/graphicsview/qgraphicsscene.cpp src/gui/kernel/qaction.cpp src/gui/kernel/qaction.h src/gui/kernel/qaction_p.h src/gui/kernel/qapplication.cpp src/gui/kernel/qapplication.h src/gui/kernel/qwidget.cpp src/gui/kernel/qwidget.h src/gui/kernel/qwidget_mac.mm src/gui/painting/qgraphicssystemfactory.cpp src/gui/styles/qwindowsstyle.cpp src/gui/text/qfontengine_qpf.cpp src/gui/widgets/qabstractscrollarea_p.h src/network/access/qnetworkaccessdebugpipebackend.cpp src/network/socket/qlocalsocket_unix.cpp src/network/socket/qnativesocketengine_p.h src/network/socket/qnativesocketengine_unix.cpp src/openvg/qpaintengine_vg.cpp tests/auto/q3sqlcursor/tst_q3sqlcursor.cpp tests/auto/qcssparser/qcssparser.pro tests/auto/qdir/tst_qdir.cpp tests/auto/qfile/tst_qfile.cpp tests/auto/qobject/tst_qobject.cpp tests/auto/qpathclipper/qpathclipper.pro tests/auto/qprocess/tst_qprocess.cpp tests/auto/qsettings/tst_qsettings.cpp tests/auto/qsharedpointer/qsharedpointer.pro tests/auto/qsqlquerymodel/qsqlquerymodel.pro tests/auto/qsqlrelationaltablemodel/qsqlrelationaltablemodel.pro tests/auto/qsqltablemodel/qsqltablemodel.pro tests/auto/qsqlthread/qsqlthread.pro tests/auto/qwidget/tst_qwidget.cpp
| * | repair showSummary after commit 08b3511a0cJoerg Bornemann2009-07-231-1/+3
| | | | | | | | | | | | Reviewed-by: thartman
| * | qdoc: Removed obsolete classes from annotated lists.Martin Smith2009-07-231-0/+3
| | |
| * | fix linker error for the cetest toolJoerg Bornemann2009-07-221-1/+2
| | | | | | | | | | | | Reviewed-by: TrustMe
| * | Merge commit 'origin/4.5'Olivier Goffart2009-07-221-2/+5
| |\ \ | | |/ | | | | | | | | | | | | Conflicts: src/gui/graphicsview/qgraphicsscene.cpp src/gui/kernel/qt_cocoa_helpers_mac_p.h
| | * Designer: Fixed bug in setting QUrl property values from resources.Friedemann Kleint2009-07-221-2/+5
| | | | | | | | | | | | | | | | | | | | | Setting a file from a resource would result in 'qrc::/file' as the resource browser returns ':/file'. Reviewed-by: Jarek Kobus <jkobus@trolltech.com> Initial-patch-by: andy <qt-info@nokia.com>
| * | qdoc: Reported links to obsolete things that appear in non-obsolete things.Martin Smith2009-07-221-2/+7
| | | | | | | | | | | | Also marked the other QHttpXxx classes as \obsolete.
| * | qdoc: Added page for obsolete classes.Martin Smith2009-07-222-21/+59
| | | | | | | | | | | | | | | | | | | | | The classes marked \obsolete are no longer included in the "All Classes" list. They are listed separately on an "Obsolete Classes" list. The new page is reachable from the "All Classes" page and from the "Grouped Classes" page.
| * | qdoc: Changed to build qdoc3 in release mode.Martin Smith2009-07-221-2/+3
| | |
| * | configure -dont-process must build the host tools on Windows CEJoerg Bornemann2009-07-212-2/+2
| | | | | | | | | | | | Reviewed-by: mauricek
| * | sunpro doesn't like templated friend classes, eitherOswald Buddenhagen2009-07-212-2/+2
| | |
| * | Fix static leak to make valgrinding easier.dt2009-07-201-63/+61
| | | | | | | | | | | | | | | | | | Reviewed-By: ossi cherry-picked 98f8fc78bc0f8bcc0e36f19f9728d21063379a51 from creator
| * | micro-optimize: (x.toLower() == y) => !x.compare(y, Qt:: CaseInsensitive)Oswald Buddenhagen2009-07-201-10/+10
| | | | | | | | | | | | cherry-picked dc0bc586462e2a74fba38f054d303d2226eec4e5 from creator
| * | fix return value of error() & coOswald Buddenhagen2009-07-201-1/+2
| | | | | | | | | | | | cherry-picked bd0f0aa182b1422b942ae8efdc773c1a92344eb5 from creator
| * | make message() & co. handling more qmake-likeOswald Buddenhagen2009-07-201-14/+1
| | | | | | | | | | | | | | | | | | which basically means cutting features. heh cherry-picked a03f8643a7a1df8b7c857446a19cb25f9314cdb2 from creator
| * | expand arguments to s// operatorOswald Buddenhagen2009-07-201-1/+1
| | | | | | | | | | | | cherry-picked e083ad2920d6e5695f309fe5b4b7c7d1b3060d61 from creator
generated by cgit v0.12 at 2025-02-02 23:13:22 (GMT)