summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-11-051-25/+10
|\ | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public: Prevent multiple modprobe messages for the same phone Fix detection of N95 with linux 2.6.34+
| * 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 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-11-052-1/+4
|\ | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Fix compilation issue for the Carbon build.
| * Fix compilation issue for the Carbon build.Fabien Freling2010-11-042-1/+4
| | | | | | | | | | | | The unified toolbar with the raster engine is Cocoa specific. Reviewed-by: Samuel Rødal
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-11-041-13/+17
|\ \ | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public: Fixed elf2e32_qtwrapper when not using def files.
| * | Fixed elf2e32_qtwrapper when not using def files.axis2010-11-041-13/+17
| | | | | | | | | | | | | | | RevBy: Liang Qi Task: QTBUG-14952
* | | Merge branch 'qt-master-from-4.7' of ↵Qt Continuous Integration System2010-11-0427-370/+578
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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: (22 commits) Fix bearermonitor when building for Maemo in scratchbox. The lastCenterPoint should be equal to centerPoint for new gestures. PinchGesture: lastRotationAngle should start at 0. tst_qnetworkreply: Add testcase for unknown authentication method QNAM: Reset authenticator state properly between requests msvc: enable unreferenced code elimination in release with debuginfo builds exclude headers in builddir from -copy option more elegant treatment of qconfig.h special case 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 simplify recursive symlinking 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. ...
| * \ \ Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2010-11-0427-370/+578
| |\ \ \ | | |/ / | |/| |
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-11-047-295/+353
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Fix bearermonitor when building for Maemo in scratchbox.
| | | * | Fix bearermonitor when building for Maemo in scratchbox.Aaron McCarthy2010-11-047-295/+353
| | |/ / | | | | | | | | | | | | | | | | Use the correct ui file when building in scratchbox. Remove use of message boxes.
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-11-0310-25/+66
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: The lastCenterPoint should be equal to centerPoint for new gestures. PinchGesture: lastRotationAngle should start at 0. tst_qnetworkreply: Add testcase for unknown authentication method QNAM: Reset authenticator state properly between requests msvc: enable unreferenced code elimination in release with debuginfo builds exclude headers in builddir from -copy option more elegant treatment of qconfig.h special case simplify recursive symlinking
| | | * | The lastCenterPoint should be equal to centerPoint for new gestures.Frederik Gladhorn2010-11-031-3/+5
| | | | | | | | | | | | | | | | | | | | Reviewed-by: Zeno Albisser
| | | * | PinchGesture: lastRotationAngle should start at 0.Frederik Gladhorn2010-11-031-1/+1
| | | | | | | | | | | | | | | | | | | | Reviewed-by: Zeno Albisser
| | | * | tst_qnetworkreply: Add testcase for unknown authentication methodMarkus Goetz2010-11-031-0/+32
| | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-4121 Reviewed-by: ogoffart
| | | * | QNAM: Reset authenticator state properly between requestsMarkus Goetz2010-11-032-3/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reset authenticator and fix operator=(...) of QAuthenticator. Task-number: QTBUG-6792 Reviewed-by: ogoffart
| | | * | msvc: enable unreferenced code elimination in release with debuginfo buildsOswald Buddenhagen2010-11-034-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | that linker optimization is on by default in release builds, so override /DEBUG implicitly turning it off. as it happens, this implicitly disables incremental linking, so that option can go away now. Reviewed-by: joerg Task-number: QTBUG-14007
| | | * | exclude headers in builddir from -copy optionOswald Buddenhagen2010-11-031-1/+1
| | | | | | | | | | | | | | | | | | | | Reviewed-by: joerg
| | | * | more elegant treatment of qconfig.h special caseOswald Buddenhagen2010-11-031-5/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | instead of injecting it only if it is not there yet, exclude it if it is already there and then unconditionally inject it. this makes things more deterministic. Reviewed-by: joerg
| | | * | simplify recursive symlinkingOswald Buddenhagen2010-11-021-8/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the jira issue itself has been already fixed, but in a somewhat arcane way. this one is better maintainable. Reviewed-by: joerg Task-number: QTBUG-14955
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/doc-staging into 4.7-integrationQt Continuous Integration System2010-11-0310-50/+159
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '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: style tuningMorten Engvoldsen2010-11-031-1/+1
| | | | | |
| | | * | | Doc: fixing style - tool buttons to bold.Morten Engvoldsen2010-11-031-1/+1
| | | | | |
| | | * | | Doc: updating the template to support search feature better.Morten Engvoldsen2010-11-031-1/+33
| | | | | |
| | | * | | Doc: Fixing columns to display all elements in lists - css3Morten Engvoldsen2010-11-031-2/+2
| | | | | |
| | | * | | Doc: fixing bugs in styleMorten Engvoldsen2010-11-022-2/+7
| | | | | |
| | | * | | Doc: fixing style for search display and slim fit menusMorten Engvoldsen2010-11-021-3/+73
| | | | | |
| | | * | | Merge branch '4.7-upstream' into 4.7-docA-Team2010-11-0180-5677/+12165
| | | |\ \ \
| | | * | | | Doc: Fixing bug in sorting script for search results.Morten Engvoldsen2010-11-011-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Geir Vattekar
| | | * | | | Merge branch '4.7-upstream' into 4.7-docA-Team2010-10-304-12/+53
| | | |\ \ \ \
| | | * \ \ \ \ Merge branch '4.7-upstream' into 4.7-docA-Team2010-10-29607-54610/+33052
| | | |\ \ \ \ \
| | | * \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2010-10-292-2/+3
| | | |\ \ \ \ \ \
| | | * | | | | | | Doc: Fixed basic language.David Boddie2010-10-291-1/+1
| | | | | | | | | |
| | | * | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2010-10-27120-392/+824
| | | |\ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2010-10-25137-4616/+4735
| | | |\ \ \ \ \ \ \ \
| | | * | | | | | | | | Doc: Added Windows Vista to the trademark list.David Boddie2010-10-221-3/+3
| | | | | | | | | | | |
| | | * | | | | | | | | Doc: Updated the Java trademark information.David Boddie2010-10-221-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Checked with Legal.
| | | * | | | | | | | | Doc: Moved QFileSystemModel example code to the class documentation.David Boddie2010-10-212-30/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, the code showed how to use QDirModel and was included in the QDirModel class documentation, but it has since been changed to use QFileSystemModel instead.
| | | * | | | | | | | | Doc: Corrected the name property as it was incorrectly declared.David Boddie2010-10-211-1/+1
| | | | | | | | | | | |
* | | | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-11-044-8/+36
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | / | | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Update the offsets of the QToolBars inside
| * | | | | | | | | | Update the offsets of the QToolBars insideFabien Freling2010-11-044-8/+36
|/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the unified toolbar on Mac OS X. Task-number: QTBUG-12818 Reviewed-by: Samuel Rødal
* | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-11-041-1/+17
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public: Make qmake to pass all UTF-8 characters unchanged through parser.
| * | | | | | | | | | Make qmake to pass all UTF-8 characters unchanged through parser.Miikka Heikkinen2010-11-041-1/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QMakeProject::parse() calls QString::simplified(), which assumes any byte 0xA0 in multibyte UTF-8 characters is a space character (0x00A0 is unicode character NBSP [non-breaking space]) and replaces those bytes with regular space, corrupting the UTF-8 string. Fixed by temporarily changing all 0xA0 bytes in parser input to another non-space character 0x01A0. This is safe replacement as qmake doesn't accept unicode .pro files, so there should never be actual NBSP or the replacement 0x01A0 characters in a valid .pro file. Note that there are a couple of more uses of QString::simplified() in qmake, but those do not deal with strings that need to be UTF-8 compatible as far as I can tell, so no need to touch them. Task-number: QTBUG-14357 Reviewed-by: Oswald Buddenhagen
* | | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-11-041-0/+8
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Fix compilation for when there is no OpenGL module
| * | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-11-031-0/+8
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Fix compilation for when there is no OpenGL module
| | * | | | | | | | | | Fix compilation for when there is no OpenGL moduleaavit2010-11-031-0/+8
| | | | | | | | | | | |
* | | | | | | | | | | | Merge branch 'qt-master-from-4.7' of ↵Qt Continuous Integration System2010-11-049-30/+68
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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: Qt/Symbian: QInputDialog layout and size are wrong make the dtd reflect reality Fixed destination path for the S60 feedback plugin. german translation: minor additions + fixes fix qdoc doc generation
| * | | | | | | | | | | Merge branch 'qt-master-from-4.7' of ↵Qt Continuous Integration System2010-11-039-30/+68
| |\ \ \ \ \ \ \ \ \ \ \ |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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: Qt/Symbian: QInputDialog layout and size are wrong make the dtd reflect reality Fixed destination path for the S60 feedback plugin. german translation: minor additions + fixes fix qdoc doc generation
| * | | | | | | | | | | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2010-11-039-30/+68
| |\ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / | | |/| | | | | | | | |
generated by cgit v0.12 at 2024-12-10 11:50:03 (GMT)