summaryrefslogtreecommitdiffstats
path: root/tools/assistant
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote branch 'origin/4.7' into master-from-4.7Rohan McGovern2010-10-042-0/+4
|\ | | | | | | | | | | | | | | | | | | | | Conflicts: doc/src/snippets/code/doc_src_qmake-manual.qdoc src/corelib/arch/symbian/arch.pri src/declarative/graphicsitems/qdeclarativeflickable.cpp src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp src/opengl/gl2paintengineex/qtextureglyphcache_gl.cpp src/opengl/gl2paintengineex/qtextureglyphcache_gl_p.h tests/auto/qfontmetrics/tst_qfontmetrics.cpp
| * Don't use translations for console tools under windowsVictor Ostashevsky2010-09-282-0/+4
| | | | | | | | | | | | | | Task-number: QTBUG-13619 Merge-request: 2486 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-09-285-8/+23
|\ \ | |/ | | | | | | | | | | | | Conflicts: src/gui/painting/qrasterizer.cpp src/network/access/qnetworkaccessmanager.cpp tests/auto/qpainter/tst_qpainter.cpp tools/assistant/tools/assistant/mainwindow.cpp
| * Assistant: Don't register internal doc when using custom collection.Christian Kandeler2010-09-234-3/+16
| | | | | | | | | | | | | | This is intended to keep the internal documentation out of the "custom help viewer" use case, where it does not belong. Reviewed-by: kh1
| * Assistant: Move comment to the right place.Christian Kandeler2010-09-231-5/+7
| |
| * Bump version to 4.7.1.Jason McDonald2010-09-211-1/+1
| | | | | | | | Reviewed-by: Trust Me
* | Allow fallback to fulltext search when keyword has not been found (remote).kh12010-09-278-24/+126
| | | | | | | | | | Task-number: QTBUG-12963 Reviewed-by: ck
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Thiago Macieira2010-09-213-4/+4
|\ \ | |/ | | | | | | | | | | | | Conflicts: src/corelib/kernel/qobject.h src/declarative/graphicsitems/qdeclarativeflickable.cpp src/declarative/graphicsitems/qdeclarativeflickable_p_p.h src/declarative/util/qdeclarativelistmodel.cpp
| * I18n: Fix some lupdate warnings.Friedemann Kleint2010-09-143-4/+4
| |
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-09-1012-56/+104
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: bin/syncqt demos/declarative/snake/content/snake.js demos/declarative/snake/snake.qml doc/src/development/qmake-manual.qdoc src/corelib/plugin/plugin.pri src/gui/kernel/qapplication_win.cpp src/gui/kernel/qdesktopwidget_win.cpp src/gui/painting/qdrawhelper.cpp tests/auto/qdir/tst_qdir.cpp tools/qdoc3/test/assistant.qdocconf tools/qdoc3/test/designer.qdocconf tools/qdoc3/test/linguist.qdocconf
| * Install translators earlier in assistantVictor Ostashevsky2010-09-061-2/+1
| | | | | | | | | | | | | | Help message and command line parsing errors will be shown translated Merge-request: 2466 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
| * Wrap translatable messages with tr() in assistant, designer and linguistVictor Ostashevsky2010-09-0110-50/+54
| | | | | | | | | | Merge-request: 2456 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
| * Enable loading/generating translations by assistant and linguist toolsVictor Ostashevsky2010-09-013-4/+49
| | | | | | | | | | | | | | | | | | | | QTranslator is installed in tools (qcollectiongenerator, qhelpconverter, qhelpgenerator, lconvert, lrelease, lupdate). Build targets that updates .ts files are changed to include strings from this tools. Merge-request: 2456 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* | Once we set a new source model, we need to disconnect the old one.kh12010-09-071-52/+51
| |
* | Add a boommark toolbar menu item as well.kh12010-09-071-1/+7
| |
* | Implement bookmarks toolbar.kh12010-09-065-36/+117
| |
* | Assistant: Fix race condition on start-up.Christian Kandeler2010-08-301-9/+7
| | | | | | | | | | | | | | On first start-up (empty settings), the internal documentation was not found. Reviewed-by: kh1
* | Fix broken bookmark filter.kh12010-08-271-2/+6
| |
* | Implement navigation history menus.kh12010-08-262-0/+97
| |
* | Fix typo. Remove some leftovers.kh12010-08-263-18/+1
| | | | | | | | Reviewed-by: ck
* | Make tabbed pages optional in Assistant.kh12010-08-2611-7/+245
| | | | | | | | | | Task-number: QTBUG-13012 Reviewed-by: ck
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-08-2516-21/+24
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | Conflicts: qmake/generators/win32/msbuild_objectmodel.cpp src/declarative/qml/qdeclarativexmlhttprequest.cpp src/opengl/opengl.pro src/opengl/qgl_p.h src/plugins/bearer/connman/qconnmanservice_linux.cpp tests/auto/qpainter/tst_qpainter.cpp tools/assistant/tools/assistant/helpviewer_qwv.h tools/assistant/tools/assistant/openpageswidget.h
| * 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
| |
| * 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.
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-08-131-5/+5
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gui/painting/qpainter.cpp src/gui/text/qtextengine.cpp tests/auto/qimage/tst_qimage.cpp tests/auto/qpainter/tst_qpainter.cpp tools/qdoc3/test/assistant.qdocconf tools/qdoc3/test/designer.qdocconf tools/qdoc3/test/linguist.qdocconf tools/qdoc3/test/qmake.qdocconf tools/qdoc3/test/qt-build-docs.qdocconf tools/qdoc3/test/qt-html-templates.qdocconf tools/qdoc3/test/qt-html-templates_zh_CN.qdocconf tools/qdoc3/test/qt.qdocconf
| * Assistant: Revert previous commit, issue was already fixed.ck2010-08-041-2/+1
| |
| * Assistant: Include QML docsck2010-08-041-1/+2
| | | | | | | | | | | | | | | | Surprisingly, the QML documentation is not integrated into the Qt docs, so it has to be explicitly included. Task-number: QTBUG-12625 Reviewed-by: kh1
| * Fixed spelling mistakes in documented functions, classes, etc. Part of ↵Jerome Pasion2010-07-291-5/+5
| | | | | | | | QTBUG-11938 and QTBUG-10801
* | Remove the use of deprecated qVariant*Olivier Goffart2010-08-062-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Test directory untouched. This just apply those regexp: git grep -O"sed -i 's/qVariantValue</qvariant_cast</'" qVariantValue git grep -O"sed -i 's/qVariantSetValue(\([^&*\(),]*\), */\\1.setValue(/'" qVariantSetValue git grep -O"sed -i 's/qVariantSetValue *<\([^>]*\)> *(\([^&*\(),]*\), */\\2.setValue<\\1>(/'" qVariantSetValue git grep -O"sed -i 's/qVariantCanConvert *<\([^>]*\)> *(\([^&*\(),]*\))/\\2.canConvert<\\1>()/g'" qVariantCanConvert git grep -O"sed -i 's/qVariantCanConvert *<\([^>]*\)> *(\([^&*\(),]*([^&*\(),]*)\))/\\2.canConvert<\\1>()/g'" qVariantCanConvert git grep -O"sed -i 's/qVariantFromValue\( *[(<]\)/QVariant::fromValue\\1/'" qVariantFromValue git checkout src/corelib/kernal/qvariant* Rev-by: dev mailing list
* | Remove the use of deprecated qFindChild(ren)Olivier Goffart2010-08-062-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | Test directory untouched. This just apply those regexp: git grep -O"sed -i 's/qF\(indChildr*e*n*<[^>]*>\)(this,* */f\\1(/'" qFindChild git grep -O"sed -i 's/qF\(indChildr*e*n*<[^>]*>\)(&\([^\(),]*\),* */\\2.f\\1(/'" qFindChild git grep -O"sed -i 's/qF\(indChildr*e*n*<[^>]*>\)(\([^\(),]*()\),* */\\2->f\\1(/'" qFindChild git grep -O"sed -i 's/qF\(indChildr*e*n*<[^>]*>\)(\([^\(),]*\):\([^\(),]*\),* */(\\2:\\3)->f\\1(/'" qFindChild git grep -O"sed -i 's/qF\(indChildr*e*n*<[^>]*>\)(\([^\(),]*\),* */\\2->f\\1(/'" qFindChild Rev-by: dev mailing list
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-07-285-111/+6
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | Conflicts: src/gui/kernel/qapplication.cpp tests/auto/qfileinfo/tst_qfileinfo.cpp tools/qdoc3/test/assistant.qdocconf tools/qdoc3/test/designer.qdocconf tools/qdoc3/test/linguist.qdocconf tools/qdoc3/test/qmake.qdocconf tools/qdoc3/test/qt-build-docs.qdocconf tools/qdoc3/test/qt.qdocconf
| * Remove qMemCopy() usage from all .cpp files of Qt itself.Robin Burchell2010-07-181-1/+1
| | | | | | | | | | | | | | | | This is (supposedly) more efficient as the compiler can optimise it to a builtin, per Thiago. Merge-request: 2430 Reviewed-by: Andreas Kling <andreas.kling@nokia.com>
| * more fine-grained ts targetsOswald Buddenhagen2010-07-152-26/+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.
| * remove redundand translations project filesOswald Buddenhagen2010-07-124-107/+26
| | | | | | | | | | | | 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-121-1/+1
| | | | | | | | | | | | 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.
| * qhelpgenerator: Fix namespace syntax checking.ck2010-07-091-2/+4
| |
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Thiago Macieira2010-07-151-0/+2
|\ \ | |/ | | | | | | Conflicts: src/gui/kernel/qapplication.h
| * Set the registration time while using the collection generator to register.kh12010-07-051-0/+2
| | | | | | | | | | Task-number: QTBUG-11911 Reviewed-by: ck
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Thiago Macieira2010-07-016-28/+23
|\ \ | |/ | | | | | | | | | | | | | | Conflicts: bin/syncqt src/gui/text/qtextlayout.cpp tools/assistant/tools/assistant/helpviewer_qwv.cpp tools/assistant/tools/assistant/helpviewer_qwv.h tools/configure/configureapp.cpp
| * We need to swallow the event, otherwise it might pop up several times.kh12010-06-231-0/+1
| | | | | | | | Reviewed-by: kh
| * Set the item data thru the model, so we actually emit dataChanged.kh12010-06-233-2/+10
| | | | | | | | | | Task-number: QTBUG-10629 Reviewed-by: kh
| * Doc: Relicensed the documentation under the GNU FDL version 1.3.David Boddie2010-06-211-25/+11
| | | | | | | | | | Reviewed-by: Trust Me Requested-by: Legal
| * Fix some kind of race condition while using remote commands.kh12010-06-162-2/+24
| | | | | | | | | | | | | | | | | | | | | | Please do not merge to master, we had to fix it different there. Because of async content loading, we have to cache the url to load. A combination of SetSource and SyncContents would have lead to sync to the old url till loading was finished. So return the cached during loading. Task-number: QTBUG-11342 Reviewed-by: ck
| * use "win32-g++*" scope to match all MinGW makespecsMark Brand2010-06-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The scope "win32-g++" comes from the name of the makespec. However, it is frequently used to check for MinGW. This works fine as long as win32-g++ is the only makespec for MinGW. Now we need the wildcard to cover "win32-g++-cross" as well. Also reordered test of win32 before win32-g++*. Also took opportunity to use else. Merge-request: 2407 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* | Fix some kind of race condition while using remote commands.kh12010-06-165-1/+25
| | | | | | | | | | | | | | | | | | Because of async content loading, we have to cache the url to load. A combination of SetSource and SyncContents would have lead to sync to the old url till loading was finished. So return the cached during loading. Task-number: QTBUG-11342 Reviewed-by: ck
* | Make the open pages widget act on the up/ down key directly.kh12010-06-031-8/+22
| | | | | | | | Reviewed-by: ck
* | Remove leftover.kh12010-06-031-1/+0
| | | | | | | | Reviewed-by: ck
generated by cgit v0.12 at 2025-03-27 20:08:15 (GMT)