summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* qmake: delete .pdb file when making 'distclean' instead of 'clean'Joerg Bornemann2010-10-111-1/+1
| | | | | | | | In Visual Studio builds "nmake clean" will now keep the .pdb files. Calling "nmake distclean" will delete them. Task-number: QTBUG-13853 Reviewed-by: ossi
* qmake: pass include directories to MS resource compilerJoerg Bornemann2010-10-113-1/+4
| | | | | Task-number: QTBUG-13776 Reviewed-by: ossi
* use specified pkg-configMark Brand2010-10-111-3/+4
| | | | | | | | Respect the pkg-config tool specified in qmake.conf. This is useful when crossbuilding. Merge-request: 850 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* qmake/symbian: Add icons with backslashes in pkg filesMartin Storsjo2010-10-111-4/+4
| | | | | | | | The destination path in pkg files always uses backslashes, not the path separator native to the build system. Merge-request: 853 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Make qtconfig help messages translatableVictor Ostashevsky2010-10-111-10/+10
| | | | | Merge-request: 851 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* remove exec bits again ...Oswald Buddenhagen2010-10-113-0/+0
|
* Add TIFFClose to QTIffHandler::option() to avoid memory leakTopi Reiniö2010-10-111-0/+1
| | | | | Task-number: QTBUG-14261 Reviewed-by: aavit
* [QCocoaView scrollWheel:] can end up recursing infinitely when a scrollWheel ↵Carlos Manuel Duclos Vergara2010-10-111-4/+0
| | | | | | | | | | | | | | | | event is sent to two stacked MDI windows The problem is the fact that we were propagating the event through the class hierarchy. This means calling the super class implementation, which does nothing but pass the event to the next guy, which is the other window, which in turn does the same thing... The point is, there is no need to propagate this event on the class hierarchy. If anything, this should be propagated on the widgets hierarchy, which is already handled by Qt. Removing the code so this problem does not happen again. Task-number: QTBUG-12952 Reviewed-by: Richard Moe Gustavsen
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-10-09633-3158/+4296
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (40 commits) 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 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. ...
| * Added missing QtWebKit example files and some whitespace fixes.Jerome Pasion2010-10-095-47/+198
| |
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-10-09631-3158/+4145
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (39 commits) 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 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 ...
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-10-08631-3158/+4145
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (39 commits) 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 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 ...
| | | * Added missing native separator transforms.Bruno Abinader2010-10-082-3/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch fixes the deployment of files when using Qt For Symbian SDK on Linux. Merge-request: 839 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-08629-3155/+4131
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-0720-72/+96
| | | | |\
| | | | | * Doc: tuning search reasult boxMorten Engvoldsen2010-10-071-0/+1
| | | | | |
| | | | | * qdoc: Don't generate html output for png files.Martin Smith2010-10-071-2/+2
| | | | | |
| | | | | * Doc: Correcting Windows CE 6.0 to Windows Embedded CE 6.0Morten Engvoldsen2010-10-071-2/+2
| | | | | |
| | | | | * Doc: correcting bug - lenght() pointed to setLength() in "See also" section. ↵Morten Engvoldsen2010-10-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Correct link is resize()
| | | | | * Doc: correct spellingMorten Engvoldsen2010-10-071-1/+1
| | | | | |
| | | | | * Doc: correcting spelling - qdbusxml2dcpp to qdbusxml2cppMorten Engvoldsen2010-10-071-2/+2
| | | | | |
| | | | | * Doc: correcting grammar on the installation pagesMorten Engvoldsen2010-10-071-8/+8
| | | | | |
| | | | | * Doc: correcting broken link to labsMorten Engvoldsen2010-10-071-3/+4
| | | | | |
| | | | | * Doc: adding note to function QWSKeyboardHandler::processKeycode - that it ↵Morten Engvoldsen2010-10-071-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | was added in Qt 4.6
| | | | | * Doc: correcting typoMorten Engvoldsen2010-10-071-1/+1
| | | | | |
| | | | | * Doc: Fixing bug - line too long and not visible. Breaking the line in twoMorten Engvoldsen2010-10-071-1/+2
| | | | | |
| | | | | * Doc: Fixing typoMorten Engvoldsen2010-10-071-1/+1
| | | | | |
| | | | | * Doc: Fixing snippet bug. Path pointing to the wrong snippetMorten Engvoldsen2010-10-071-1/+1
| | | | | |
| | | | | * Merge branch '4.7-upstream' into 4.7-docA-Team2010-10-0628-329/+1036
| | | | | |\
| | | | | * \ Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Geir Vattekar2010-10-064-5/+11
| | | | | |\ \
| | | | | | * | Added a project file for the Getting Started with QML and changed theJerome Pasion2010-10-063-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | old file name references.
| | | | | | * | Clarified the auto connect enumeration regarding which type ofJerome Pasion2010-10-061-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | connection is made. Task-number: QTBUG-14223 Reviewed-by: David Boddie
| | | | | * | | Doc: Fixed doc references to non-existing APIGeir Vattekar2010-10-061-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-13632 Reviewed-by: David Boddie
| | | | | * | | Doc: Fix broken links in QSslConfigurationGeir Vattekar2010-10-061-3/+4
| | | | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-14213 Reviewed-by: David Boddie
| | | | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Jerome Pasion2010-10-062-2/+2
| | | | | |\ \
| | | | | | * \ Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Morten Engvoldsen2010-10-061845-6418/+14930
| | | | | | |\ \
| | | | | | * | | Doc: Fixing spacing bug in columnsMorten Engvoldsen2010-10-061-1/+1
| | | | | | | | |
| | | | | * | | | Added installation section and fixed some whitespace.Jerome Pasion2010-10-061-36/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: David Boddie
| | | | | * | | | Merge branch '13092010doc' into 4.7Jerome Pasion2010-10-061-1/+4
| | | | | |\ \ \ \
| | | | | | * \ \ \ Merge branch '13092010doc' of scm.dev.nokia.troll.no:qt/qt-doc-team into ↵Jerome Pasion2010-09-16387-6615/+15965
| | | | | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 13092010doc
| | | | | | | * | | | Doc: Cleaning up the known issues page. Pointing people to check the online ↵Morten Engvoldsen2010-09-161-120/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | resources.
| | | | | | | * | | | Merge branch '4.7' into 13092010docMorten Engvoldsen2010-09-16386-6495/+15960
| | | | | | | |\ \ \ \
| | | | | | * | | | | | Added statement regarding validators and input masks on the same line edit.Jerome Pasion2010-09-141-1/+4
| | | | | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: David Boddie Bug:QTBUG-11324
| | | | | | * | | | | Added a QFormLayout snippet to the layout.qdoc and layouts.cppJerome Pasion2010-09-132-5/+53
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: David Boddie Tasks: QTBUG-10077
| | | | * | | | | | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Morten Engvoldsen2010-10-0787-455/+1857
| | | | |\ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ Merge commit 'doc-team/4.7' into 4.7Morten Engvoldsen2010-10-06618-3083/+4035
| | | | |\ \ \ \ \ \ \ \ | | | | | | |_|_|_|_|/ / | | | | | |/| | | | | |
| | | | | * | | | | | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Morten Engvoldsen2010-10-0648-353/+789
| | | | | |\ \ \ \ \ \ \ | | | | | | | |/ / / / / | | | | | | |/| | | | |
| | | | | | * | | | | | Merge branch '4.7-upstream' into 4.7-docA-Team2010-10-0548-353/+789
| | | | | | |\ \ \ \ \ \
| | | | | * | | | | | | | Doc: Fixing bug in QML tutorialMorten Engvoldsen2010-10-061-1/+1
| | | | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The code snippet for the simple button was not correctly linked.
| | | | | * | | | | | | Merge branch '4.7-upstream' into 4.7-docA-Team2010-10-0455-929/+680
| | | | | |\ \ \ \ \ \ \
generated by cgit v0.12 at 2024-10-24 14:23:39 (GMT)