summaryrefslogtreecommitdiffstats
path: root/tools
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-02-1144-127/+9789
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: qdoc: Added a build rule for the documentation - disabled by default. Doc: Added the qdoc manual to the repository for future maintenance. qdoc3: Fixed bug in creation of qt.pageindex. qdoc3: Added capability to create qt.pageindex. Incorrect property setter generated by dumpcpp for Microsoft Word 2007. Cocoa: Implement our own NSApplication subclass Cocoa: Menu in menubar stays highlighted qdoc: Made a temporary fix for comment highlighting. Doc: Tidied up the class layout and removed an unnecessary image. Doc/qdoc: Use Chinese titles; canonicalize titles with non-ASCII chars. Doc/qdoc: Converted encoding of ISO-8859-1 docs to UTF-8. Output UTF-8. qdoc: Removed debugging code. Doc: Updated the configuration file for the Simplified Chinese docs. qdoc: Standardized encoding names and updated the Chinese config files. Doc: Added Simplified Chinese documents and build rules for them. qdoc: Added support for different source and output character encodings. Doc: Synchronize configuration files for easier maintenance.
| * Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1David Boddie2010-02-1086-6302/+2592
| |\
| | * qdoc3: Fixed bug in creation of qt.pageindex.Martin Smith2010-02-101-1/+1
| | | | | | | | | | | | Task: QTBUG-7877
| | * Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1Martin Smith2010-02-1034-4987/+32
| | |\
| | * | qdoc3: Added capability to create qt.pageindex.Martin Smith2010-02-1015-23/+202
| | | | | | | | | | | | | | | | Task: QTBUG-7877
| * | | qdoc: Added a build rule for the documentation - disabled by default.David Boddie2010-02-101-0/+21
| | | | | | | | | | | | | | | | Reviewed-by: Trust Me
| * | | Doc: Added the qdoc manual to the repository for future maintenance.David Boddie2010-02-1014-0/+9262
| | | | | | | | | | | | | | | | Reviewed-by: Trust Me
| * | | qdoc: Made a temporary fix for comment highlighting.David Boddie2010-02-091-8/+6
| | | | | | | | | | | | | | | | Reviewed-by: Trust Me
| * | | Merge branch 'qdoc-i18n'David Boddie2010-02-0918-96/+298
| |\ \ \
| | * | | Doc/qdoc: Use Chinese titles; canonicalize titles with non-ASCII chars.David Boddie2010-02-082-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The documentation root in the qdocconf file now refers to the Chinese title for the Tutorials page. Modified qdoc's function to canonicalize titles so that it preserves characters that outside the range of ASCII letters and numbers. Reviewed-by: Trust Me
| | * | | Doc/qdoc: Converted encoding of ISO-8859-1 docs to UTF-8. Output UTF-8.David Boddie2010-02-082-4/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We now write UTF-8 encoded XHTML and assume all pure documentation which isn't pure ASCII is now UTF-8 encoded. Reviewed-by: Trust Me
| | * | | qdoc: Removed debugging code.David Boddie2010-02-081-2/+0
| | | | | | | | | | | | | | | | | | | | Reviewed-by: Trust Me
| | * | | Doc: Updated the configuration file for the Simplified Chinese docs.David Boddie2010-02-081-11/+9
| | | | | | | | | | | | | | | | | | | | Reviewed-by: Trust Me
| | * | | qdoc: Standardized encoding names and updated the Chinese config files.David Boddie2010-02-054-2/+152
| | | | | | | | | | | | | | | | | | | | Reviewed-by: Trust Me
| | * | | Doc: Added Simplified Chinese documents and build rules for them.David Boddie2010-02-041-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also updated qdoc's configuration reader so that we can put UTF-8 content in the .qdocconf files later. Reviewed-by: Trust Me
| | * | | Merge branch 'master' into qdoc-i18nDavid Boddie2010-02-0315-27/+91
| | |\ \ \
| | * | | | qdoc: Added support for different source and output character encodings.David Boddie2010-02-0210-84/+125
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, qdoc assumed Latin1 (ISO-8859-1) for source code and other documentation, and wrote out XHTML with the same encoding. This change adds additional configuration options (sourceencoding, outputencoding, naturallanguage) that enable translated documentation in non-Latin1 encodings to be built with qdoc. To be reviewed before merge into the master branch. Reviewed-by: Trust Me
| | * | | | Doc: Synchronize configuration files for easier maintenance.David Boddie2010-02-022-4/+5
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Trust Me
| | * | | | Merge commit 'origin/4.6' into oslo1-masterRohan McGovern2010-02-0157-396/+395
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gui/kernel/qeventdispatcher_mac.mm src/gui/kernel/qt_cocoa_helpers_mac.mm src/gui/widgets/qmenu_mac.mm tests/auto/qgraphicswidget/tst_qgraphicswidget.cpp tools/assistant/tools/assistant/centralwidget.cpp tools/linguist/lupdate/main.cpp
* | | | | | | Assistant: Remove assertion for all files being watched.ck2010-02-101-9/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | For unknown reasons, the assumption does not hold at times.
* | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into ↵Qt Continuous Integration System2010-02-105-266/+394
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/berlin-staging-1: Added method to clear the undo/redo stacks. Fixed setting back spaces when streaming a QPointF Move find widget in it's own source file. Some further cleanup.
| * | | | | | Move find widget in it's own source file. Some further cleanup.kh12010-02-095-266/+394
| | |_|_|_|/ | |/| | | | | | | | | | | | | | | | Reviewed-by: ck
* | | | | | Merge remote branch 'qt/4.6' into qt-master-from-4.6Qt Continuous Integration System2010-02-0934-4987/+32
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gui/kernel/qcocoapanel_mac.mm src/gui/kernel/qcocoasharedwindowmethods_mac_p.h
| * | | | | Remove the installer from the Qt sources.Thiago Macieira2010-02-0830-4972/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This copy of the installer doesn't work anymore. Reviewed-By: TrustMe
| * | | | | don't use QKeySequence::mnemonic() after allOswald Buddenhagen2010-02-051-6/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | it wastes cpu cycles, and it started flooding the console with irrelevant messages.
| * | | | | don't use stylesheet for just making labels boldOswald Buddenhagen2010-02-052-4/+6
| | | | | |
| * | | | | remove the rounded extra frame around the main message editorOswald Buddenhagen2010-02-051-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | for one, it just added visual noise. second, it did not respect the color scheme, which made it unusable with light-on-dark colors. Task-number: QTBUG-7778
| * | | | | Further bug fixes for enable/disables DEF files mechanism on SymbianIain2010-02-041-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix bug where all target types, including apps, plugins and static libraries were getting DEFFILE statements - now it's just libraries that get it. Fix bug where duplicate DEFFILE blocks were being added to projects that manually specified their own DEFFILE - this now tests for the qmake variable "defBlock" being set, and doesn't add additional DEFFILE statements if it is. NOTE: This means that adding DEFFILE statements to MMP_RULES manually should be done by creating a variable called defBlock, and adding that to the MMP_RULES (ie. MMP_RULES += defBlock) Fix bug in configure.exe, where using -nokia-developer for Windows builds would warn about Symbian DEF file usage (or lack thereof) Reviewed-by: Janne Koskinen Reviewed-by: Jason Barron
* | | | | | Assistant: Add missing license header.ck2010-02-092-7/+34
| | | | | |
* | | | | | Compile fixes.ck2010-02-083-12/+12
| | | | | |
* | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into ↵Qt Continuous Integration System2010-02-0837-1291/+2330
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/berlin-staging-1: A few trivial optimizations Rewrote bookmark handling, the previous code was just plain awful. Small style cleanup. Fix some warnings. Designer: Emit QDesignerPropertyEditorInterface::propertyChanged(). Designer: Support the 'windowOpacity'-property for forms. Expanded tst_QFileSystemModel::rootPath() to check directories ending in "." or ".." Assistant: Treat "unfiltered" filter in a apecial way. Assistant: Give meaningful context to translations. Fixed handling of paths containing ".." in QFileSystemModel on Windows. QAbstractItemModel docs: Fix typo. Assistant: Eliminate private tr contexts.
| * | | | | Rewrote bookmark handling, the previous code was just plain awful.kh12010-02-0519-1199/+2174
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QT-2603 Reviewed-by: ck
| * | | | | Small style cleanup.kh12010-02-051-6/+4
| | | | | |
| * | | | | Fix some warnings.kh12010-02-051-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: ck
| * | | | | Designer: Emit QDesignerPropertyEditorInterface::propertyChanged().Friedemann Kleint2010-02-043-5/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Broken by introduction of new signal with extended parameters. Emit both signals and block against each other. Tested against Eclipse integration. Reviewed-by: Jarek Kobus <jkobus@trolltech.com> Task-number: QTBUG-7764
| * | | | | Designer: Support the 'windowOpacity'-property for forms.Friedemann Kleint2010-02-032-2/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Analogous to windowTitle, etc. Task-number: QTBUG-7822
| * | | | | Assistant: Treat "unfiltered" filter in a apecial way.ck2010-02-024-29/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Don't put the translated string into the help engine. - Don't let it be edited by users. Reviewed-by: kh1
| * | | | | Assistant: Give meaningful context to translations.ck2010-02-027-48/+85
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: kh1 Instigated-by: Friedemann Kleint
| * | | | | Assistant: Eliminate private tr contexts.ck2010-01-292-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merging private tr contexts into the surrounding class keeps related strings together. Contributed-by: Ritt Konstantin Reviewed-by: kh1
* | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-02-041-2/+0
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Use a shared QScriptEngine for debugger console command scripts Fix QtScript debugger hang/crash issue with updating locals model doc: Fixed some qdoc warnings. Always activate popup windows on show doc: Fixed some qdoc warnings. Add the QMAKE_FILE_EXT variable to extra compilers generation. Cocoa: Tool Windows steal focus from the main window qdoc3: Removed a debug output. Update QTestLib documentation with chart use case.
| * | | | | | qdoc3: Removed a debug output.Martin Smith2010-02-041-2/+0
| | |_|_|_|/ | |/| | | |
* | | | | | Merge remote branch 'origin/4.6' into qt-master-from-4.6Olivier Goffart2010-02-0429-74/+77
|\ \ \ \ \ \ | | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: examples/assistant/simpletextviewer/findfiledialog.cpp qmake/generators/symbian/symmake.cpp tools/assistant/lib/qhelpgenerator.cpp tools/assistant/lib/qhelpsearchquerywidget.cpp translations/translations.pri
| * | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into ↵Qt Continuous Integration System2010-02-0228-77/+80
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1: Assistant examples: Fix missing QLatin1String. Added Czech translations. Webkit: Fix missing namespace. qmake: subdirs template: make distclean target use QMAKE_DISTCLEAN qmake: fix warnings qmake: Remove macro and simplify string expression previously using it qmake: use isActiveConfig() instead of hand-crafting comparisons Fix missing namespace. Assistant: Fix spelling mistakes. Assistant: Use const references in foreach loops. optimization: get rid of QString::fromUtf16() usage document QString::fromUtf16() slowness remove duplicated calculation of length remove pointless conditionals micro-optimization optimize qhash() Designer/uic/related examples: Fix source code scanning issues II.
| | * | | | | Added Czech translations.Pavel Fric2010-02-024-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: 440 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
| | * | | | | Assistant: Fix spelling mistakes.ck2010-02-016-16/+16
| | | | | | |
| | * | | | | Assistant: Use const references in foreach loops.ck2010-02-0111-46/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: kh1
| | * | | | | optimization: get rid of QString::fromUtf16() usageOswald Buddenhagen2010-02-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QString::fromUtf16() is slow - it does a BOM check and optionally byte swapping, which is utterly pointless when converting internal data structures which are raw utf16 in host byte order anyway. so replace it with QString::fromRawData() (for short-lived strings) or QString(const QChar *, int) (otherwise) if possible. Reviewed-by: axis Reviewed-by: mariusSO Reviewed-by: Bill King
| | * | | | | Designer/uic/related examples: Fix source code scanning issues II.Friedemann Kleint2010-02-0110-14/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix spelling errors, foreach()/QString usage, explicit constructors. Reviewed-By: Joerg Bornemann <joerg.bornemann@trolltech.com>
| * | | | | | Revert "Update default FPU flags on Symbian to be softvfp+vfpv2"Iain2010-02-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | RVCT2.2 build 686 crashes when compiling the drawhelpers with VFPv2 enabled. Until compiler workaround found, back out the change. This reverts commit 297e84fcfed524687455d3d94161bf2a32f62d37. Conflicts: configure.exe
| * | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-02-011-2/+2
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public: Documented limitations of add/setLibraryPath(s) on Symbian OS Deployed QtMultimedia.dll on Symbian Fixed the URL of known issues wiki page in docs Fixing benchmark to be runnable on Symbian device Fixing test to be runnable on Symbian devices. Fixed no-timeout case for QProcess::waitForFinished in Symbian Add visibility-inlines-hidden for GCCE on Symbian OS Catch by reference rather than by value Fixing benchmark for Symbian Remove warning about Symbian DEF files when running configure for Windows List item margins are too small due to invalid pixel metric value Remove left over forward declarations Avoided the loss of preedit text when losing focus on Symbian. Added support for ifdeffing for manufacturer in generated pkg files Shortening and fixing previous fix for QTBUG-6371 Update default FPU flags on Symbian to be softvfp+vfpv2 Using RunFast mode for RVCT
generated by cgit v0.12 at 2025-01-24 20:16:15 (GMT)