summaryrefslogtreecommitdiffstats
path: root/tools
Commit message (Collapse)AuthorAgeFilesLines
* warn about stray meta dataOswald Buddenhagen2010-06-291-4/+7
|
* don't complain multiple times about same abuse of //% meta stringsOswald Buddenhagen2010-06-291-0/+3
| | | | | Reviewed-by: Kent Hansen Task-number: QTBUG-11818
* fix double percent sign after migration to yyMsg()Oswald Buddenhagen2010-06-291-2/+2
|
* Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-06-289-77/+131
|\
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7David Boddie2010-06-2812-88/+306
| |\
| * \ Merge branch '4.7' of /home/dboddie/git/oslo-staging-1 into 4.7David Boddie2010-06-2523-373/+563
| |\ \
| | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7David Boddie2010-06-236-20/+173
| | |\ \
| | * | | Doc: Fixed whitespace issues and added missing files to lists.David Boddie2010-06-233-67/+90
| | | | | | | | | | | | | | | | | | | | Reviewed-by: Trust Me
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/dboddies-oslo-staging-1-qdoc ↵David Boddie2010-06-187-88/+313
| |\ \ \ \ | | | | | | | | | | | | | | | | | | into 4.7
| * | | | | qdoc: Added a workaround for QML/Qt class name clashes.David Boddie2010-06-186-10/+41
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Trust Me
* | | | | | doc: Added more DITA output to the XML generatorMartin Smith2010-06-282-16/+97
| |_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | Added cxxDefine for macros. Task-number: QTBUG-11391
* | | | | doc: Added more DITA output to the XML generatorMartin Smith2010-06-281-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added cxxVariableStorageClassSpecifierStatic. Task-number: QTBUG-11391
* | | | | Fixed copy-paste error in htmlgenerator.cppRohan McGovern2010-06-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: htmlgenerator.cpp:1893: error: stray ‘\’ in program
* | | | | Doc: fixing search bugMorten Engvoldsen2010-06-252-3/+15
| | | | |
* | | | | doc: Added more DITA output to the XML generatorMartin Smith2010-06-252-8/+66
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Output the \variable stuff as a cxxVariable. Task-number: QTBUG-11391
* | | | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-06-255-2/+16
|\ \ \ \ \
| * | | | | 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
| * | | | Removed support for static linking of QtWebKit.Simon Hausmann2010-06-231-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Static linking of WebKit is not going to be supported anymore in Qt 4.7, so this commit makes sure it's mentioned in the documentation and that configure disables WebKit if static linking of Qt is requested. Reviewed-by: Andy Shaw <qt-info@nokia.com>
* | | | | doc: Added more DITA output to the XML generatorMartin Smith2010-06-255-76/+207
|/ / / / | | | | | | | | | | | | | | | | | | | | Output Q_PROPERTY as a cxxVariable. Task-number: QTBUG-11391
* | | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-06-221-0/+4
|\ \ \ \
| * | | | Prohibit some property names to be used for dynamic propertiesJarek Kobus2010-06-221-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since they are used internally for some legacy stuff. We prohibit "groupButtonId" and "database". Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com> Task-number: QTBUG-11584
* | | | | doc: Added more DITA output to the XML generatorMartin Smith2010-06-223-8/+71
|/ / / / | | | | | | | | | | | | | | | | | | | | Some of the cxxVariable stuff for properties. Task-number: QTBUG-11391
* | | | doc: Added more DITA output to the XML generatorMartin Smith2010-06-221-1/+45
| | | | | | | | | | | | | | | | | | | | | | | | The cxxTypedef stuff for typedefs. Task-number: QTBUG-11391
* | | | Finish merge conflict.Martin Smith2010-06-2215-284/+129
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7 Conflicts: tools/qdoc3/ditaxmlgenerator.cpp
| * | | | qdoc3: Build fix for regression in f321a3f2b1eAndreas Kling2010-06-222-4/+4
| | | | |
| * | | | qdoc3: Build fix for regression in e2f0e728eAndreas Kling2010-06-223-6/+5
| | |_|/ | |/| |
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7David Boddie2010-06-218-42/+168
| |\ \ \
| * | | | Doc: Relicensed the documentation under the GNU FDL version 1.3.David Boddie2010-06-2111-275/+121
| | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Trust Me Requested-by: Legal
* | | | | doc: Added more DITA output to the XML generatorMartin Smith2010-06-221-3/+41
| |/ / / |/| | | | | | | | | | | | | | | | | | | The rest of the cxxEnumeration stuff for enum types. Task-number: QTBUG-11391
* | | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-06-214-19/+34
|\ \ \ \
| * | | | Designer: Prevent QButtonGroup from being added for Q3ButtonGroup.Friedemann Kleint2010-06-211-1/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The internal QButtonGroup used by Q3ButtonGroup interferes with saving mechanism for QButtonGroup (introduced in 4.5). Reviewed-by: Jarek Kobus <jkobus@trolltech.com> Task-number: QTBUG-11431
| * | | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Morten Engvoldsen2010-06-214-18/+60
| |\ \ \ \
| * | | | | Doc: Fixing bugs to style and scriptMorten Engvoldsen2010-06-213-18/+18
| | |/ / / | |/| | |
* | | | | doc: Added more DITA output to the XML generatorMartin Smith2010-06-212-5/+74
| |/ / / |/| | | | | | | | | | | | | | | | | | | cxxEnumeration stuff for enum types. Task-number: QTBUG-11391
* | | | doc: Added more DITA output to the XML generatorMartin Smith2010-06-214-18/+60
|/ / / | | | | | | | | | | | | | | | | | | More cxxFunction stuff for member functions. Function parameters and other stuff. Task-number: QTBUG-11391
* | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-06-183-72/+59
|\ \ \ | | |/ | |/|
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-06-176-18/+278
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: doc: Added more DITA output to the XML generator Usefully convert from QtScript object/array to QVariant document QSslSocket::systemCaCertificates() change in changelog Implement QIODevice::peek() using read() + ungetBlock(). Allocate the memory for QtFontSize when count > 1 doc: Added more DITA output to the XML generator Defer allocation of GIF decoding tables/stack. Make sure only started gestures can cause cancellations Updated JavaScriptCore from /home/khansen/dev/qtwebkit-qtscript-integration to javascriptcore-snapshot-16062010 ( 8b2d3443afca194f8ac50a63151dc9d19a150582 ) qmake: Fix CONFIG += exceptions_off with the MSVC project generator. Fix some kind of race condition while using remote commands. Work around ICE in Intel C++ Compiler 11.1.072 Reduce the memory consumption of QtFontStyle
| * \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-06-163-72/+59
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Fix the N900 device orientation backend Micro cleanup Write TextInput.positionToRectangle docs. Minor demo fixes Fix autoScroll implementation Move knowledge of QGraphicsObject out of qml engine Stopping a flick resulted in the next click being consumed. Enhance docs Slight addition to the docs.
| | * | | Fix the N900 device orientation backendHarald Fernengel2010-06-162-68/+56
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use D-Bus calls instead of polling Reviewed-by: Alan Alpert
| | * | | Micro cleanupHarald Fernengel2010-06-161-4/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use Qt::WA_DeleteOnClose to clean up the top-level window Reviewed-by: Alan Alpert
* | | | | doc: Added more DITA output to the XML generatorMartin Smith2010-06-183-5/+47
| |_|/ / |/| | | | | | | | | | | | | | | | | | | More cxxFunction stuff for member functions. Task-number: QTBUG-11391
* | | | doc: Added more DITA output to the XML generatorMartin Smith2010-06-172-11/+105
| | | | | | | | | | | | | | | | | | | | | | | | More cxxFunction stuff for member functions. Task-number: QTBUG-11391
* | | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-06-163-6/+24
|\ \ \ \ | | |_|/ | |/| |
| * | | 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
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-06-1522-1178/+1391
| |\ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (62 commits) Use native locale aware string comparison on Symbian. Temporary fix for regression in QSslCertificate::fromPath() doc: Added more DITA output to the XML generator Fix symbian building of TARGET with a slash Fix a minor typo in QAbstractItemModel's documentation. QXmlSchema: allow usage of xsd:all QSslSocket: fix build for MinGW and VS 2005 Fix symbian-abld build failure with bearer plugins remove certificate bundle make QSslSocket::systemCaCertificates() use system certs Adjusted RegExp in QSslCertificate::fromPath() Fix QSystemTrayIcon::supportsMessages() on Windows Use NIM_SETVERSION to get the latest behavior Cleanup obsolete stuff doc: Added DITA XML generator Fixed a broken merge. Changed the way we detect touch screen on Windows. Fixed error deploying qsymbianbearer.qtplugin on Symbian. Revert "Attempt to fix build failure on Symbian." Attempt to fix build failure on Symbian. ...
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-06-151-4/+0
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: ComboBox popuplist is not correctly layouted in fullscreen mode Stylus menu for Share (QT app) is different from native S60 apps Change $${EPOCROOT} to also have drive if EPOCROOT env variable has it Stylus menu for Share (QT app) is different from native S60 apps
| | * | Change $${EPOCROOT} to also have drive if EPOCROOT env variable has itMiikka Heikkinen2010-06-151-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Since sbsv2 toolchain supports having sources and SDK on different drives, $${EPOCROOT} needs to contain drive letter to make it work. Reviewed-by: Jason Barron
* | | | doc: Added more DITA output to the XML generatorMartin Smith2010-06-164-16/+160
| |_|/ |/| | | | | | | | | | | | | | Some of the cxxFunction stuff for member functions. Task-number: QTBUG-11391
* | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-06-155-28/+32
|\ \ \
generated by cgit v0.12 at 2024-11-14 21:53:30 (GMT)