summaryrefslogtreecommitdiffstats
path: root/tools
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote branch 'origin/4.7' into master-from-4.7Rohan McGovern2010-10-0412-23/+40
|\ | | | | | | | | | | | | | | | | | | | | Conflicts: doc/src/snippets/code/doc_src_qmake-manual.qdoc src/corelib/arch/symbian/arch.pri src/declarative/graphicsitems/qdeclarativeflickable.cpp src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp src/opengl/gl2paintengineex/qtextureglyphcache_gl.cpp src/opengl/gl2paintengineex/qtextureglyphcache_gl_p.h tests/auto/qfontmetrics/tst_qfontmetrics.cpp
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-09-305-4/+8
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (27 commits) Revert "QDeclarativeDebugService: Add bc autotest" to get changes through staging. Doc clarification. Fallback to A8 text rendering on Mac when LCD smoothing is disabled Recreate Qt 4.7 branch QtDeclarative def files on top of changes made to Qt 4.7.1 Autotest that new "import Qt 4.7"s aren't added accidentally Document "import QtQuick 1.0" change Replace "import Qt 4.7" with "import QtQuick 1.0" Add test for Qt 4.7 module Replace all occurances of "Qt 4.7" with "QtQuick 1.0" Correct property type of PathAttribute::value in the docs. Register QtQuick 1.0 module. Remove unused AST node destructors. Fix crash when trying to append a null transform to QDeclarativeItem. Documentation. Documentation fix for Flickable (mark content properties as real, not int). QDeclarativeDebugClient: Fix gcc warning QmlDebugService: Check that there is a receiver before sending messages If a type is registered under several names, share the attached property object QmlViewer: Fix typo in comment QmlViewer: Fix assert on exit (Windows) ...
| | * Replace all occurances of "Qt 4.7" with "QtQuick 1.0"Aaron Kennedy2010-09-293-3/+3
| | | | | | | | | | | | | | | Task-number: QTBUG-13799 Reviewed-by: Martin Jones
| | * Register QtQuick 1.0 module.Aaron Kennedy2010-09-291-0/+1
| | | | | | | | | | | | | | | | | | | | | Qt 4.7 is still supported, but deprecated. Reviewed-by: Martin Jones Task-number: QTBUG-13799
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-09-281-1/+4
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: QDeclarativeDebugClient: Fix gcc warning QmlDebugService: Check that there is a receiver before sending messages If a type is registered under several names, share the attached property object QmlViewer: Fix typo in comment QmlViewer: Fix assert on exit (Windows) QDeclarativeDebugService: Add bc autotest Make QmlDebug protocol more robust Minimize parameter changes on glyph cache textures Only set maskTexture sampler uniform once Only repopulate the glyph cache when we know something could have changed Remove unnecessary attribute changes Invalidate QStaticText coord cache when texture size changes
| | | * QmlViewer: Fix typo in commentKai Koehne2010-09-281-1/+1
| | | |
| | | * QmlViewer: Fix assert on exit (Windows)Kai Koehne2010-09-281-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The QApplication object in main() is already destroyed when showWarnings() is called. Create another instance in this case. (Note that the assert will only be triggered for debug builds, while qmlviewer is built in release mode by default). Task-number: QTBUG-14009 Reviewed-by: Thomas Hartmann
| * | | Don't use translations for console tools under windowsVictor Ostashevsky2010-09-285-1/+11
| |/ / | | | | | | | | | | | | | | | | | | Task-number: QTBUG-13619 Merge-request: 2486 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
| * | Merge commit 'oslo-staging-1/4.7' into week39Morten Engvoldsen2010-09-271-7/+41
| |\ \ | | |/
| * | Merge branch '4.7-upstream' into 4.7-docA-Team2010-09-248-11/+26
| |\ \
| * | | Added a condition to skip obsolete functions during the threadness check.Jerome Pasion2010-09-241-16/+19
| | | | | | | | | | | | | | | | | | | | Reviewed-by: David Boddie Task:QTBUG-13786
| * | | Doc: maintainance - fixing grammar and spellingMorten Engvoldsen2010-09-231-2/+2
| | | |
* | | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-09-289-18/+67
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gui/painting/qrasterizer.cpp src/network/access/qnetworkaccessmanager.cpp tests/auto/qpainter/tst_qpainter.cpp tools/assistant/tools/assistant/mainwindow.cpp
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-09-241-7/+41
| |\ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Small fixes to Browser.qml More declarative autotests. Fix example.
| | * | Small fixes to Browser.qmlJoona Petrell2010-09-241-7/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - focus highlight should not be shown if user presses any physical key, only when up, down, left and right arrow keys are pressed - hybrid devices (touch + four-way rocker) showed two highlight at the same time after using rocker and pressing the screen with finger - touch highlight had gradient, focus highlight one didn't - the width of the focus highlight didn't update when listview changed size (for example after orientation change) Task-number: Reviewed-by: Martin Jones
| * | | Assistant: Don't register internal doc when using custom collection.Christian Kandeler2010-09-234-3/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This is intended to keep the internal documentation out of the "custom help viewer" use case, where it does not belong. Reviewed-by: kh1
| * | | Assistant: Move comment to the right place.Christian Kandeler2010-09-231-5/+7
| |/ /
| * | Designer: Minor BT issue: '-' button in Signal/Slot editor not updated.Friedemann Kleint2010-09-231-1/+1
| | | | | | | | | | | | Reviewed-by: Carlos Manuel Duclos Vergara <carlos.duclos@nokia.com>
| * | build configure.exe directly in source dirOswald Buddenhagen2010-09-231-1/+1
| | | | | | | | | | | | Reviewed-by: mariusSO
| * | fix build key generation for realOswald Buddenhagen2010-09-231-1/+1
| |/ | | | | | | | | Reviewed-by: danimo Task-number: QTBUG-13795
* | Unbreak configure.exeMarius Storm-Olsen2010-09-271-1/+1
| | | | | | | | Commit 8435ba93 caused compilation error
* | Allow fallback to fulltext search when keyword has not been found (remote).kh12010-09-278-24/+126
| | | | | | | | | | Task-number: QTBUG-12963 Reviewed-by: ck
* | Designer/QFormBuilder::save(): Fix traversal of QGridLayout/QFormLayoutFriedemann Kleint2010-09-232-56/+95
| | | | | | | | | | | | | | Remove redundant code in qdesigner_resource ass well. Reviewed-by: Jarek Kobus <jaroslaw.kobus@nokia.com> Task-number: QTBUG-13683
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Thiago Macieira2010-09-222-7/+17
|\ \ | |/ | | | | | | | | Conflicts: src/gui/painting/qtextureglyphcache_p.h src/opengl/gl2paintengineex/qtextureglyphcache_gl.cpp
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-09-221-3/+13
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: apply msvc flags to wince too fix qt static build on wince fix build with QT_NO_GESTURES qmake: fix quoting of moc calls Use regparm(3) for ICC too, otherwise it's an ABI mismatch in QChar Regenerate the Unicode tables after updates to the generator tool Compile in C++0x mode remove extra includes minor clean-ups minor improvements for data parsers tiny clean-up for generated data move QUnicodeTables:: script() and lineBreakClass() implementations make lupdate test less fragile Enable building Qt/Webkit with debug symbols Add breakpad support
| | * Enable building Qt/Webkit with debug symbolsAnders Bakken2010-09-201-3/+13
| | | | | | | | | | | | | | | | | | | | | | | | With this patch one can configure with -webkit-debug to build Webkit with debug symbols without having to manually edit WebCore.pro. Merge-request: 816 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
| * | Bump version to 4.7.1.Jason McDonald2010-09-2113-41/+41
| |/ | | | | | | Reviewed-by: Trust Me
* | 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.
generated by cgit v0.12 at 2024-12-30 20:11:27 (GMT)