summaryrefslogtreecommitdiffstats
path: root/tools
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote branch 'origin/4.7' into qt-master-from-4.7Thiago Macieira2010-09-2138-88/+1450
|\ | | | | | | | | | | | | | | Conflicts: src/corelib/kernel/qobject.h src/declarative/graphicsitems/qdeclarativeflickable.cpp src/declarative/graphicsitems/qdeclarativeflickable_p_p.h src/declarative/util/qdeclarativelistmodel.cpp
| * Make qml debugging work with command line argumentsLasse Holmstedt2010-09-171-0/+11
| | | | | | | | | | | | | | | | | | | | The environment variables do not work for Symbian devices, so without this change, QML debugging cannot be done on them. In addition, configure now contains an option to disable qml debugging entirely, due to it being a major security risk. Reviewed-by: kkoehne
| * Merge branch '4.7' into fridayMorten Engvoldsen2010-09-171-5/+3
| |\
| | * Merge branch '4.7-upstream' into 4.7-docA-Team2010-09-161-5/+3
| | |\
| | | * Compile with QT_NO_GESTURES.Yann Bodson2010-09-151-0/+2
| | | |
| | | * Give file and line error information for errors in dummydata.Michael Brasser2010-09-151-5/+1
| | | | | | | | | | | | | | | | | | | | This also has the side effect of allowing types to be defined within the dummydata folder than can be used by other files in dummydata.
| * | | Doc: removing linebreakMorten Engvoldsen2010-09-161-1/+0
| | | |
| * | | Doc: correcting html templateMorten Engvoldsen2010-09-161-12/+3
| | | |
| * | | Merge branch '13092010doc' into doc-4.7Morten Engvoldsen2010-09-161-4/+4
| |\ \ \ | | | | | | | | | | | | | | | | | | | | Conflicts: tools/qdoc3/test/qt-html-templates.qdocconf
| | * | | Doc: Removing google analytics from offline docsMorten Engvoldsen2010-09-162-15/+5
| | | | |
| | * | | Doc: correcting html template - validatingMorten Engvoldsen2010-09-161-1/+1
| | | | |
| | * | | Doc: correcting html templateMorten Engvoldsen2010-09-161-28/+22
| | |/ /
| * | | Revert "Doc: fixing page name bug caused by ↵Morten Engvoldsen2010-09-151-28/+22
| |/ / | | | | | | | | | | | | | | | | | | 07bbace404078dcfd82eff717daa97299b8ba52c changing qml elements page" Doc: pulling back redundant fix that is breaking links - qmlelements.html/declarativeelements.html This reverts commit 064b7fe6f97bcf214f749794c5ccab3b4cf0bcc7.
| * | git Merge branch '4.7-upstream' into 4.7-docJesper Thomschutz2010-09-1510-14/+34
| |\ \ | | |/ | | | | | | | | | Conflicts: src/gui/kernel/qgesturemanager.cpp
| | * build fix for configure.exeJoerg Bornemann2010-09-141-0/+1
| | | | | | | | | | | | Reviewed-by: TrustMe
| | * I18n: Fix some lupdate warnings.Friedemann Kleint2010-09-145-8/+10
| | |
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-09-144-6/+23
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (25 commits) run depend_command even if the binary has no absolute path fix scaleFactor/totalScaleFactor in QPinchGestureRecognizer Added velocity property to the QPanGesture. Changed the speed property on QSwipeGesture to velocity fix typos in comment unbreak test Don't add generic subdirs project twice. Remove debug, quiet warnings. Fix memory leaks and valgrind errors. QStroker: Fix erroneous SvgMiterJoin behavior for parallel lines Revert "Properly implement qobject_cast for const pointers." Bearer management: Fix compilation with namespace. fetch next token after class definition opening delay next token fetching when opening namespace don't let operator overloads confuse us don't try to show source when no locations are given Implement a private API for setting title widgets Fix the bug for QSettings on Windows, to store qint32/quint32, qint64/quint64 in Windows registry. fix CRLF Added private API to install an x11EventFilter ...
| | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-09-104-6/+23
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Bearer management: Fix compilation with namespace. fetch next token after class definition opening delay next token fetching when opening namespace don't let operator overloads confuse us don't try to show source when no locations are given Implement a private API for setting title widgets Fix the bug for QSettings on Windows, to store qint32/quint32, qint64/quint64 in Windows registry. fix CRLF Added private API to install an x11EventFilter NTLM code: Save domain in different variable Update the error handling of invalid hostnames in QUrl. Remove unsupported code from qobject.h for MSVC < .NET 2003 Properly implement qobject_cast for const pointers. Revert "Doc: fixing page name bug caused by 07bbace404078dcfd82eff717daa97299b8ba52c changing qml elements page"
| | | | * fetch next token after class definition openingOswald Buddenhagen2010-09-101-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | this makes no real difference, as at this point the token is known to be an opening brace which will be handled without side effects in the next iteration, but this is a tad more efficient and simply cleaner.
| | | | * delay next token fetching when opening namespaceOswald Buddenhagen2010-09-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | otherwise, if the next token to be fetched is a non-empty #define, it would save the context before entering the namespace, and thus the post-define context restore would just discard the namespace entry. Task-number: QTBUG-12683
| | | | * don't let operator overloads confuse usOswald Buddenhagen2010-09-101-0/+15
| | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-11426
| | | | * don't try to show source when no locations are givenOswald Buddenhagen2010-09-102-4/+4
| | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-13466
| | | | * Revert "Doc: fixing page name bug caused by ↵Morten Engvoldsen2010-09-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 07bbace404078dcfd82eff717daa97299b8ba52c changing qml elements page" Doc: pulling back redundant fix that is breaking links - qmlelements.html/declarativeelements.html This reverts commit 064b7fe6f97bcf214f749794c5ccab3b4cf0bcc7.
| * | | | qdoc: Fixed an html formatting error in the QML property list.Martin Smith2010-09-151-21/+1
| | | | |
| * | | | Merge branch '4.7-upstream' into 4.7-docA-Team2010-09-131-0/+1
| |\ \ \ \ | | |/ / /
| | * | | Fix compile error for runonphone on linux/gcc4.4.3Adenilson Cavalcanti da Silva2010-09-131-0/+1
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make it build: - fixing missing prototype declaration - explicit inclusion header file Merge-request: 813 Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
| * | | Merge branch '4.7-upstream' into 4.7-docA-Team2010-09-1014-0/+1337
| |\ \ \ | | |/ /
| | * | Fixed compiler warnings in meego graphics system helper.Samuel Rødal2010-09-103-13/+13
| | | |
| | * | Added meego graphics system helper to features/qt.prf and syncqt.Samuel Rødal2010-09-101-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | MeeGo graphics system helper headers are now synced and the correct include path and libraries are added to an application by doing QT += meegographicssystem helper in the .pro file.
| | * | Use QFactoryLoader to ensure we get the correct graphics system plugin.Samuel Rødal2010-09-103-18/+35
| | | | | | | | | | | | | | | | Also, this prevents hard-coding the path to the meego plugin.
| | * | Updated license headers for meego graphics system helper.Samuel Rødal2010-09-1012-84/+408
| | | |
| | * | Fixed compilation and API of meego graphics system helper.Samuel Rødal2010-09-1014-228/+224
| | | |
| | * | Renamed meego graphics system helper files.Samuel Rødal2010-09-1013-0/+0
| | | |
| | * | Imported meego graphics system helper sources.Samuel Rødal2010-09-1013-0/+1001
| | |/ | | | | | | | | | From http://www.gitorious.com/meego-graphics/meego-graphics
| * | Doc: Excluded the libconninet library from the documentation.David Boddie2010-09-084-6/+10
| | | | | | | | | | | | | | | | | | As discussed with the developers in Brisbane. Reviewed-by: Trust Me
| * | Merge branch '4.7-oslo1' into 4.7-docA-Team2010-09-071-1/+0
| |\ \ | | |/
| * | Merge branch '4.7-oslo1' into 4.7-docA-Team2010-09-0722-125/+204
| |\ \
| * | | Doc: Added dual documentation license information to the HTML templates.David Boddie2010-09-063-0/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This completes the work to explicitly license the documentation under the GNU Free Documentation License and the Qt Commercial License. Reviewed-by: Trust Me
| * | | Merge commit 'staging-1/4.7' into doc-4.7Morten Engvoldsen2010-09-0337-458/+590
| |\ \ \
| * \ \ \ Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-doc-team into doc-4.7Morten Engvoldsen2010-09-024-9/+9
| |\ \ \ \
| | * | | | Fixed spelling, broken links, and missing default values.Jerome Pasion2010-08-304-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Tasks: QTBUG-13271, QTBUG-13212, QTBUG-12321 Reviewer: David Boddie
* | | | | | configure.exe: endianess on Windows is always little endianJoerg Bornemann2010-09-201-4/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | No need to check the host system endianess. Task-number: QTBUG-7819 Reviewed-by: ossi
* | | | | | Support "icon form theme" inside property editorJarek Kobus2010-09-164-47/+276
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com> Task-number: QT_BUG-7777
* | | | | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-09-1063-625/+869
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: bin/syncqt demos/declarative/snake/content/snake.js demos/declarative/snake/snake.qml doc/src/development/qmake-manual.qdoc src/corelib/plugin/plugin.pri src/gui/kernel/qapplication_win.cpp src/gui/kernel/qdesktopwidget_win.cpp src/gui/painting/qdrawhelper.cpp tests/auto/qdir/tst_qdir.cpp tools/qdoc3/test/assistant.qdocconf tools/qdoc3/test/designer.qdocconf tools/qdoc3/test/linguist.qdocconf
| * | | | | Tools (uic/rcc): Improve warning messages.Friedemann Kleint2010-09-071-1/+0
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Output as 'filename: Warning: message' and make some uic warnings more verbose to make Qt Creator parsing easier. Fix resource warning in Qt Designer. Reviewed-by: dt Rubber-stamped-by: Tobias Hunger <tobias.hunger@nokia.com>
| * | | | explicitly remove qt_webkit_version.pri when building with -no-webkitOswald Buddenhagen2010-09-071-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | otherwise it would stay around from a possible previous build with webkit and confuse the heck out of the build system. Task-number: QTBUG-13459
| * | | | Doc: fixing page name bug caused by 07bbace404078dcfd82eff717daa97299b8ba52c ↵Morten Engvoldsen2010-09-071-1/+1
| | | | | | | | | | | | | | | | | | | | changing qml elements page
| * | | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Morten Engvoldsen2010-09-076-19/+74
| |\ \ \ \
| | * | | | Pause orientation sensors in Qml Viewer when the application window is not ↵Joona Petrell2010-09-075-17/+73
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | active Task-number: QTBUG-13347 Reviewed-by: Martin Jones
| | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-09-064-4/+21
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (33 commits) make shadow builds not write into the source dir Fix failing tst_qmdisubwindow test after 71a3b1a0d3 Doc: update the documentation of QUrl about HTML Form encoding search translator comments Install translators earlier in assistant Fix compilation on ARM: don't include kernel headers Fix compilation of qmake with MSVC Doc: Updating known-issues page. Recognize @, #, $ and ` as word separators rebuild configure.exe Fix dependencies so JOM will handle parallellization properly Symbian: Disable IPv6 for now Doc: Fixed namespaced Qt build breakage in the model/view tutorial. Doc: Fixing links on index page and corecting HTML in the template. Accept empty authority segments in QUrl as different from not-present Doc: Adds line about non-support for Webkit on Solaris protect nil dictionary from release. Fix potential KERN-EXEC 0 on Symbian. Ukrainian translation updated Fix remote crash in delivering D-Bus calls with too few arguments ...
generated by cgit v0.12 at 2025-01-23 18:15:05 (GMT)