summaryrefslogtreecommitdiffstats
path: root/tools
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'qt-master-from-4.7' of ↵Qt Continuous Integration System2010-11-051-1/+1
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | scm.dev.nokia.troll.no:qt/qt-integration into master-integration * 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration: (72 commits) Fix opening a network session multiple times in succession. Fix synchronous dispatch in ICD in non-main threads. Russian translation update QNAM HTTP: Download last chunk properly when readBufferSize() limited Remove code changes that were NOT intended as part of the fix Prevent access to non-existent memory in QGL2PEXVertexArray Wordwrap QInputDialog label in Symbian Prevent excessive seeks in xbm detection Use qtmain.lib to provide entry point for all Symbian applications Give the toplevel widget a layout Doc: Correcting character escape bug fix tests when using Qt in a namespace Fix tst_symbols auto test Doc: Clarified the lifetime of the session bus connection. Doc: Added a snippet showing the default BorderImage tiling behavior. Doc: using pointer member variables and language change Doc: Added more instructions to help with device file permissions. Doc: Mentioned default values for the BorderImage tile modes. Document the difference between +0.0 and -0.0 for QPointF and QSizeF. trivial: fix build ...
| * Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-11-051-1/+1
| |\ | | | | | | | | | | | | | | | Conflicts: mkspecs/features/symbian/symbian_building.prf src/network/access/qhttpnetworkconnectionchannel.cpp
| | * Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Morten Engvoldsen2010-11-042-20/+7
| | |\
| | * | Doc: Correcting character escape bugMorten Engvoldsen2010-11-041-1/+1
| | | |
* | | | Prevent multiple modprobe messages for the same phoneShane Kearns2010-11-051-24/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cleaned up some unnecessary code in the serenum_unix file. Add the device only once to the list used for printing info about devices with no serial drivers. Add each ACM interface ID, trusting the numbers given in the master interface. The existing code of searching for the slave interface would have been appropriate for a user-mode device driver, but we only need the interface numbers as we are going to use existing device drivers via the tty devices Reviewed-By: axis
* | | | Fix detection of N95 with linux 2.6.34+Shane Kearns2010-11-051-1/+1
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Linux cdc-acm driver detects the debug port on some Nokia phones automatically When it does, it creates two ttyACMx devices and the symlink in /dev/serial/by-id contains the CDC master interface number. In contrast the generic usbserial driver creates a symlink containing the CDC slave interface number. This is because it knows nothing about CDC and is just looking for BULK IN/OUT interfaces that might be serial ports. This change creates match strings for both the master and slave interfaces, so the phone is detected if either driver is loaded. Reviewed-By: axis
* | | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2010-11-042-4/+34
|\ \ \ | | |/ | |/|
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/doc-staging into 4.7-integrationQt Continuous Integration System2010-11-032-4/+34
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/doc-staging: qdoc: Added next and previous links to top of pages. Doc: style tuning Doc: fixing style - tool buttons to bold. Doc: updating the template to support search feature better. Doc: Fixing columns to display all elements in lists - css3 Doc: fixing bugs in style Doc: fixing style for search display and slim fit menus Doc: Fixing bug in sorting script for search results. Doc: Fixed basic language. Doc: Added Windows Vista to the trademark list. Doc: Updated the Java trademark information. Doc: Moved QFileSystemModel example code to the class documentation. Doc: Corrected the name property as it was incorrectly declared.
| | * qdoc: Added next and previous links to top of pages.Martin Smith2010-11-031-3/+1
| | | | | | | | | | | | Task-number: QTBUG-14979
| | * Doc: updating the template to support search feature better.Morten Engvoldsen2010-11-031-1/+33
| | |
* | | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2010-11-032-20/+7
|\ \ \ | |/ /
| * | make the dtd reflect realityOswald Buddenhagen2010-11-021-18/+5
| | |
| * | fix qdoc doc generationOswald Buddenhagen2010-11-011-2/+2
| |/ | | | | | | | | as a side effect, the target is now named html-docs instead of docs to be consistent with the qt docs.
* | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2010-11-011-0/+8
|\ \ | |/
| * Fix QML visual tests on Mac.Yann Bodson2010-11-011-0/+8
| | | | | | | | Task-number: QTBUG-14792
* | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2010-10-301-4/+2
|\ \ | |/
| * Update webview visual tests to new skip modeAlan Alpert2010-10-291-4/+2
| | | | | | | | | | | | | | | | New mode requires them to at least compile. Now that I've noticed this, removing that check on compile failures in QDeclarativeTester. Task-number: QTBUG-14792
* | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2010-10-294-6/+33
|\ \ | |/
| * Add 'skip' property that QML visual tests can useAlan Alpert2010-10-294-6/+33
| | | | | | | | | | | | | | | | | | | | This property can be set with a reason to skip the test (i.e. known bug) and the failure will not count for blocking purposes. This change also alters one of the failing tests to use the new property Task-number: QTBUG-14792 Reviewed-by: Michael Brasser
* | Merge remote branch 'qt/master' into lighthouse-masterPaul Olav Tvete2010-10-276-6/+6
|\ \ | | | | | | | | | | | | Conflicts: src/corelib/global/qglobal.h
| * \ Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2010-10-266-6/+6
| |\ \ | | |/
| | * Doc : Fixing typo.Sergio Ahumada2010-10-266-6/+6
| | |
* | | Merge remote branch 'qt/master' into lighthouse-masterPaul Olav Tvete2010-10-2637-272/+546
|\ \ \ | |/ / | | | | | | | | | Conflicts: src/opengl/qwindowsurface_gl.cpp
| * | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-10-2527-261/+215
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: demos/declarative/snake/snake.qml qmake/generators/symbian/symbiancommon.cpp src/network/access/qnetworkaccessmanager.cpp src/s60installs/s60installs.pro tests/auto/qitemselectionmodel/tst_qitemselectionmodel.cpp tests/auto/qnetworkreply/tst_qnetworkreply.cpp
| | * Major refactoring: creating a new QPixmapData subclass for live textures.Michael Dominic K2010-10-217-112/+60
| | | | | | | | | | | | | | | | | | | | | Moving code from qmeegopixmapdata there. Merge-request: 2494 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
| | * Fix recording of visual tests.Michael Brasser2010-10-191-0/+2
| | |
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-10-181-3/+6
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: In meego graphics system remove a redundant check. Use the real screen size in meegographics surface scaling, not hardcoded one. Removing glFinish calls in eglSharedImage code. Not needed anymore. ::copy on the QMeeGoPixmapData creates a raster-backed pixmap. Fixed QGraphicsItem to send ItemScenePositionHasChanged when appropriate
| | | * Use the real screen size in meegographics surface scaling, not hardcoded one.Michael Dominic K2010-10-181-3/+6
| | | | | | | | | | | | | | | | | | | | Merge-request: 864 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
| | * | Merge branch '4.7-upstream' into 4.7-docA-Team2010-10-163-7/+7
| | |\ \ | | | |/
| | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-10-154-9/+10
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: (26 commits) Disable the unified toolbar before entering QWorkspace: fix hardcoded min size overwriting the real min size Fix tst_moduleqt47::accidentalImport tst_qcompleter: Fix the QTBUG_14292_filesystem test on X11 tst_qcompleter.cpp: fix test on mac. Fixed autotest that was missing focus on Windows QGraphicsLayoutItem - user set sizes should always override, even if there's a constraint QGridLayoutEngine - Rework height-for-width support so that row/col spanning works Revert "Revert "Fix (implement!) hfw/wfh in QGridLayoutEngine"" Fixed statement about const_iterator and some whitespace fixes. Adjust the parent index for the itemsMoved call. Correctly handle both 16bit and 32bit live pixmaps in meego graphics system. Correctly remove the egl alpha surface flags in meego graphics system. Proper dither & proper alpha checking. In meego graphics system, use always 16bit textures. QCompleter: do not auto complete when directory is changed. tst_qcompleter: Add a test for QFileSystemModel Doc: adjusting the search field width Doc - remove disclaimer Added the default format of QTime::toString(). ...
| | | | * Merge commit 'doc-team/4.7' into 4.7Morten Engvoldsen2010-10-1415-126/+125
| | | | |\
| | * | | \ Merge branch '4.7-upstream' into 4.7-docA-Team2010-10-154-19/+21
| | |\ \ \ \ | | | |/ / /
| | | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-10-1517-143/+142
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (55 commits) Fix autotest failure caused by commit 92365268 Cleanup changelog for 4.7.1. QNAM: Do not need QNetworkSession for data:// Workaround for QFileSystemWatcher regression Revert "qmake: pass include directories to MS resource compiler" Fix User 46 Panic in bearer management on Symbian. Assistant: Insert all keywords with empty ids, as ids are not mendatory. qmake: delete .pdb file when making 'distclean' instead of 'clean' qmake: pass include directories to MS resource compiler use specified pkg-config qmake/symbian: Add icons with backslashes in pkg files Make qtconfig help messages translatable remove exec bits again ... Add TIFFClose to QTIffHandler::option() to avoid memory leak [QCocoaView scrollWheel:] can end up recursing infinitely when a scrollWheel event is sent to two stacked MDI windows Added missing QtWebKit example files and some whitespace fixes. Added missing native separator transforms. Doc: tuning search reasult box qdoc: Don't generate html output for png files. Doc: Correcting Windows CE 6.0 to Windows Embedded CE 6.0 ...
| | | | * | | Workaround for QFileSystemWatcher regressionJarek Kobus2010-10-141-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't call removePath() when it was not added before. Reviewed-by: con <qtc-committer@nokia.com> Task-number: QTBUG-14435
| | | | * | | Assistant: Insert all keywords with empty ids, as ids are not mendatory.kh12010-10-121-6/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-14393 Reviewed-by: ck
| | | | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-10-1115-134/+132
| | | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (48 commits) qmake: delete .pdb file when making 'distclean' instead of 'clean' qmake: pass include directories to MS resource compiler use specified pkg-config qmake/symbian: Add icons with backslashes in pkg files Make qtconfig help messages translatable remove exec bits again ... Add TIFFClose to QTIffHandler::option() to avoid memory leak [QCocoaView scrollWheel:] can end up recursing infinitely when a scrollWheel event is sent to two stacked MDI windows Added missing QtWebKit example files and some whitespace fixes. Added missing native separator transforms. Doc: tuning search reasult box qdoc: Don't generate html output for png files. Doc: Correcting Windows CE 6.0 to Windows Embedded CE 6.0 Doc: correcting bug - lenght() pointed to setLength() in "See also" section. Correct link is resize() Doc: correct spelling Doc: correcting spelling - qdbusxml2dcpp to qdbusxml2cpp Doc: correcting grammar on the installation pages Doc: correcting broken link to labs Doc: adding note to function QWSKeyboardHandler::processKeycode - that it was added in Qt 4.6 Doc: correcting typo ...
| | | | | * | | Make qtconfig help messages translatableVictor Ostashevsky2010-10-111-10/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: 851 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
| | | | | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-10-0814-124/+122
| | | | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (38 commits) Doc: tuning search reasult box qdoc: Don't generate html output for png files. Doc: Correcting Windows CE 6.0 to Windows Embedded CE 6.0 Doc: correcting bug - lenght() pointed to setLength() in "See also" section. Correct link is resize() Doc: correct spelling Doc: correcting spelling - qdbusxml2dcpp to qdbusxml2cpp Doc: correcting grammar on the installation pages Doc: correcting broken link to labs Doc: adding note to function QWSKeyboardHandler::processKeycode - that it was added in Qt 4.6 Doc: correcting typo Doc: Fixing bug - line too long and not visible. Breaking the line in two Doc: Fixing typo Doc: Fixing snippet bug. Path pointing to the wrong snippet Doc: Fixed doc references to non-existing API Doc: Fix broken links in QSslConfiguration Added a project file for the Getting Started with QML and changed the Clarified the auto connect enumeration regarding which type of Added installation section and fixed some whitespace. Doc: Fixing spacing bug in columns Doc: Fixing bug in QML tutorial ...
| | | | | | * \ \ Merge commit 'doc-team/4.7' into 4.7Morten Engvoldsen2010-10-072-4/+4
| | | | | | |\ \ \
| | | | | | * \ \ \ Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Morten Engvoldsen2010-10-072-0/+166
| | | | | | |\ \ \ \
| | | * | | | | | | | Keep qmlviewer from disappearingAlan Alpert2010-10-151-0/+1
| | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | qmlviewer was disappearing if the scene was 0x0. Now it's just unusably small, which is correct as it will highlight the problem to the developer.
| | * | | | | | | | Doc: fixing unclosed <p>Morten Engvoldsen2010-10-151-1/+1
| | | |_|_|_|_|_|/ | | |/| | | | | |
| | * | | | | | | Merge branch '4.7-upstream' into 4.7-docA-Team2010-10-111-5/+12
| | |\ \ \ \ \ \ \ | | | |/ / / / / /
| | * | | | | | | Merge branch '4.7-upstream' into 4.7-docA-Team2010-10-0813-407/+199
| | |\ \ \ \ \ \ \ | | | | |/ / / / / | | | |/| | | | |
| | * | | | | | | Added Q_INVOKABLE to ignore file.Jerome Pasion2010-10-081-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-14281 Reviewed-by: David Boddie
| | * | | | | | | Merge branch '4.7-upstream' into 4.7-docA-Team2010-10-072-0/+166
| | |\ \ \ \ \ \ \ | | | | |_|_|/ / / | | | |/| | | / / | | | |_|_|_|/ / | | |/| | | | |
| | * | | | | | qdoc: Don't generate html output for png files.Martin Smith2010-10-071-2/+2
| | | | | | | |
| | * | | | | | Doc: correcting spelling - qdbusxml2dcpp to qdbusxml2cppMorten Engvoldsen2010-10-071-2/+2
| | | |_|_|/ / | | |/| | | |
| | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2010-10-0410-5/+19
| | |\ \ \ \ \
| | * | | | | | Doc: Fixed the in-repository licenses for the documentation.David Boddie2010-10-0411-55/+55
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In the repository, we should always use the No Commercial license alongside the GNU Free Documentation License for documentation files.
generated by cgit v0.12 at 2025-01-06 23:21:20 (GMT)