summaryrefslogtreecommitdiffstats
path: root/tools
Commit message (Collapse)AuthorAgeFilesLines
* Attempt to fix symbian 3.1 and 3.2 compile break.Jason McDonald2011-02-181-3/+7
| | | | | | | | | | | | | | e46c44f9538dbe5b44ce61d3a42403cfa471ae8b restructured qml.pri. In the original version the else part at the bottom of the file was processed for Symbian 3.1 and 3.2, but the commit stopped that from happening. This commit makes the minimal change to make the statements in the else part apply to 3.1 and 3.2 again. Really the file should be restructured to have separate logic for setting each vairable, but I'll leave that task for the developers. Reviewed-by: Eckhart Koppen
* Designer: Slots of main container not visible in signal/slot editor.Friedemann Kleint2011-02-112-3/+12
| | | | | | | | Fix a regression introduced by dd7873cd7e02e42b384709f33a34f69bc06fb25d of QTBUG-17179. Reviewed-by: Kai Koehne <kai.koehne@nokia.com> Task-number: QTBUG-17358
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2011-02-093-29/+66
|\ | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: 4.7.2 changes Change paging attributes for Symbian binaries Fix build failure Fix regression in creating mkspecs/default Changes for 4.7.2 Recreate Symbian raster backing store when WA_TranslucentBackground set
| * Fix regression in creating mkspecs/defaultMiikka Heikkinen2011-02-093-29/+66
| | | | | | | | | | | | | | | | Copy all files from original mkspec to default one and modify *.conf, *.prf, and *.h to include their original counterparts. Task-number: QTBUG-17258 Reviewed-by: Oswald Buddenhagen
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2011-02-083-15/+22
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (21 commits) Fix compilation of QMutableSetIterator::value() with QT_STRICT_ITERATORS Fix the compilation error that the previous fix didn't fix Use the thread-default glib context for the DBus connection in the ICD bearer manager. Check that _POSIX_THREAD_SAFE_FUNCTIONS is larger than zero. Use an increasing size for the getpwuid_r buffer. Make sure we use at least 1024 bytes when calling getpwuid_r. Fix compilation error: symbol is namespaced. Don't crash when creating backtrace for built-in JS function (2nd try) Revert "Improved performance of mapFromGlobal/mapToGlobal on X11" QtDBus: do not wait for reply for AddMatch and RemoveMatch Make qdbus show all types, even those that it doesn't know about Doc: Fix the docs saying what the locale codec is used for Autotest: simple improvements Autotest: Use QElapsedTimer for timings directfb: Pixmap creation always premultiplied the alpha even when it is already premultiplied in the image. Don't crash when BMP color table is broken Designer: Fix a crash in the Signal-Slot-Editor. complain about unmatched quotes/parens use const ref move multiple inclusion check for feature files to correct location ...
| * | Fix the compilation error that the previous fix didn't fixThiago Macieira2011-02-081-1/+1
| | |
| * | Fix compilation error: symbol is namespaced.Thiago Macieira2011-02-081-0/+2
| | | | | | | | | | | | Reviewed-by: Rohan McGovern
| * | Make qdbus show all types, even those that it doesn't know aboutThiago Macieira2011-02-061-2/+9
| | |
| * | Designer: Fix a crash in the Signal-Slot-Editor.Friedemann Kleint2011-02-042-13/+11
| |/ | | | | | | | | | | | | | | | | Object search found deleted widgets by name when searching on the form window. Search main container instead, do not assert. Reviewed-by: Jarek Kobus <jaroslaw.kobus@nokia.com> Task-number: QTBUG-17179
* | Ensured that trailing newlines are quoted and correct atoms are used.David Boddie2011-02-052-5/+17
| | | | | | | | | | | | Newlines after comments at the end of files were previously omitted. An assumption about the type code being quoted caused incorrect CSS classes to be used and extra HTML elements to be used.
* | Fixed build breakage.David Boddie2011-02-041-1/+1
| |
* | Fixed C++ and plain markup found in \c commands.David Boddie2011-02-041-6/+25
| |
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7David Boddie2011-02-0410-58/+105
|\ \
| * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-02-027-47/+89
| |\ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (165 commits) Changing header or footer failed to delete the previous. Avoid index-out-of bounds related crash in Grid Move Qt.application docs into Qt global object page Add initial size to ListView in FolderListModel example update What's New for QtQuick 1.1 and AnimatedImage docs Improve docs on Item::visible and Item::opacity Make sure we update Loader size if item size changes after creation. Froze two more symbols and fixed compilation error (QtQuick11). PinchArea sometimes failed. Froze Symbian def files for QtQuick11. Clarify that IntValidator performs locale specific validation. Add a mouseSelectionMode property to TextEdit and TextInput. Add missing versioning tests for new QtQuick 1.1 properties/methods. Use qobject_cast rather than dynamic_cast. expect fail for some PinchArea tests on mac Allow functions to be passed in as values for grouped properties Fix lineHeight autotests. Update Docs, Examples and Demos for new CreateObject overloadable Adding support for group properties in Component::CreateObject() Update test, versioning is fixed so expect-fail no longer needed ...
| | * Froze Symbian def files for QtQuick11.juhvu2011-02-011-0/+5
| | | | | | | | | | | | Reviewed-by: Martin Jones
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into qtquick11Martin Jones2011-01-191228-1251/+1261
| | |\
| | * | Fix declarative autotest compilation on SymbianJoona Petrell2011-01-182-10/+13
| | | | | | | | | | | | | | | | | | | | Task-number: Reviewed-by: Martin Jones
| | * | Add a way to clear warnings in qmlviewer warnings window on SymbianJoona Petrell2011-01-182-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Basically by adding a clear soft key to the currently empty right soft key in warninng window in qmlviewer. Task-number: Reviewed-by: Martin Jones
| | * | Add a warning when translating QML application in qmlviewer failsJoona Petrell2011-01-171-2/+5
| | | | | | | | | | | | | | | | | | | | Task-number: Reviewed-by: Martin Jones
| | * | Remove unnecessary debug traces from declarative classesJoona Petrell2011-01-171-1/+0
| | | | | | | | | | | | | | | | | | | | Task-number: Reviewed-by: Martin Jones
| | * | Add no warnings label to qmlviewer warnings windowJoona Petrell2011-01-102-1/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Small developer usability improvement Task-number: Reviewed-by: Bea Lam
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into qtquick11Martin Jones2011-01-076-8/+61
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/declarative/graphicsitems/qdeclarativeitem.cpp tests/auto/declarative/qdeclarativexmllistmodel/tst_qdeclarativexmllistmodel.cpp
| | * | | Provide qmlviewer warning window also on SymbianJoona Petrell2010-12-313-31/+35
| | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-10800 Reviewed-by: Christopher Ham
| | * | | Forward qmlviewer traces to system's default message handler on SymbianJoona Petrell2010-12-301-4/+3
| | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-16353 Reviewed-by: Christopher Ham
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into qtquick11Joona Petrell2010-12-201-1/+7
| | |\ \ \
| | * | | | QDeclarativeDebug: Include debugger plugin in qmlviewer.sisKai Koehne2010-12-171-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Developers that want to debug qml on their device have to now install qmlviewer.sis. Reviewed-by: Christiaan Janssen
| * | | | | Don't ignore source-text when generating qsTrId translations for QMLTor Arne Vestbø2011-02-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: ossi
| * | | | | Fix a crash when undoing form layoutJarek Kobus2011-02-012-10/+15
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In a rare case when breaking a layout might make widgets overlap, the internal heuristic failed when recreating an original layout during undo. Some widgets were removed from the grid. The patch fixes this heuristic (makes sure we don't remove other widgets). Creating a form layout from overlapping widgets works better now. Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com> Task-number: QTCREATORBUG-3616
* | | | | Added a configuration variable for the QML documentation file prefix.David Boddie2011-02-0310-175/+217
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This required a certain amount of refactoring to make the new variable visible to the relevant parts of the code. I also moved the fullDocumentLocation() function into the HtmlGenerator class, where it belongs. Task-number: QTBUG-17071
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2011-02-021-1/+1
|\ \ \ \ \
| * | | | | Doc: Fixing typoSergio Ahumada2011-01-311-1/+1
| | | | | |
* | | | | | Fixed a bug that caused marked up inline text to be truncated.David Boddie2011-02-021-1/+1
| | | | | |
* | | | | | Doc: Updated the copyright statements in the templates.David Boddie2011-02-012-2/+2
|/ / / / /
* | | | | Doc: Added a missing style sheet to the qhp manifest.David Boddie2011-01-281-1/+1
| | | | | | | | | | | | | | | | | | | | This may need to be cherry-picked into the 4.7.2 release.
* | | | | Doc: Fixed the qthelp namespace for the Qt documentation.David Boddie2011-01-281-1/+1
| | | | | | | | | | | | | | | | | | | | This may need to be cherry-picked into the 4.7.2 release.
* | | | | Merge branch 'qdoc-simplified' into 4.7David Boddie2011-01-271-6/+4
|\ \ \ \ \
| * | | | | Avoid hard-coding product names in page titles.David Boddie2011-01-271-6/+4
| | | | | | | | | | | | | | | | | | | | | | | | Fall back to Qt if no product name is used.
* | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7David Boddie2011-01-264-7/+19
|\ \ \ \ \ \ | |/ / / / / |/| / / / / | |/ / / /
| * | | | Make qvfb compile (and work) with libpng 1.5Bernhard Rosenkraenzer2011-01-171-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In libpng >= 1.5.0, the png_info struct is no longer exported Merge-request: 1023 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
| * | | | don't ignore return code from syncqtOswald Buddenhagen2011-01-171-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-16176 Reviewed-by: mariusSO
| * | | | make qtlibinfix apply to QT_INSTALL_TRANSLATIONSOswald Buddenhagen2011-01-171-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the unix configure already got it right Task-number: QTBUG-15978 Reviewed-by: Alessandro Portale Reviewed-by: mariusSO
| * | | | don't claim declarative debugging support without having declarativeOswald Buddenhagen2011-01-171-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-15228 Reviewed-by: mariusSO
| * | | | fix typo in error messagesOswald Buddenhagen2011-01-172-2/+2
| | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-16369
* | | | | Removed a configuration file that can no longer be used.David Boddie2011-01-241-12/+0
| | | | |
* | | | | Merge branch '4.7' into qdoc-simplifiedDavid Boddie2011-01-241-1/+4
|\ \ \ \ \
| * | | | | Ensured that an uninitialized output codec is never used.David Boddie2011-01-241-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | See task for contributor information. Task-number: QTBUG-16462
* | | | | | Merge branch '4.7' into qdoc-simplifiedDavid Boddie2011-01-211192-1214/+1271
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/declarative/graphicsitems/qdeclarativeitem.cpp src/declarative/util/qdeclarativeanimation.cpp
| * | | | | Merge branch '4.7' of ../qt into 4.7David Boddie2011-01-131192-1213/+1264
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/src/declarative/qdeclarativeintro.qdoc doc/src/declarative/qdeclarativereference.qdoc doc/src/snippets/declarative/focus/focusColumn.qml tools/qdoc3/apigenerator.cpp tools/qdoc3/apigenerator.h tools/qdoc3/archiveextractor.cpp tools/qdoc3/bookgenerator.cpp tools/qdoc3/bookgenerator.h tools/qdoc3/ccodeparser.cpp tools/qdoc3/command.cpp tools/qdoc3/command.h tools/qdoc3/cpptoqsconverter.cpp tools/qdoc3/dcfsection.cpp tools/qdoc3/dcfsection.h tools/qdoc3/jambiapiparser.cpp tools/qdoc3/jambiapiparser.h tools/qdoc3/javacodemarker.cpp tools/qdoc3/javacodemarker.h tools/qdoc3/javadocgenerator.cpp tools/qdoc3/javadocgenerator.h tools/qdoc3/linguistgenerator.cpp tools/qdoc3/linguistgenerator.h tools/qdoc3/loutgenerator.h tools/qdoc3/mangenerator.cpp tools/qdoc3/mangenerator.h tools/qdoc3/polyarchiveextractor.cpp tools/qdoc3/polyarchiveextractor.h tools/qdoc3/polyuncompressor.cpp tools/qdoc3/polyuncompressor.h tools/qdoc3/qsakernelparser.cpp tools/qdoc3/qscodemarker.cpp tools/qdoc3/qscodemarker.h tools/qdoc3/qscodeparser.cpp tools/qdoc3/qscodeparser.h tools/qdoc3/sgmlgenerator.cpp tools/qdoc3/sgmlgenerator.h tools/qdoc3/test/qt-html-templates.qdocconf tools/qdoc3/uncompressor.cpp tools/qdoc3/webxmlgenerator.cpp tools/qdoc3/webxmlgenerator.h
| | * | | | Update copyright year to 2011.Jason McDonald2011-01-101227-1237/+1237
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Trust Me
| | * | | | Fix for qtdemo bugJerome Pasion2011-01-101-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-15931 Reviewed-by: Kevin Wright
generated by cgit v0.12 at 2024-12-27 12:45:06 (GMT)