summaryrefslogtreecommitdiffstats
path: root/tools
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '4.6'Thiago Macieira2010-01-123-11/+7
|\
| * Enable building with MSVC2008Shane Kearns2010-01-083-11/+7
| | | | | | | | | | | | | | | | | | | | Removed the alternate implementation of the registry reading, although the new API is simpler, the old XP method is not deprecated. Added an extra library that is needed according to API documentation, but is omittable on MinGW. Also gave a better error message when serial port detection fails. Reviewed-by: Miikka Heikkinen
* | Fix compilation of builds without WebKitSimon Hausmann2010-01-121-1/+1
| |
* | Merge branch '4.6'Thiago Macieira2010-01-0811-55/+240
|\ \ | |/ | | | | | | | | | | Conflicts: src/corelib/io/qfsfileengine.cpp src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp src/opengl/opengl.pro
| * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into ↵Qt Continuous Integration System2010-01-066-23/+58
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1: uic3/uic: Ignore buttonGroupId property when there is no parent QButtonGroup Changelog: Added Designer/uic entries for 4.6.1 Designer: Enable seconds editing for Q[Date]TimeEdit's properties. Designer: Selection handles disappear when using style sheet on form. do not accumulate messages
| | * Designer: Enable seconds editing for Q[Date]TimeEdit's properties.Friedemann Kleint2010-01-044-19/+53
| | | | | | | | | | | | | | | | | | | | | | | | on UNIX, for which QLocale's ShortFormat does not include seconds. Move format creation into browser utilities and use consistently for display and editing. Reviewed-by: Jarek Kobus <jkobus@trolltech.com> Task-number: QTBUG-6965
| | * Designer: Selection handles disappear when using style sheet on form.Friedemann Kleint2010-01-041-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | ... that has a white background color. The selection handles inherited the form's stylesheet. Fix by parenting them on the (internal) form container widget. Reviewed-by: Jarek Kobus <jkobus@trolltech.com> Task-number: QTBUG-6757
| | * do not accumulate messagesOswald Buddenhagen2010-01-041-2/+3
| | | | | | | | | | | | Task-number: QTBUG-6588
| * | Deal with test cases that crash or hangShane Kearns2010-01-045-32/+182
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | Added an optional timeout to runonphone - the application will be killed after this time. Used when autotesting unattended, as some tests can hang. Handled the just in time debug halting the application when it is about to crash, by terminating the application. In future, we could capture a call stack or something here. Also added quiet/verbose options to control the amount of output from runonphone. Reviewed-by: Janne Koskinen
* | Merge branch '4.6'Thiago Macieira2009-12-2638-916/+4604
|\ \ | |/ | | | | | | | | | | Conflicts: examples/webkit/fancybrowser/main.cpp src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp tools/assistant/tools/assistant/bookmarkmanager.cpp
| * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2009-12-2220-0/+4419
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public: Added more specific clean targets for Symbian builds Fixed incorrect headers. Daylight savings time for Symbian. Tool for launching symbian apps on the phone from windows command line Fixes to winscw def files Fixing compile error on armcc
| | * Fixed incorrect headers.axis2009-12-2218-252/+474
| | | | | | | | | | | | | | | AutoTest: Passed RevBy: Paul Olav Tvete
| | * Tool for launching symbian apps on the phone from windows command lineShane Kearns2009-12-2120-0/+4197
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The tool uses TRK to launch the application. TRK is a debug agent, available as a signed package for consumer phones. For Nokia phones, it is distributed with carbide; for other manufacturers it can be downloaded from their developer websites. The launcher code is reused from Qt creator, with a patch to allow us to pass command line arguments to the process being launched. The "make run" target is enhanced to support running on target as well as the emulator. Like the "make sis" target, the last platform to have been built is the one that will be launched. The runonphone tool needs to be built in a Qt environment configured for windows, and requires at least windows XP (Symbian development requires windows XP SP2). Current proposal is to include a statically linked exe in the bin directory for binary packages. Reviewed-by: Janne Koskinen
| * | Fixing a problem with xmlpatterns, where code from tools/xmlpatterns was ↵Carlos Manuel Duclos Vergara2009-12-217-794/+4
| | | | | | | | | | | | | | | | | | being included by src/xmlpatterns. Reviewed-by: Peter Hartmann
| * | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2009-12-181-3/+3
| |\ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: doc: Added a missing \sa command, plus a \l in the text. Improve the performance of the Anomaly browser demo doc: Fixed typos. Fixed QResource to respect the explicitely set locale Change QHostInfo to use 5 parallel lookup threads Doc: fix typo fix Cocoa build
| | * doc: Added a missing \sa command, plus a \l in the text.Martin Smith2009-12-181-3/+3
| | | | | | | | | | | | Task-number: QTBUG-6288
| * | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into ↵Qt Continuous Integration System2009-12-172-3/+16
| |\ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1: Designer: Fix compilation with -static on Mac OS X Configure support for multiple include levels in qmake.conf hierarchy. Stop the configuration if the test compiler cannot be found.
| | * Designer: Fix compilation with -static on Mac OS XFriedemann Kleint2009-12-172-3/+16
| | | | | | | | | | | | | | | | | | | | | | | | Avoid linking the solutions used by Designer twice (in the two Designer libraries). Just use the include paths in case of static linking. Reviewed-by: Carlos Duclos <carlos.duclos@nokia.com> Task-number: QTBUG-6863
| * | Merge remote branch 'staging/4.6' into 4.6Simon Hausmann2009-12-173-4/+47
| |\ \ | | |/ | |/|
| | * doc: Final fix. Example image links now display the image.Martin Smith2009-12-153-1/+47
| | | | | | | | | | | | Task-number: QTBUG-4484
| | * doc: Fixed erroneous qdoc error message.Martin Smith2009-12-141-4/+1
| | | | | | | | | | | | | | | | | | | | | qdoc reported a "No documentation" error for images used in examples, but these images aren't supposed to have documentation. Task-number: QTBUG-4484
| * | fix build with namespaced qtOswald Buddenhagen2009-12-161-0/+2
| | |
| * | Merge remote branch 'mainline/4.6' into 4.6Oswald Buddenhagen2009-12-154-4/+13
| |\ \
| * | | Designer: Show actions in action editor in QKeySequence::NativeTextFriedemann Kleint2009-12-141-1/+1
| | | | | | | | | | | | | | | | | | | | format as in Property editor and elsewhere for consistence. Task-number: QTBUG-6760
| * | | Designer: Handle "visible"-properties of item view headers correctly.Friedemann Kleint2009-12-102-105/+88
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Implement the property sheet (isChanged/reset) correctly and do a hack for resetting the visibility. Task-number: QTBUG-6505 Reviewed-by: Jarek Kobus <jkobus@trolltech.com>
| * | | Fix broken delete key, some cleanup.kh12009-12-081-48/+68
| | | | | | | | | | | | | | | | Reviewed-by: ck
| * | | Assistant: Fix race condition in index creation.ck2009-12-081-3/+1
| | | | | | | | | | | | | | | | Reviewed-by: kh1
* | | | Assistant: Refactor help engine wrapper.ck2009-12-213-144/+187
| | | | | | | | | | | | | | | | | | | | This class had a lot of implementation details in the header, which were moved to an internal private class.
* | | | Assistant: Fix console output glitch.ck2009-12-161-1/+1
| | | |
* | | | qdbus: short forms to get/set propertiesGiuseppe Bilotta2009-12-151-12/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow a property to be given as third parameter instead of a method. If no other parameter is given, the property value is returned; if a fourth parameter is given, the property is set to the given value. This allows the syntax qdbus service path property as a short form of qdbus service path org.freedesktop.DBus.Properties.Get property and the syntax qdbus service path property value as a short form of qdbus service path org.freedesktop.DBus.Properties.Set property value If the third parameter is neither a method nor a property, the error message for the missing method is returned. Merge-Request: 1143 Reviewed-By: Thiago Macieira
* | | | Merge branch '4.6'Thiago Macieira2009-12-151-1/+1
|\ \ \ \ | | |/ / | |/| |
| * | | Fix precision loss warning (qreal vs. float on Windows)Alessandro Portale2009-12-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Oswald Buddenhagen modified: tools/linguist/linguist/messageeditor.h
* | | | Merge commit 'origin/4.6'Olivier Goffart2009-12-153-3/+12
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | Conflicts: src/corelib/io/qfsfileengine.cpp src/network/access/qnetworkrequest.cpp tests/auto/qgraphicswidget/tst_qgraphicswidget.cpp
| * | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Justin McPherson2009-12-141-0/+2
| |\ \ \
| | * | | Compile with QT_NO_DEPRECATEDOlivier Goffart2009-12-091-0/+2
| | | |/ | | |/| | | | | | | | | | | | | | | | | | | | | uses of QT_DEPRECATED must be protected by #ifdef Task-number: QTBUG-6649 Reviewed-by: João Abecasis
| * | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-multimedia-team into 4.6Justin McPherson2009-12-141-2/+9
| |\ \ \ | | |/ / | |/| | | | | | | | | | Conflicts: configure.exe
| | * | Add -audio-backend and -no-audio-backend configure option.Kurt Korbatits2009-12-091-2/+9
| | | | | | | | | | | | | | | | | | | | | | | | Allow better control over audio backend used. Reviewed-by:Justin McPherson
| * | | Merge oslo-staging-2/4.6 into upstream/4.6Olivier Goffart2009-12-091-1/+1
| |\ \ \ | | |_|/ | |/| |
| | * | Merge commit 'origin/4.6' into 4.6Olivier Goffart2009-12-044-3/+10
| | |\ \
| | * \ \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6Jan-Arve Sæther2009-12-0316-46/+90
| | |\ \ \
| | * | | | Make lrelease link again with the win32-icc and win32-g++ mkspecsJan-Arve Sæther2009-12-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Thierry
* | | | | | Assistant: Topic chooser links correctly to Urls with identical titles.ck2009-12-142-12/+13
| | | | | |
* | | | | | qhelpgenerator: Don't insert identical indices.ck2009-12-141-2/+12
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: kh1
* | | | | | Assistant: Performance improvements in qhelpgenerator.ck2009-12-142-13/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Get rid of double container lookups for conditional access. - count() == 0 => isEmpty(). Reviewed-by: kh1
* | | | | | Assistant: Added rebuild-search-index command line option.ck2009-12-103-3/+40
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: kh1
* | | | | | Assistant: Make doc file watching work for the intended use case.ck2009-12-092-1/+75
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The QFileSystemWatcher signals the changing of a file several times, with the first one coming too early. As a result, we are likely checking a file that is not yet fully constructed. The workaround/solution is to delay reacting to the change until after the (hopefully) last signal from the QFileSystemWatcher. Reviewed-by: kh1
* | | | | | Assistant: Try to reload open pages on doc file update.ck2009-12-095-10/+23
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: kh1
* | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qtck2009-12-093-5/+4
|\ \ \ \ \ \
| * \ \ \ \ \ Merge branch '4.6'Thiago Macieira2009-12-083-5/+4
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Merge remote branch 'staging/4.6' into 4.6Oswald Buddenhagen2009-12-073-5/+4
| | |\ \ \ \ \
generated by cgit v0.12 at 2024-12-28 20:37:43 (GMT)