summaryrefslogtreecommitdiffstats
path: root/tools
Commit message (Collapse)AuthorAgeFilesLines
* Nokia corp to Digia Plc and contact info changesjutaipal2012-12-0533-47/+47
|
* Change copyrights from Nokia to Digia.Marko Valtanen2012-11-301223-27077/+28256
|
* Version bump to 4.7.6Marko Valtanen2012-11-3010-30/+30
|
* Add an app icon.Thiago Macieira2012-01-311-0/+2
| | | | | | | Thanks to Mario Carrion for the patch. Task-number: QTBUG-10099 Reviewed-by: Thiago Macieira <thiago.macieira@nokia.com>
* Designer/QFormBuilder::save(): Fix traversal of QGridLayout/QFormLayoutFriedemann Kleint2012-01-312-56/+95
| | | | | | | Remove redundant code in qdesigner_resource ass well. Reviewed-by: Jarek Kobus <jaroslaw.kobus@nokia.com> Task-number: QTBUG-13683
* Assistant: Get rid of bogus warning.Christian Kandeler2012-01-311-1/+2
| | | | Task-number: QTBUG-16096
* Designer: Set dirty correctly in case resource paths were changed.Friedemann Kleint2012-01-313-1/+5
| | | | | Reviewed-by: Jarek Kobus <jaroslaw.kobus@nokia.com> Task-number: QTBUG-17918
* Designer: Do not translate page object names of QMdiArea.Friedemann Kleint2012-01-311-2/+2
| | | | | | and page-based containers. Task-number: QTBUG-18244
* Designer: Allow promoted QWidget's to be buddies.Friedemann Kleint2012-01-311-1/+3
| | | | | | Extend check for focusPolicy by promoted check. Task-number: QTBUG-18631
* Designer: Specify 'notr' attribute for buttongroup name.Friedemann Kleint2012-01-311-0/+1
| | | | Such that the name does not show up in lupdate.
* Designer: Check for 0-spacing when loading grid settings.Friedemann Kleint2012-01-311-6/+14
| | | | Task-number: QTBUG-17542
* Fix errors when compiling Qt with STLportCédric OCHS2012-01-311-0/+1
| | | | | | Task-number: QTBUG-18374 Reviewed-by: Olivier Goffart Merge-request: 1157
* Make QtUiTools use the lib-infix passed to configure.Friedemann Kleint2012-01-311-1/+3
| | | | | | | Patch contributed by OpenEmbedded project. Reviewed-by: hjk Task-number: QTBUG-7169
* Bump Qt version to 4.7.5Marko Valtanen2012-01-3110-30/+30
|
* Fix security problem on webpage due to bad JSCasper van Donderen2011-10-214-47/+1
| | | | Reviewed-by: Trust Me
* Migrate addMarkUp function to QChar.Casper van Donderen2011-09-081-9/+9
| | | | Reviewed-by: Martin Smith
* Fix assert error on Windows with a negative char.Casper van Donderen2011-09-021-4/+4
| | | | | Reviewed-by: Denis Dzyubenko Fixes: QTBUG-20228
* Added an additional check to workaround an issue on Windows.David Boddie2011-08-301-1/+1
| | | | | | | | | Reviewed-by: David Boddie Original-patch-by: Friedemann Kleint (cherry picked from commit 8b1654ec6a892e84c1654c9196e80461ee6e92fa) (cherry picked from commit d62bb74d329b6ee5f6c52ac26e11bfe9a27f56a0) Reapplied after bad v4.7.4 merge
* Modified \since command behavior slightly to handle project and version.David Boddie2011-08-309-202/+174
| | | | | | | | | | (The since argument can contain a project name and version, defaulting to the qdoc project if only a version number is specified.) Refactored common code into the Generator class. Fixed \sincelist HTML generation for tables containing only one item. (cherry picked from commit 6a2f18140bbc41207eb2f5e2323b699600d89606) Reapplied after bad v4.7.4 merge
* qdoc: Fixed QTBUG-19338Martin Smith2011-08-302-5/+11
| | | | | | (cherry picked from commit 1ea0e706981006c48ad16a1ff8051df03610f20b) Reapplied after bad v4.7.4 merge
* don't crash when destroying childrenKonstantin Ritt2011-08-221-1/+2
| | | | | | this was uncovered by my don't-detach patch. Reviewed-by: ossi
* QTBUG-19500 lupdate fails to run from the Mac binary package on Mac OS X 10.5Simo Fält2011-06-291-2/+4
| | | | | | | Replaced std::cout with QTextStream Reviewed-by: Eckhart Köppen (cherry picked from commit f078275a2a4b2a279a6fcc24df3c21fe8b21f007)
* Update Japanese translations.Takumi ASAKI2011-06-061-1/+14
| | | | | | | | | * Fix some inconsistent translations. * Translate some missing messages. * Update Japanese phrasebook. Merge-request: 1249 Reviewed-by: ossi
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2011-05-171177-19993/+19993
|\ | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Updating file with CRLF line endings for the updated header Fix a regression in QList::mid() update gitignore remove -fno-stack-protector Fix make confclean Update licenseheader text in source files
| * Update licenseheader text in source filesJyri Tahtela2011-05-131177-19993/+19993
| | | | | | | | | | | | | | Updated version of LGPL and FDL licenseheaders. Apply release phase licenseheaders for all source files. Reviewed-by: Trust Me
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2011-05-139-155/+184
|\ \ | |/ |/|
| * doc: Fixed QTBUG-19226Martin Smith2011-05-121-2/+6
| |
| * doc: Fixed QTBUG-19223Martin Smith2011-05-121-1/+3
| |
| * doc: Remved debug code for QTBUG-18791Martin Smith2011-05-121-26/+0
| |
| * doc: Fixed QTBUG-18791Martin Smith2011-05-119-145/+193
| |
| * doc: Fixed a QML snippet referenceMartin Smith2011-05-091-0/+1
| | | | | | | | Also updated the Config class for reuse.
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-review into 4.7David Boddie2011-05-029-199/+297
|\|
| * qdoc: Completed task QTBUG-18790Martin Smith2011-04-151-0/+2
| |
| * qdoc: Completed task QTBUG-18733Martin Smith2011-04-145-125/+74
| |
| * qdoc: Last commit before merge into master.Martin Smith2011-04-132-1/+27
| | | | | | | | | | Added a function to class Config to unload the qdocconf file. This is for the qdoc wizard.
| * qdoc: Fixed license comment.Martin Smith2011-04-081-21/+7
| |
| * qdoc: Added missing copyright noticeMartin Smith2011-04-071-0/+41
| |
| * qdoc: Updated the QDoc manual.Martin Smith2011-04-071-5/+6
| |
| * qdoc: Updated the QDoc manual.Martin Smith2011-04-071-10/+13
| |
| * qdoc: Updated the QDoc manual.Martin Smith2011-04-071-38/+127
| |
| * qdoc: Updated the QDoc manual.Martin Smith2011-04-063-24/+23
| |
| * qdoc: Fixed QTBUG-18591Martin Smith2011-04-061-0/+2
| |
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-04-201-1/+1
|\ \ | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: QDeclarativeDebug: Fix endless loop for property with SCRITABLE false Fix Symbian/Linux compilation breakage in plugins/qmltooling Make QMLViewer startup animation stop after a while Fix excessive scrolling in TextInput with mid string pre-edit text.
| * | Make QMLViewer startup animation stop after a whileAlan Alpert2011-04-201-1/+1
| | | | | | | | | | | | Task-number: QTBUG-18621
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-04-151-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: QmlDebug: Fix license headers in new ost plugin Fixed autotest after b4b85257ccff6ba21bcbcbd46a9f7f09884abe79 Resolve unqualified attached properties correctly Adding plugin qmltooling/qmlostplugin for QML debugging over OST (USB) on Symbian. QmlDebug: Rename 'tcpserver' library to 'qmldbg_tcp' QDeclarativeDebug: Don't crash when connection is closed Fix so concurrent jobs produce the correct model results Fix uninitialized variable.
| * | Adding plugin qmltooling/qmlostplugin for QML debugging over OST (USB) on ↵Tom Sutcliffe2011-04-141-1/+1
| | | | | | | | | | | | | | | | | | | | | Symbian. Task-number: QTBUG-18764 Reviewed-by: kkoehne
| * | QmlDebug: Rename 'tcpserver' library to 'qmldbg_tcp'Kai Koehne2011-04-141-1/+1
| | | | | | | | | | | | | | | | | | | | | Make the name less ambiguous, especially on Symbian were all .dlls end up in sys\bin. Reviewed-by: Pawel Polanski
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2011-04-121-5/+7
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: look for makespec in the build dir first make collection of SUBDIRS in solution generator less bizarre run depend_command in build dir in VS generators as well fixify target source against build tree fix fixifying of QMAKE_SUBSTITUTES dist target: fixify OBJECTS_DIR against output dir fix paths of vpath-resolved files simplify: absolute fixification ignores the base dir arguments simplify: fileFixify for all same paths is always "." simplify: the input and output dirs are already normalized stop fixifying after first success create a pwd string with a trailing slash only on demand make uic3-generated moc files depend on mocinclude.tmp useful location reporting for errors from QMAKE_SUBSTITUTES clean up visual studio identification code prefix TEMPLATE_PREFIX to TEMPLATE even if it is "default-constructed" fix detection of relative location information
| * | | fix detection of relative location informationOswald Buddenhagen2011-04-111-5/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | an empty line number does not indicate relative loc info - it may be the result of -no-ui-lines. instead, an empty file name does indicate it - no file name at all makes no sense, so this means a previous messages has set it already. and we need this additional detection, as the entire ts file may have no line number info to base the decision on at all.
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2011-04-082-2/+2
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: make -markuntranslated work without -idbased fix conditional on shell type
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-03 22:11:49 +0000