summaryrefslogtreecommitdiffstats
path: root/tools
Commit message (Collapse)AuthorAgeFilesLines
* fixed built-in jpeg and tiff in configure.exe, QTBUG-12093Mark Brand2010-07-121-0/+4
| | | | | Merge-request: 740 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* fix indentationMark Brand2010-07-121-1/+1
| | | | | Merge-request: 740 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-07-1024-371/+154
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (59 commits) Doc: Cleaning style and adding support for Creator Add NTLMv2 authentication support to QAuthenticator. QIODPLB: Sync behavior of ungetBlock() and ungetChar() QFileIconProvider: Load icons on demand. Doc: fixing offline style Fix handling of SSL certificates with wildcard domain names Doc: fixing examples link doc: Fixed several qdoc warnings. doc: Fixed several qdoc warnings. SSL library loading: load system libs only once Revert "SSL backend: load libraries for certificates only once" doc: Fixed several qdoc warnings. doc: Fixed several qdoc warnings. doc: Fixed several qdoc warnings. doc: Fixed several qdoc warnings. doc: Fixed several qdoc warnings. Doc: Adding support for Qt Creator style doc: Fixed last of the declarative/QML qdoc warnings. qdoc: Marked some missing declarative properties and functions as \internal. qhelpgenerator: Fix namespace syntax checking. ...
| * Doc: Cleaning style and adding support for CreatorMorten Engvoldsen2010-07-094-26/+21
| | | | | | | | Note: Support for creator has been disabled. HTML-generator needs an update.
| * Doc: fixing offline styleMorten Engvoldsen2010-07-091-7/+5
| |
| * Doc: Adding support for Qt Creator styleMorten Engvoldsen2010-07-093-2/+18
| | | | | | | | | | | | Adding a variable to the qdocconf file will now generate the docs in Creator format Reviewed-by: Martin Smith
| * Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-07-091-2/+4
| |\
| | * qhelpgenerator: Fix namespace syntax checking.ck2010-07-091-2/+4
| | |
| * | qdoc: Marked some missing declarative properties and functions as \internal.Martin Smith2010-07-091-1/+2
| |/
| * Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-07-081-1/+1
| |\
| | * Doc: documenting docsMorten Engvoldsen2010-07-081-1/+1
| | |
| * | qdoc: Fixed broken QML property links.Martin Smith2010-07-082-2/+2
| |/ | | | | | | Task-number: QTBUG-12038
| * Doc: more cleaningMorten Engvoldsen2010-07-081-24/+3
| |
| * Doc: fixing escape characterMorten Engvoldsen2010-07-081-1/+1
| |
| * Doc: cleaning html generatorMorten Engvoldsen2010-07-081-26/+0
| |
| * Doc: changing index pageMorten Engvoldsen2010-07-082-7/+46
| |
| * Doc: fixing link to devnetMorten Engvoldsen2010-07-081-1/+1
| |
| * Doc: adding HTML class names and style docs to the generatorMorten Engvoldsen2010-07-081-32/+34
| |
| * Doc: fixing typoMorten Engvoldsen2010-07-081-3/+2
| |
| * Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-07-081-1/+6
| |\
| | * immediately set function context when entering a namespaceOswald Buddenhagen2010-07-071-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | otherwise, tr() calls without absolute qualification will not be properly qualified inside the first function if it has no qualification, either. Task-number: QTBUG-11742 (not really)
| * | qdoc: Fixed table of contents for namespace pages.Martin Smith2010-07-081-1/+2
| |/ | | | | | | Task-number: QTBUG-11992
| * qdoc: Fixed a few links to QtObject (QML:QtObject)Martin Smith2010-07-073-16/+10
| |
| * qdoc: Removed a lot of dead code to minimize confusion.Martin Smith2010-07-072-234/+1
| |
| * qdoc: Fixed the case where the property and type names are the same.Martin Smith2010-07-0714-50/+61
| | | | | | | | | | | | Also simplified some code. Task-number: QTBUG-6340
* | Linux runonphone - tell the user which driver to loadShane Kearns2010-07-091-6/+45
| | | | | | | | | | | | | | | | | | | | The linux usbserial driver doesn't attach to devices automatically, to avoid conflicts with the real driver (if there is one). So the user must run modprobe to load the driver before runonphone can be used. Since runonphone has found the correct device(s) using libusb, this patch will tell the user the modprobe command that is required to load the generic usbserial driver. Reviewed-By: Gareth Stockwell
* | Fix USB serial port detection of the Nokia N95 on linuxShane Kearns2010-07-094-9/+59
| | | | | | | | | | | | | | | | | | | | | | The interface numbers in /dev/serial/by-id are hex rather than decimal. Also added code to read the manufacturer name and product name from string descriptors in order to get a better match. Unfortunately, root privilege is needed or the API returns an error. In this case, we still use the weak matching on interface number only. Task-Number: QTBUG-11794 Reviewed-By: Thomas Zander
* | Fix license headers on new files imported from Qt CreatorShane Kearns2010-07-096-84/+156
| | | | | | | | Reviewed-by: Trust Me
* | Implement just in time debug feature for runonphoneShane Kearns2010-07-083-3/+186
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the test being run crashes, runonphone will now retrieve the registers and call stack for the crashing thread from the phone and save to a crash log (compatible with d_exc crash logs, so existing tools can be used to analyse the log) To disable just in time debug, use --nocrashlog on the command line To save the crash logs to a different location, use --crashlogpath <path> otherwise, they are saved to the working directory. To convert the crash logs into human readable form, use the crash analyser carbide plugin from symbian foundation; or another symbian tool that can process d_exc style logs. Reviewed-by: Thomas Zander
* | Merge tools/runonphone/symbianutils from qtcreator src/shared/symbianutilsShane Kearns2010-07-0813-54/+2980
|/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | commit bca434a706c6eb28fe713ea10c857c35e3835f62 Author: Friedemann Kleint <Friedemann.Kleint@nokia.com> Date: Wed Jul 7 14:00:54 2010 +0200 Trk/Launcher: Add infrastructure for reporting crashes. currently used for runonphone only. Initial-patch-by: Shane Kearns <shane.kearns@accenture.com> commit 9bb67101c5daa42f879f2fcf884277c5fd23bed4 Author: Friedemann Kleint <Friedemann.Kleint@nokia.com> Date: Mon Jul 5 17:14:45 2010 +0200 Trk[TCF]: Proper exit handling commit 52b33a7503866654077b572c1f8005dfc19ed5a6 Author: Friedemann Kleint <Friedemann.Kleint@nokia.com> Date: Wed Jun 30 17:14:57 2010 +0200 Debugger[Trk]: Prepare thread handling. Store threads and cache registers per thread in Snapshot. As Trk does not generate Thread creation/deletion events. try to add threads on the fly if a stop in a new thread id is reported. Remove them in continue. Continue all threads in classic Trk. Pass on state (crash reason) to ThreadData and model. Factor out common code of both adapters to Snapshot/Symbian classes. commit 66e01e881d7cb865338a6a7949f9a085883387c9 Author: Friedemann Kleint <Friedemann.Kleint@nokia.com> Date: Mon Jun 28 16:32:53 2010 +0200 Debugger[TCF-Trk]: Send RemoveExecutables command. commit beba423a16fd0e6e836cd8c26ca30e5167ca56db Author: Friedemann Kleint <Friedemann.Kleint@nokia.com> Date: Fri Jun 25 15:06:30 2010 +0200 Debugger[Trk]: Added TCF experimental adapter. Added adapter to work with TCF over WLAN. Factor out common code for Symbian from TrkAdapter. Improve message logging in TrkGdbAdapter, some cleanup. Added new TcfTrkGdbAdapter based on TcfTrkDevice in symbianutils based on JSON, using QTcpSocket. To be started via special @tcf@ argument. Rubber-stamped-by: hjk create mode 100644 src/shared/symbianutils/json.cpp create mode 100644 src/shared/symbianutils/json.h create mode 100644 src/shared/symbianutils/tcftrkdevice.cpp create mode 100644 src/shared/symbianutils/tcftrkdevice.h create mode 100644 src/shared/symbianutils/tcftrkmessage.cpp create mode 100644 src/shared/symbianutils/tcftrkmessage.h commit 5d5f647f3d9b7a28c605af41a23819b7a24a5814 Author: Tobias Hunger <tobias.hunger@nokia.com> Date: Thu Jun 10 13:12:12 2010 +0200 Fix preprocessor directives * The standard says all preprocessor directives have to start at column 0. commit 6972715a397e8e9a495191a459dcf6db4b75f7a7 Author: Robert Loehning <robert.loehning@nokia.com> Date: Mon Jun 7 14:58:24 2010 +0200 Symbian/trk: Fixed handling of partial frames Initial-patch-by: Shane Kearns <shane.kearns@accenture.com> commit a47e06eec946dd2dbb986e614a3c292b91182b95 Author: Robert Loehning <robert.loehning@nokia.com> Date: Mon Jun 7 14:47:40 2010 +0200 Symbian/trk: Don't try to dereference references commit b6ee94fb5ff652ba22b272a064c2be541b4bcf56 Author: Robert Loehning <robert.loehning@nokia.com> Date: Mon Jun 7 11:50:38 2010 +0200 Symbian/Trk: Don't try to download a file without respective flag set. Task-number: QTCREATORBUG-1567 Reviewed-by: Friedemann Kleint
* Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-07-061-0/+2
|\
| * Set the registration time while using the collection generator to register.kh12010-07-051-0/+2
| | | | | | | | | | Task-number: QTBUG-11911 Reviewed-by: ck
* | qdoc: Simplified code to enable fixing of QTBUG-6340.Martin Smith2010-07-063-410/+89
|/ | | | | | Also reworded some of the text for QTBUG-11575. Task-number: QTBUG-6340, QTBUG-11575
* Doc: fixing search script and styleMorten Engvoldsen2010-07-051-1/+1
|
* qdoc: Fixed type linking for QML properties (most of them).Martin Smith2010-07-053-4/+8
| | | | Task-number: QTBUG-6340
* s/INCPATH/INCLUDEPATH/Oswald Buddenhagen2010-07-031-1/+2
|
* Fix Windows buildMark Brand2010-07-031-4/+4
| | | | | | | | Set the QT_NO_IMAGEFORMAT_* defines like the unix configure does. This avoids that we try to link the image handlers into QtGui when they are built as plugins. Reviewed-by: ossi
* Fix incomplete support for built-in jpeg, mng, tiff and gif handlersMark Brand2010-07-021-42/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, although the configure shell script could configure built-in support for these image formats, the .pr[io] files would nevertheless build them as plugins. Support was also missing from qimagereader and qimagewriter. This has now been added. Configure.exe, while clearly intended to support this too, needed a few minor fixes. For example, the usage of values "qt" and "yes" was inconsistent. For both configure tools, the explanation of the *non*-related options has been clarified, i.e: -no-libjpeg -qt-libjpeg -system-libjpeg These options have nothing to do with the plugin/built-in distinction. There are (still) no configure options for specifying "plugin" or "built-in" for these image formats. Quite reasonably, "plugin" is selected for shared Qt and "built-in" is selected for static Qt. Merge-request: 715 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Split image handler plugin project filesMark Brand2010-07-021-1/+1
| | | | | | | | | | | | | | | One pri for each handler, e.g. src/gui/image/qjpeghandler.pri. One pri for each 3rd party package, e.g src/3rdparty/libjpeg.pri. One shared pri for zlib dependency of 3rd party packages. This was really about image handler plugins, but PNG got the same treatment for consistency's sake. Also, moved image handler source files from plugins to src/gui/image so they are with the other image handlers. Merge-request: 715 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7David Boddie2010-07-0225-886/+1646
|\ | | | | | | | | Conflicts: tools/qdoc3/test/qt-html-templates.qdocconf
| * Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-07-024-3/+8
| |\
| | * Designer: Fix compiler warnings.Friedemann Kleint2010-07-024-3/+8
| | | | | | | | | | | | | | | | | | | | | Warnings introduced by 312c028d44a80f5d6029eb166a0de731f8452525 and gcc 4.5. Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
| * | qdoc: Fixed spacing before "default" and "read-only".Martin Smith2010-07-022-7/+8
| |/ | | | | | | Task-number: QTBUG-11346
| * Doc: Adding navigation and style fixes. Also rearranging qml elementsMorten Engvoldsen2010-07-012-25/+26
| |
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-07-012-1/+2
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: QSslSocket::systemCaCertificates(): have one common case for all Unices Fixed QX11EmbedContainer. Improved a bit detection of a touch screen on Windows. qdoc: Fixed invalid format in the html header. link glu32 before opengl32 Stopped trying to output QML property list in 2 columns
| | * qdoc: Fixed invalid format in the html header.Martin Smith2010-07-011-1/+1
| | | | | | | | | | | | Task-number: QTBUG-11803
| | * Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-07-011-596/+596
| | |\
| | * | Stopped trying to output QML property list in 2 columnsMartin Smith2010-06-301-0/+1
| | | | | | | | | | | | | | | | Task-number: QTBUG-11009, QTBUG-11096
| * | | Removed compilation warning for systems with no OpenGL supportLasse Holmstedt2010-07-011-0/+2
| | | | | | | | | | | | | | | | Reviewed-by: Aaron Kennedy
| * | | Remove qmlviewer dependency on QDeclarativeTimerMartin Jones2010-07-013-21/+23
| | | |
generated by cgit v0.12 at 2024-10-12 02:22:48 (GMT)