summaryrefslogtreecommitdiffstats
path: root/tools
Commit message (Collapse)AuthorAgeFilesLines
* more fine-grained ts targetsOswald Buddenhagen2010-07-156-67/+0
| | | | | | | | | there are now per-language ts-<package>-<lang> and ts-<lang> targets to update only the files relevant for a given language. there is also a ts-all target which does what the old ts target did. the ts-<package> targets are now named ts-<package>-all and should not be used manually - they exist for the convenience of the ts-all target. the ts target is now only a help blurb.
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-07-1541-726/+270
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (96 commits) Unbreak the Maemo 5 build after the Symbian fix QNAM HTTP: Fix problem with cached files and metaDataChanged() Add a testcase for QTBUG-11213 to prevent future regressions. Autotest: reenable the NTLM proxy test on tst_QTcpSocket Autotest: add a small, boring test for QAuthenticator Add documentation for the QAuthenticator options. Expose the QAuthenticator map of options in the API. Add a QAuthenticatorPrivate parsing for the headers without QHttpResponseHeader Revert BIC change "Build Qt with option -Zc:wchar_t under MSVC" Fix for tst_qmdisubwindow::fixedMinMaxSize failure on Cocoa Add unit tests for QMimeData. fix qconfig.h reference for shadow builds Drag and drop cursor doesnot change on invalid drop areas (Cocoa) Crash while runnig tst_QMdiSubWindow::emittingOfSignals test on Cocoa fix qconfig.h aliased header creation fix warning directive on gnuc qdoc: Removed navigation arrow that was causing display problems. Silence warning when building with MSVC 2005 Fix an Assert in QTextTable Revert "Fix an Assert in QTextTable" ...
| * Unbreak the Maemo 5 build after the Symbian fixHarald Fernengel2010-07-151-5/+5
| | | | | | | | Reviewed-by: Robert Griebl
| * fix qconfig.h aliased header creationOswald Buddenhagen2010-07-141-10/+0
| | | | | | | | | | | | | | | | don't have configure create the forwarding headers (or symlinks on unix) for qconfig.h, but instead have syncqt create forwarding headers for not yet existing files. Reviewed-by: joerg
| * qdoc: Removed navigation arrow that was causing display problems.Martin Smith2010-07-142-12/+19
| | | | | | | | Task-number: QTBUG-12157, QTBUG-12148, QTBUG-12146
| * Fixing merge conflicts.Martin Smith2010-07-138-91/+283
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch '4.7-upstream' into 4.7 Conflicts: doc/src/declarative/advtutorial.qdoc src/declarative/graphicsitems/qdeclarativeloader.cpp src/declarative/graphicsitems/qdeclarativetextedit.cpp src/declarative/qml/qdeclarativeengine.cpp src/declarative/util/qdeclarativexmllistmodel.cpp
| * | qdoc: Fixed several <div> elements that had the "/>" ending.Martin Smith2010-07-131-4/+4
| | |
| * | qdoc: Fixed breadcrumbs for QML examples.Martin Smith2010-07-131-6/+11
| | | | | | | | | | | | Task-number: QTBUG-11679
| * | remove redundand translations project filesOswald Buddenhagen2010-07-1211-300/+55
| | | | | | | | | | | | | | | | | | lupdate is now powerful enough to use the real project files. this avoids that the file lists run out of sync (which they did, though not as much as i expected).
| * | make projects lupdate-friendlyOswald Buddenhagen2010-07-127-17/+17
| | | | | | | | | | | | | | | | | | lupdate currently doesn't parse .qmake.cache, so it lacks QT_SOURCE_TREE. so use relative paths in include statements and (the relevant) include paths instead.
| * | fixed built-in jpeg and tiff in configure.exe, QTBUG-12093Mark Brand2010-07-121-0/+4
| | | | | | | | | | | | | | | Merge-request: 740 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
| * | fix indentationMark Brand2010-07-121-1/+1
| | | | | | | | | | | | | | | Merge-request: 740 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-07-1024-371/+154
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (59 commits) Doc: Cleaning style and adding support for Creator Add NTLMv2 authentication support to QAuthenticator. QIODPLB: Sync behavior of ungetBlock() and ungetChar() QFileIconProvider: Load icons on demand. Doc: fixing offline style Fix handling of SSL certificates with wildcard domain names Doc: fixing examples link doc: Fixed several qdoc warnings. doc: Fixed several qdoc warnings. SSL library loading: load system libs only once Revert "SSL backend: load libraries for certificates only once" doc: Fixed several qdoc warnings. doc: Fixed several qdoc warnings. doc: Fixed several qdoc warnings. doc: Fixed several qdoc warnings. doc: Fixed several qdoc warnings. Doc: Adding support for Qt Creator style doc: Fixed last of the declarative/QML qdoc warnings. qdoc: Marked some missing declarative properties and functions as \internal. qhelpgenerator: Fix namespace syntax checking. ...
| | * | Doc: Cleaning style and adding support for CreatorMorten Engvoldsen2010-07-094-26/+21
| | | | | | | | | | | | | | | | Note: Support for creator has been disabled. HTML-generator needs an update.
| | * | Doc: fixing offline styleMorten Engvoldsen2010-07-091-7/+5
| | | |
| | * | Doc: Adding support for Qt Creator styleMorten Engvoldsen2010-07-093-2/+18
| | | | | | | | | | | | | | | | | | | | | | | | Adding a variable to the qdocconf file will now generate the docs in Creator format Reviewed-by: Martin Smith
| | * | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-07-091-2/+4
| | |\ \
| | | * | qhelpgenerator: Fix namespace syntax checking.ck2010-07-091-2/+4
| | | | |
| | * | | qdoc: Marked some missing declarative properties and functions as \internal.Martin Smith2010-07-091-1/+2
| | |/ /
| | * | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-07-081-1/+1
| | |\ \
| | | * | Doc: documenting docsMorten Engvoldsen2010-07-081-1/+1
| | | | |
| | * | | qdoc: Fixed broken QML property links.Martin Smith2010-07-082-2/+2
| | |/ / | | | | | | | | | | | | Task-number: QTBUG-12038
| | * | Doc: more cleaningMorten Engvoldsen2010-07-081-24/+3
| | | |
| | * | Doc: fixing escape characterMorten Engvoldsen2010-07-081-1/+1
| | | |
| | * | Doc: cleaning html generatorMorten Engvoldsen2010-07-081-26/+0
| | | |
| | * | Doc: changing index pageMorten Engvoldsen2010-07-082-7/+46
| | | |
| | * | Doc: fixing link to devnetMorten Engvoldsen2010-07-081-1/+1
| | | |
| | * | Doc: adding HTML class names and style docs to the generatorMorten Engvoldsen2010-07-081-32/+34
| | | |
| | * | Doc: fixing typoMorten Engvoldsen2010-07-081-3/+2
| | | |
| | * | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-07-081-1/+6
| | |\ \
| | | * | immediately set function context when entering a namespaceOswald Buddenhagen2010-07-071-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | otherwise, tr() calls without absolute qualification will not be properly qualified inside the first function if it has no qualification, either. Task-number: QTBUG-11742 (not really)
| | * | | qdoc: Fixed table of contents for namespace pages.Martin Smith2010-07-081-1/+2
| | |/ / | | | | | | | | | | | | Task-number: QTBUG-11992
| | * | qdoc: Fixed a few links to QtObject (QML:QtObject)Martin Smith2010-07-073-16/+10
| | | |
| | * | qdoc: Removed a lot of dead code to minimize confusion.Martin Smith2010-07-072-234/+1
| | | |
| | * | qdoc: Fixed the case where the property and type names are the same.Martin Smith2010-07-0714-50/+61
| | | | | | | | | | | | | | | | | | | | | | | | Also simplified some code. Task-number: QTBUG-6340
* | | | fix for looping crash log on data abortShane Kearns2010-07-151-7/+20
| |_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a thread panics, calling resume allows the thread to proceed to the exit handler and shut down. When a thread takes an exception, calling resume continues from the same point so the exception happens again. To avoid this, we add crashed thread ids to a list. If we see the same thread crash again, we terminate the process without trying to fetch the call stack a second time. Reviewed-by: Jason Barron
* | | Only support portrait and landscape orientations on Symbian when updating ↵Joona Petrell2010-07-133-18/+6
| | | | | | | | | | | | | | | | | | | | | the runtime.orientation property Task-number: QTBUG-12036 Reviewed-by: Martin Jones
* | | Calling setMinimumSize(0, 0) on a top-level window sometimes triggers a bugRobert Griebl2010-07-122-36/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | in the Compiz window manager which leads to the QML viewer mainwindow not being composited anymore (at least until the next resize). Since we need to somehow switch between fixed size and freely resizable views, we have to work around that bug using the layout constraint hints. Task-number: QTBUG-11771 Reviewed-by: kkoehne
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-07-107-55/+267
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (65 commits) Fix QTextDocument::markContentsDirty() Replace 4.6 in all .qdocconf files Resetting bindings through debugger interface Fix crash with invalid role indexes Make test pass and fix docs following removal of SpringFollow Remove autotests of depracted element SmoothedFollow doc improvements Clean up at the end of each test. Improve test reliability. Fix crash Follow -> Behavior Added some documentation to spring animation Fix spring animation Update QtDeclarative def files Fix exponential behavior of QTextCursor::removeSelectedText Optimization: change signal/slot to function call Don't show warning for attempts to load pixmaps asynchronously Remove Image::pixmap property. QML applications should use Update QmlChanges.txt Don't double delete cancelled pixmap cache requests ...
| * | Replace 4.6 in all .qdocconf filesKai Koehne2010-07-092-8/+8
| | | | | | | | | | | | Reviewed-by: David Boddie
| * | Fix Symbian buildJoona Petrell2010-07-081-0/+2
| | |
| * | Add Symbian support for runtime.orientation propertyJoona Petrell2010-07-074-0/+183
| | | | | | | | | | | | | | | Task-number: Reviewed-by: Martin Jones
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-07-072-47/+74
| |\ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (35 commits) Make Text, TextInput, and TextEdit all have the same size for the same text. More generated images in anticipation of QT-3574 Remove deprecated Flickable.flickDirection Revert "Fix exponential behavior of QTextCursor::removeSelectedText" Prevent a recursive debug output loop when writing to the logger widget. Fix performance of QTextDocumentPrivate::adjustDocumentChangesAndCursors Convert QtDeclarative def files to use LF line endings Update QtDeclarative def files doc improvements Changing currentIndex shouldn't cancel a flick unnecessarily. Fix input methods for TextInput elements with key handlers Document the QML enumeration basic type Fix TextEdit with no color property defined is drawn with wrong color Export QDeclarativePixmap doc Fix inconsistent reporting of module import errors when using versions. Make declarative pixmap cache easier to use Prepare for QTest persistent store for visual tests. Loosen font-sensitive test. Set correct license header. ...
| | * Prevent a recursive debug output loop when writing to the logger widget.Robert Griebl2010-07-061-4/+11
| | | | | | | | | | | | | | | | | | | | | (On Maemo5 the input method may generate a qWarning when someone clicks into the logger widget, which leads to an endless output recursion) Reviewed-by: Harald Fernengel
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-07-052-43/+63
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Make declarative pixmap cache easier to use Prepare for QTest persistent store for visual tests. Loosen font-sensitive test. Set correct license header. Work around QTBUG-11929 <br/> shouldn't trigger a new format range in QDeclarativeStyledText. Add styled text layout benchmark. Optimize QDeclarativeStyledText. Don't write to the logger widget while the application is closing down. Fix exponential behavior of QTextCursor::removeSelectedText Fix test for N900 (ARM-specific SVG results). docs - fix doc links, minor improvements Fix TextEdit bitmap tests testing the wrong element Make autotests work with qreal == float (in addition to double). Fix TextInput text getting improperly clipped fix doc links Fix docs to link to the new QML Viewer page instead of the Runtime page qmlviewer: Update the proxy factory when the user changes the proxy. Don't accept *files* that exist when *directory* is required.
| | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-07-042-43/+63
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Don't write to the logger widget while the application is closing down. Fix exponential behavior of QTextCursor::removeSelectedText Fix test for N900 (ARM-specific SVG results). docs - fix doc links, minor improvements Fix TextEdit bitmap tests testing the wrong element Make autotests work with qreal == float (in addition to double). Fix TextInput text getting improperly clipped fix doc links Fix docs to link to the new QML Viewer page instead of the Runtime page qmlviewer: Update the proxy factory when the user changes the proxy. Don't accept *files* that exist when *directory* is required.
| | | | * Don't write to the logger widget while the application is closing down.Robert Griebl2010-07-021-1/+1
| | | | | | | | | | | | | | | | | | | | Reviewed-by: TrustMe
| | | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-07-021-42/+62
| | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Fix exponential behavior of QTextCursor::removeSelectedText Fix test for N900 (ARM-specific SVG results). docs - fix doc links, minor improvements Fix TextEdit bitmap tests testing the wrong element Make autotests work with qreal == float (in addition to double). Fix TextInput text getting improperly clipped fix doc links Fix docs to link to the new QML Viewer page instead of the Runtime page qmlviewer: Update the proxy factory when the user changes the proxy. Don't accept *files* that exist when *directory* is required.
| | | | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-07-023-26/+30
| | | | | |\
| | | | | * | qmlviewer: Update the proxy factory when the user changes the proxy.Martin Jones2010-07-021-42/+62
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-11856