summaryrefslogtreecommitdiffstats
path: root/tools
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging into ↵Qt Continuous Integration System2011-05-136-1/+899
|\ | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging: Allow 'typeinfo <file>' lines in qmldir. qmlplugindump: Use command line options with a single dash. qmlplugindump: Allow dumping by path without URI. Move qmldump from Qt Creator to Qt.
| * Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml-review into ↵Kai Koehne2011-05-126-1/+899
| |\ | | | | | | | | | master-qml-staging
| | * qmlplugindump: Use command line options with a single dash.Christian Kamm2011-05-121-7/+12
| | | | | | | | | | | | | | | | | | | | | | | | Keep the old -- options for compatibility. Change-Id: I9c9b0beccc7043cf8b4b654bdba33946abf8c7b6 Task-number: QTBUG-18834 (cherry picked from commit 175382d834142f2a55b4e209af870ab40f741d2d)
| | * qmlplugindump: Allow dumping by path without URI.Christian Kamm2011-05-121-11/+29
| | | | | | | | | | | | | | | | | | | | | | | | This migrates b980a9b9646a89b5b24efeca40926408a71334de from the Qt Creator's copy into the qmlplugindump in Qt. Change-Id: I1ab90f491f5df0e6570aa43a91073e7b332e41df (cherry picked from commit 9fcece7b455b6540a67780cc3874b230e586b7c4)
| | * Move qmldump from Qt Creator to Qt.Christian Kamm2011-05-126-1/+876
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also rename it to qmlplugindump. Qmlplugindump is a tool that loads a QML module and prints type information about the types contained in its plugins to the standard output. Reviewed-by: Aaron Kennedy Change-Id: I7c35c34af23adc1c37453393d71e492dedfc6a9b (cherry picked from b5265d4e99e5c90532e190632951070cf1a2b630)
* | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2011-05-131-0/+11
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: X11: Keep the menubar inside the widgetbox window in toplevel mode Retain ABI and API compatibility when Qt is built with EGL.
| * | X11: Keep the menubar inside the widgetbox window in toplevel modeMichał Zając2011-05-131-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For now the appmenu protocol does not make it possible to associate a menubar with all application windows. This means in top level mode you can only reach the menubar when the widgetbox window is active. Since this is quite inconvenient, better not use the native menubar in this configuration and keep the menubar in the widgetbox window. Merge-request: 1229 Reviewed-by: denis
* | | Merge remote branch 'qt/4.8' into master-qml-stagingKai Koehne2011-05-1016-213/+312
|\ \ \ | |/ / | | / | |/ |/| | | Conflicts: src/declarative/debugger/qdeclarativedebugserver.cpp src/plugins/qmltooling/qmltooling.pro
| * Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2011-05-051-1/+1
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: don't crash in QProcessEnvironment::systemEnvironment() qmake: Introduce new template type no environment on WinCE fix Widestring vs. Ansi mixup fix potential crash in QProcessEnvironment::systemEnvironment() on windows Fix compilation with QT_NO_* fix build on symbian skip widget when its focusPolicy is Qt::ClickFocus in TabOrderEditor fix build on mac make QProcessEnvironment on Unix cache converted values make QProcessEnvironment::systemEnvironment() encoding-safe make QProcessEnvironment on Unix cache converted variable names move key/value converters to the private class make QProcessEnvironment on Windows preserve variable name case split QProcessEnvironmentPrivate::Unit into Key and Value remove unused functions minor optimization: use QList::reserve() use the Hash typedef Changelog: Qt Designer 4.8
| | * skip widget when its focusPolicy is Qt::ClickFocus in TabOrderEditorTasuku Suzuki2011-05-021-1/+1
| | | | | | | | | | | | | | | | | | TabOrderEditor should allow user to set tab order for widget that focusPolicy contains Qt::TabFocus. Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
| * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging into ↵Qt Continuous Integration System2011-05-047-129/+144
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging: QmlViewer: Translate UI Fix insert and scroll to bottom case QDeclarativeDebug: Fix test case QDeclarativeDebug: Handle case where client with ongoing queries is deleted Remove compile warning Fix QUnifiedTimer bug Stop the animation driver when there are no more animations. Optimization and benchmark for setting object properties from QML. Add Constant and Final flags to QMetaObjectBuilder Fixed QML TextEdit docs Make -no-opengl exist on other platforms Only ask for name when the user goes on the high score list.
| * \ \ Merge branch 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration ↵Qt Continuous Integration System2011-05-039-199/+297
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into master-integration * 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration: (26 commits) Fixing potential js hole in the js function for the feedback channel. Fix tst_Q3ProgressBar::setProgress, again Disable tst_Q3ComboBox::task231724_clear on Mac Fix tst_Q3ProgressBar::setProgress() Revert "Fix double painting when adding an item into a linear layout" Add missing license headers Revert "Fixed a crash in QListView" qdoc: Completed task QTBUG-18790 qdoc: Completed task QTBUG-18733 Benchmark for layout hierarchies Manual test for layout flickering Improve invalidate() testcase. Avoid flicker when invalidate is propagated in a widget/layout hierarchy Do not call setSizePolicy from ctor, it might call a virtual function qdoc: Last commit before merge into master. Fixed a crash in QListView Doc: Fixed reference to a name in a table. qdoc: Fixed license comment. Ensured that incomplete downloads are removed. qdoc: Added missing copyright notice ...
| | * \ \ Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7Olivier Goffart2011-05-039-199/+297
| | |\ \ \ | | | |_|/ | | |/| | | | | | | | | | | | | | | | | Conflicts: src/gui/graphicsview/qgraphicslayout.cpp src/gui/graphicsview/qgraphicslayout_p.cpp
| | | * | 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 earth-team into origin/4.8Olivier Goffart2011-05-033-7/+9
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | Conflicts: configure
| | * | | | Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7Olivier Goffart2011-04-211-1/+1
| | |\ \ \ \ | | | |/ / / | | | | | | | | | | | | | | | | | | Conflicts: src/plugins/qmltooling/qmldbg_ost/qostdevice.h
| | | * | | 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-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-18621
| | * | | | | Merge branch 'qt-master-from-4.7' of ↵Qt Continuous Integration System2011-04-202-6/+8
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | scm.dev.nokia.troll.no:qt/qt-integration into master-integration * 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration: (69 commits) Fix compilation with symbian-armcc Updated Russian translation Ukrainian translation updated Fix wrong merge of 3aa39b0164ce4bb9e Symbol table is very limited in numeric input mode Fix build of Qt/DirectFB without graphics view support. Add new QSysInfo::symbianVersion() enums QDesktopServices::openUrl() doesn't handle URL encodings correctly Build fix for transition effect support on S60 5.0. Make EGL surface transparency working on Symbian. 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 Splitview flag should also be updated to inputcontext QGraphicsView with vertical scrollbar flickers when splitview opens Splitview: opening a context menu should not re-position of focusItem Trigger fullscreen transition effects properly on app exit. ...
| | | * \ \ \ \ Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-04-182-6/+8
| | | |\ \ \ \ \ | | | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: qmake/generators/makefile.cpp qmake/generators/win32/msbuild_objectmodel.cpp qmake/generators/win32/msvc_vcxproj.cpp src/corelib/global/qnamespace.h src/gui/text/qtextcontrol.cpp
| | | | * | | | 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.
| * | | | | | | | Fix the build of configure.exe.Liang Qi2011-05-021-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | qlocale functions were splitted in severl files, just add them back. Task-number: QTBUG-18932 Reviewed-by: TrustMe
| * | | | | | | | Update the source file of configure.exe to enable QtConcurrent for SymbianLiang Qi2011-05-021-2/+0
| |/ / / / / / /
| * | | | | | | Merge branch 'symbian-socket-engine' of scm.dev.troll.no:qt/qt-symbian-networkShane Kearns2011-04-121-4/+2
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure.exe src/s60installs/bwins/QtCoreu.def src/s60installs/bwins/QtGuiu.def src/s60installs/eabi/QtCoreu.def
| | * | | | | | Merge branch 'master' of scm.dev.troll.no:qt/qt-earth-team into ↵Shane Kearns2011-04-1168-7034/+11242
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | symbian-socket-engine Conflicts: src/s60installs/bwins/QtCoreu.def src/s60installs/bwins/QtGuiu.def src/s60installs/bwins/QtNetworku.def src/s60installs/eabi/QtCoreu.def src/s60installs/eabi/QtGuiu.def src/s60installs/eabi/QtNetworku.def src/s60installs/eabi/QtOpenVGu.def tests/auto/qabstractnetworkcache/tst_qabstractnetworkcache.cpp
| | * \ \ \ \ \ \ Merge remote branch 'earth/master' into symbian-socket-engineShane Kearns2011-03-2540-81/+136
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/network/access/qhttpnetworkconnectionchannel.cpp src/network/socket/qlocalsocket.cpp src/s60installs/bwins/QtCoreu.def src/s60installs/bwins/QtGuiu.def src/s60installs/bwins/QtTestu.def src/s60installs/eabi/QtCoreu.def src/s60installs/eabi/QtGuiu.def
| | * \ \ \ \ \ \ \ Merge branch 'symbian-socket-engine' of ↵Shane Kearns2011-03-081-4/+2
| | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | scm.dev.troll.no:qt/qt-symbian-network into symbian-socket-engine Conflicts: src/network/access/qnetworkaccessmanager.cpp tests/auto/qsslsocket/tst_qsslsocket.cpp
| | | * \ \ \ \ \ \ \ Merge remote branch 'qt/master' into symbian-socket-engineShane Kearns2011-02-071235-1308/+1406
| | | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/network/access/qnetworkaccessmanager.cpp src/network/bearer/qnetworksession.cpp src/network/kernel/qnetworkproxy_symbian.cpp src/network/socket/qnativesocketengine_unix.cpp tests/auto/platformsocketengine/tst_platformsocketengine.cpp
| | | * \ \ \ \ \ \ \ \ Merge remote branch 'qt/master' into symbian-socket-engineShane Kearns2010-12-1519-104/+156
| | | |\ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | Symbian: Also force IPv6 on Windows configure.exeMarkus Goetz2010-12-081-0/+2
| | | | | | | | | | | | |
| | | * | | | | | | | | | Symbian: Enable IPv6 again.Markus Goetz2010-12-081-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The native QSymbianSocketEngine supports IPv6 just fine. This reverts commit 0c7d5d106152924dedd822da8c90d9f3247a9947.
| * | | | | | | | | | | | Merge earth-team into origin/master'Olivier Goffart2011-04-1258-318/+13797
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | |
| * | | | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt into earth-masteraxis2011-04-0744-6884/+10895
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/corelib/thread/qthread_unix.cpp
| * | | | | | | | | | | | | Fix errors when compiling Qt with STLportCédric OCHS2011-03-281-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-18374 Reviewed-by: Olivier Goffart Merge-request: 1157
* | | | | | | | | | | | | | Introduced a CONFIG option that enables declarative debug servicesThorbjørn Lindeijer2011-05-042-4/+1
| |_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This replaces the need for applications to explicitly make a call to enable the debug services, and rather does it in declarative.h when the 'declarative_debug' CONFIG option is used. Done-with: Kai Koehne Change-Id: I817f22a4ec9226a1ee2d080c1f5bb75d8599a06e Reviewed-by: Martin Jones Reviewed-by: Michael Brasser
* | | | | | | | | | | | | QmlViewer: Translate UIKai Koehne2011-05-027-126/+142
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Install translators for the Qt & QmlViewer translations. also add QT_NO_CAST_FROM_ASCII, QT_NO_CAST_TO_ASCII to check for untranslated strings. Reviewed-by: Oswald Buddenhagen Task-number: QTBUG-14848
generated by cgit v0.12 at 2024-12-26 17:02:18 (GMT)