summaryrefslogtreecommitdiffstats
path: root/tools
Commit message (Collapse)AuthorAgeFilesLines
* Added an install target to runonphone.axis2010-08-241-1/+2
| | | | RevBy: Trust me
* Doc: changing template menus to better reflect links from the index page.Morten Engvoldsen2010-08-221-3/+5
|
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-08-2024-66/+99
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: qmake vcxproj generator: fix usage of /Fd in QMAKE_CXXFLAGS qmake: fix vcxproj generator when using /Fd in QMAKE_CXXFLAGS Revised fix for pixmap loading Assistant: Clean-up - fix spelling mistakes. Assistant: Clean-up: Use const references in foreach loops. Assistant: Clean-up: Mark constructors as explicit. Assistant: Clean-up - add newlines to end of files. Doc: Changes to the index page and second level pages linking to the index page. Use Ctrl rather than Alt for switching tabs in the demo browser Doc: fixing creator bugs, removing menus and textbox in the header Update Japanese translations Ukrainian translation updated qtconfig and qvfb internationalization fixes add full width characters to ending() in linguist QFileDialog::HideNameFilterDetails breaks Cocoa QFileDIalog filter qdoc: Changed id attribute to be a UUID. just build connman and networkmanager plugins on linux
| * Assistant: Clean-up - fix spelling mistakes.Christian Kandeler2010-08-201-1/+1
| |
| * Assistant: Clean-up: Use const references in foreach loops.Christian Kandeler2010-08-202-3/+3
| |
| * Assistant: Clean-up: Mark constructors as explicit.Christian Kandeler2010-08-2013-16/+19
| |
| * Assistant: Clean-up - add newlines to end of files.Christian Kandeler2010-08-202-2/+2
| |
| * Doc: Changes to the index page and second level pages linking to the index page.Morten Engvoldsen2010-08-201-1/+1
| |
| * Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Morten Engvoldsen2010-08-206-37/+66
| |\
| | * qtconfig and qvfb internationalization fixesTasuku Suzuki2010-08-204-32/+59
| | | | | | | | | | | | | | | | | | | | | | | | - install QTranslators in qtconfig and qvfb - add tr() to qvfb strings Merge-request: 783 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
| | * add full width characters to ending() in linguistTasuku Suzuki2010-08-201-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | U+FF01 (FULLWIDTH EXCLAMATION MARK), U+FF1F (FULLWIDTH QUESTION MARK) and U+FF1A (FULLWIDTH COLON) Merge-request: 2455 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
| | * qdoc: Changed id attribute to be a UUID.Martin Smith2010-08-201-5/+4
| | | | | | | | | | | | Task-nr: QTBUG-11113
| * | Doc: fixing creator bugs, removing menus and textbox in the headerMorten Engvoldsen2010-08-201-6/+7
| |/
* | Add a menu option to open remote files in the QML viewerAlan Alpert2010-08-202-0/+15
|/ | | | Task-number: QTBUG-11019
* qdoc: Added more elements to qt.pageindexMartin Smith2010-08-191-0/+29
| | | | Task-nr: QTBUG-11113
* qdoc3: Added more pagewords & elements to the search index.Martin Smith2010-08-191-3/+3
| | | | Task-nr: QTBUG-11113
* qdoc3: Added more pagewords & elements to the search index.Martin Smith2010-08-191-0/+6
| | | | Task-nr: QTBUG-11113
* Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-08-181-1/+1
|\
| * make error messages consistentOswald Buddenhagen2010-08-171-1/+1
| | | | | | | | | | this re-uses an existing string and obsoletes another one, so it is ok during string freeze.
* | qdoc: Reorganized the QML elements table to be a dictionary...Martin Smith2010-08-182-35/+95
|/ | | | ...and a set of functional group pages.
* qdoc: Reorganized the QML elements table to be a dictionary...Martin Smith2010-08-163-0/+21
| | | | ...and a set of functional group pages.
* qdoc: Added the fix to change qml-qml-file.name to qml-file.nameMartin Smith2010-08-131-3/+3
|
* Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-08-124-43/+185
|\
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-08-129-25/+125
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Fix some #ifdefs to compile for a specific combination of featuress that was previously unsupported update Russian translations for Qt and tools Updated Slovenian translations for Qt 4.7 doc: The QML Qt element was missing from the documentation. 64-bit versions of PREMUL, BYTE_MUL and INTERPOLATE_PIXEL_256 QXmlStreamReader: avoid unnecessary detaching QSslCertificate: support expiration dates > 2049 Doc: Fixing typo Doc: Fixing bug involving header misplacement in Creator style qdoc: Added list of all members (including inherited) page to QML elements. qdoc: Ensured that text is encoded correctly. qdoc: Fixed non-well-formed markup. Doc: Fixed typo in a shortcut string. Remove useless QString::clear() from QSharedData example snippet. Move note on connectToBus() not actually being able to reconnect to Doc: Added more license information.
| | * update Russian translations for Qt and toolsRitt Konstantin2010-08-111-2/+14
| | | | | | | | | | | | | | | Merge-request: 2445 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-08-113-41/+171
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: (27 commits) Disable minRightBearing optimization in QTextLayout on Mac Added one test for QRegExp QMetaObject::normalizeSignature avoid reading past the string in case of invalid signature given. Add text decoration support to QStaticText Fix QString::arg: When specifying %L1, the group separator would be added even if the local specify QLocale::OmitGroupSeparator QtDeclarative: get rid of warnings in public header doc: Clarify documentation of QStaticText Fix scrollbar randomly popping up in QPlainTextEdit Remove the definition of QT_HAVE_NEON from qt.prf Use the fast Neon conversion for converting colors of jpeg images. Do the conversion from RGB888 to RGB32 using Neon Move the build of Neon file from painting.pri to gui.pro QSharedPointer documentation: specify that it is not safe to operate on the same object in different threads compilation with QT_NO_DEPRECATED Test we do not have compiler warnings in our headers with more options QStyleSheet documentation: QMenu's tear-off is styled with ::tearoff Doc: Fixed qdoc warnings. Fix QTextEngine overflow caused by extremely long text Replace the SSE prologues by a macro QDom: Do not crash on "<a:>text</a:>" ...
| | * \ Merge commit 'remotes/origin/4.7' into qt47s2Thomas Zander2010-08-111-2/+2
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/src/examples/simpletreemodel.qdoc doc/src/examples/spinboxdelegate.qdoc doc/src/index.qdoc src/declarative/qml/qdeclarativeimageprovider.cpp
| | * \ \ Merge remote branch 'origin/4.7' into oslo-staging-2/4.7Olivier Goffart2010-08-0917-151/+218
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/src/index.qdoc src/dbus/qdbusconnection.cpp src/gui/s60framework/qs60mainapplication.cpp src/gui/s60framework/qs60mainappui.cpp src/network/access/qnetworkrequest.cpp src/network/bearer/qnetworkconfiguration.h
| | * \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7David Boddie2010-08-061-1/+1
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/declarative/util/qdeclarativeanimation.cpp
| | * \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7David Boddie2010-08-0510-11/+294
| | |\ \ \ \ \
| | * | | | | | Doc: Fixed qdoc warnings.David Boddie2010-08-051-5/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Trust Me
| | * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7David Boddie2010-08-0469-1964/+1469
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/src/examples/qml-examples.qdoc
| | * \ \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7David Boddie2010-07-1646-798/+342
| | |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7David Boddie2010-07-1252-1496/+5481
| | |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7David Boddie2010-06-3015-178/+528
| | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: tools/qdoc3/test/qt-html-templates.qdocconf
| | * | | | | | | | | | Doc: Synchronize HTML templates for each language.David Boddie2010-06-283-37/+170
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Trust Me
* | | | | | | | | | | | qdoc: All references to -assistant and -base were removed.Martin Smith2010-08-123-29/+5
| |_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Flags allowed are now -creator and -online. -creator is the default.
* | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7David Boddie2010-08-1112-26/+223
|\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-08-111-3/+0
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / /
| | * | | | | | | | | | fix loading of module configsOswald Buddenhagen2010-08-111-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | do it in qt_config.prf instead of in the autogenerated qconfig.pri files. this is waaaay more elegant, and allows us to easily use the magic in that file which avoids loading qt configuration from the qt install dir while building qt itself. Reviewed-by: joerg Reviewed-by: Simon Hausmann Task-number: QTBUG-12698
| | * | | | | | | | | | configure.exe: don't write the QT_NAMESPACE define to .qmake.cacheJoerg Bornemann2010-08-111-1/+0
| | | |_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since 37fc9b6c3e10bb708d6c294ac37693b6df1d5351 we're already writing the QT_NAMESPACE variable to qconfig.pri. Feature file qt.prf adds the QT_NAMESPACE=MyNamespace define for us. Task-number: QTBUG-5221 Reviewed-by: ossi
| * | | | | | | | | | qdoc: Added list of all members (including inherited) page to QML elements.Martin Smith2010-08-117-9/+98
| |/ / / / / / / / /
| * | | | | | | | | Correcting spelling mistakes in documentation. Part of fix for QTBUG-11938.Jerome Pasion2010-08-091-2/+2
| | |_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewer: David Boddie Task number: QTBUG-11938
| * | | | | | | | Translation work for 4.7Pierre Rossi2010-08-061-0/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | validating and adding some french translations. Plus all the fixes from Gabriel's extensive review. Doc: Fix a typo Reviewed-by: gabi
| * | | | | | | | Some french translationsPierre Rossi2010-08-061-5/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: gabi
| * | | | | | | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-08-061-4/+5
| |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Morten Engvoldsen2010-08-063-3/+7
| | |\ \ \ \ \ \ \ \
| | * | | | | | | | | Doc: Fixing validation bugsMorten Engvoldsen2010-08-061-4/+5
| | | | | | | | | | |
| * | | | | | | | | | doc: Re-introduced next/previous page links in the footer.Martin Smith2010-08-061-0/+55
| | |/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-Nr: QTBUG-12278
| * | | | | | | | | doc: Fixed some qdoc errors.Martin Smith2010-08-061-2/+5
| | | | | | | | | |