summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* qdoc3: Updates to qdoc to print error message in ALL CAPSMartin Smith2011-08-291-2/+2
| | | | | | | when the path argument for an \example command refers to a directory that does not exist. Task-number: QTBUG-21165
* Doc: Added a note to Code Editor example docsGeir Vattekar2011-08-251-0/+26
| | | | | Task-number: QTBUG-9004 Reviewed-by: David Boddie
* Doc: QItemDelegate->QStyledItemDelegate in Star Delegate docsGeir Vattekar2011-08-251-12/+12
| | | | Task-number: QTBUG-9440
* Doc: Added a link in Symbian Intro to Required CapabilitiesGeir Vattekar2011-08-241-0/+2
| | | | Task-number: QTBUG-8942
* Doc: Added info on ordered targets for VS to qmake manualGeir Vattekar2011-08-241-0/+23
| | | | | Task-number: QTBUG-11988 Reviewed-by: David Boddie
* Doc: Small addition to the QML anchor layout docsGeir Vattekar2011-08-241-1/+6
| | | | | Task-number: QTBUG-15514 Reviewed-by: David Boddie
* Doc: Internalized QDeclarativeTypeLoaderGeir Vattekar2011-08-241-0/+5
| | | | Task-number: QTBUG-21029
* qdoc3: Updates for QTBUG-20776; include fileToOpen path.Martin Smith2011-08-181-2/+6
| | | | Task-number: QTBUG-20776
* qdoc3: Updates for QTBUG-20776; clear map between runs.Martin Smith2011-08-181-1/+21
| | | | Task-number: QTBUG-20776
* qdoc3: Updates for QTBUG-20739 (no read-only for QML components)Martin Smith2011-08-114-2/+40
| | | | Task-number: QTBUG-20739
* qdoc3: Updates for QTBUG-20776 and QTBUG-20777Martin Smith2011-08-103-18/+86
| | | | Task-number: QTBUG-20776, QTBUG-20777
* qdoc: Check pointer for null before dereferencing.Martin Smith2011-08-031-2/+3
| | | | Task-number: QTBUG-20725
* qdoc3: Reverting part of the change for QTBUG-17072Martin Smith2011-08-021-4/+4
| | | | Task-number: QTBUG-17072
* qdoc3: Write "Signal Handlers" instead of "Signals" as headerMartin Smith2011-08-023-12/+12
| | | | Task-number: QTBUG-17072
* qdoc: Fixed to remove extranious markup tags.Martin Smith2011-07-221-2/+3
| | | | Task-numberr: QTBUG-20474
* qdoc: Added HTML.nobreadcrumbs as a config variable.Martin Smith2011-07-212-1/+8
| | | | Task-numberr: QTBUG-20475
* Phase 1 of QTBUG-20412, the XML manifest fileMartin Smith2011-07-1511-24/+141
|
* Merge branch '4.8' of scm.dev.nokia.troll.no:qt/qt into 4.8David Boddie2011-06-17117-732/+1133
|\
| * Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging into ↵Qt Continuous Integration System2011-06-169-138/+257
| |\ | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging: DEF file updates for Symbian QTBUG-19883 Adding top level TRAP for QThreads on Symbian
| | * Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-teamQt Continuous Integration System2011-06-158-137/+248
| | |\ | | | | | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team: DEF file updates for Symbian
| | | * DEF file updates for Symbianmread2011-06-158-137/+248
| | | | | | | | | | | | | | | | | | | | Result of sufficient build, remove_freeze freeze cycles to get Qt urel building cleanly.
| | * | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-teamQt Continuous Integration System2011-06-151-1/+9
| | |\ \ | | | |/ | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team: QTBUG-19883 Adding top level TRAP for QThreads on Symbian
| | | * QTBUG-19883 Adding top level TRAP for QThreads on Symbianmread2011-06-151-1/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The native Symbian implementation of QThread in Qt4.8 does not have a top level TRAP, whereas it did in pthreads based implementation in Qt4.7. This causes an incompatibility in the form of a EUSER-CBASE:66 panic for code that attempts to use the cleanup stack without a TRAP of its own. This adds a top level TRAP and std::exception handler to match it and prints out warning information if they ever trigger to provide some diagnostic information which would otherwise be lost. Task-number: QTBUG-19883 Reviewed-by: Laszlo Agocs
| | * | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-teamQt Continuous Integration System2011-06-14423-7806/+19923
| | |\ \ | | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team: (209 commits) Fix building the OpenVG graphicssystem on Linux with static libs fix build on windows 7 QDeclarativeDebug: Don't hang if started with ',block' argument Fix autotest on Windows QDeclarativeDebug: Fix QJSDebugService if launched with ',block' Update internal state before emitting configurationChanged() signals. Fix compilation of qtconfig without X11 Fix compile when configure with no fontconfig support Fix warning in qtextengine compilation Reorder member varibles in QGlyphRunPrivate to eliminate warning Revert 36e01e69 Compile on Mac OS X Fixed qmlshadersplugin manual test shaders on SGX family GPU:s. Fixed qmlshadersplugin on windows VC2008 toolchain. Reset input context in Symbian when another window is opened. Fixed compile of tst_qscriptextensionplugin on some Windows configurations KERN-EXEC 3 panic in QCoeFepInputContext::translateInputWidget() Fix for QTBUG-18947. Changed the macosx deployment target to 10.5 Add function QGlyphRun::setRawData() Ammend last commit ...
| * | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into ↵Qt Continuous Integration System2011-06-153-6/+41
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging: Revert "QFileInfoGatherer: call QFileSystemWatcher addPaths from proper thread" QFileInfoGatherer: call QFileSystemWatcher addPaths from proper thread Also test http proxy in the QTcpServer benchmark Symbian QFileSystemWatcher: fix potential crash Enable QTcpServer benchmark on symbian
| | * | | Revert "QFileInfoGatherer: call QFileSystemWatcher addPaths from proper thread"Shane Kearns2011-06-142-10/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 59f186869c67ab51fccf3aac3153629a1da285b7. Introduced a race condition - QFileInfoGatherer needs a more invasive refactor to solve the thread safety problems.
| | * | | QFileInfoGatherer: call QFileSystemWatcher addPaths from proper threadShane Kearns2011-06-132-4/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QFSW isn't thread safe. With removal of the thread inside QFSW, the addPaths and removePaths must be called from the thread the QFSW was created in. Reviewed-by: joao
| | * | | Also test http proxy in the QTcpServer benchmarkShane Kearns2011-06-131-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Test the http socket engine: The test server's proxy will connect to the listening socket on the DUT rather than a listening socket on the proxy server as in the SOCKS5 case. Reviewed-by: Markus Goetz
| | * | | Symbian QFileSystemWatcher: fix potential crashShane Kearns2011-06-131-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | An address on the stack was being passed to an asynchronous API. This is changed to use the copy of the data on the heap. Reviewed-by: joao
| | * | | Enable QTcpServer benchmark on symbianShane Kearns2011-06-132-4/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added required capability to the .pro file Added default connection startup code Removed the QSKIP for IPv6 test Reviewed-by: Markus Goetz
| * | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-water-staging into ↵Qt Continuous Integration System2011-06-144-32/+31
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-water-staging: When asking for relations, don't crash on children that don't return an interface. Remove more inconsistencies with invisible. Fix a problem where the video would'nt show on some containers QAccessibleToolButton::text should return accessibleName if set. Remove stray semicolon.
| | * \ \ \ Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-water-teamQt Continuous Integration System2011-05-278576-152706/+160289
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qt-water-team: (492 commits) QDeclarativeDebug: Fix autotest Fixed compilation. When asking for relations, don't crash on children that don't return an interface. QLibrary: support .so file extension on AIX. Remove more inconsistencies with invisible. Fixed compile of qdrawhelper_neon.cpp. Update qhostinfo autotest to expect RFC5952 formatted ipv6 addresses Fix rendering of Mac controls onto a QImage Symbian socket: Implement systemProxyForQuery for service networks Increased EPOCHEAPSIZE for qpainter benchmark Increased EPOCHEAPSIZE for few benchmarks tst_q3dns: update test to follow RFC-5952. Re-apply licenseheader text in source files for qt4.7 Update Symbian DEF-files Re-apply licenseheader text in source files for qt4.8 Pass QList as const reference when possible Fixed crashes in Observer mode related to infinite bounding rects Updating file with CRLF line endings for the updated header Updating file with CRLF line endings for the updated header Fix a problem where the video would'nt show on some containers ...
| | | * \ \ \ Merge remote branch 'upstream/4.8'Thierry Bastian2011-05-268451-142013/+141889
| | | |\ \ \ \
| | | * | | | | When asking for relations, don't crash on children that don't return an ↵Frederik Gladhorn2011-05-191-4/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | interface. Reviewed-by: Jan-Arve
| | | * | | | | Merge branch '4.8-upstream'Thierry Bastian2011-05-19665-11977/+19685
| | | |\ \ \ \ \
| | | * | | | | | Remove more inconsistencies with invisible.Frederik Gladhorn2011-05-191-18/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Visible status should not influence child count and other properties. Reviewed-by: Jan-Arve
| | | * | | | | | Fix a problem where the video would'nt show on some containersThierry Bastian2011-05-161-8/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The problem was linked to the detection of a video stream in the graph. Only the decoders were tested but the demuxer can directly provide the video stream. Reviewed-By: TrustMe Task-Number: QTBUG-19348
| | | * | | | | | QAccessibleToolButton::text should return accessibleName if set.Frederik Gladhorn2011-05-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was most likely a copy and paste error. Reviewed-by: Denis Dzyubenko
| | | * | | | | | Remove stray semicolon.Frederik Gladhorn2011-05-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: TrustMe
| * | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into ↵Qt Continuous Integration System2011-06-1415-98/+259
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging: Revert "Fix compilation of lrelease on Windows" Fix compilation of lrelease on Windows Allow selecting fonts with irregular style names Fix missing empty lines in Qt HTML when displayed in compliant browsers Protect against deleted windows
| | * \ \ \ \ \ \ \ Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-teamQt Continuous Integration System2011-06-1481-431/+487
| | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-team: Revert "Fix compilation of lrelease on Windows" Fix building the OpenVG graphicssystem on Linux with static libs fix build on windows 7 Disabling DEF files to get around building problems. QDeclarativeDebug: Don't hang if started with ',block' argument QDeclarativeDebug: Fix QJSDebugService if launched with ',block' Fix docs on caching for images loaded by image providers Fixed compile of tst_qscriptextensionplugin on some Windows configurations QDeclarative: fixed clean animation lists DeclarativeObserver: Don't fade in the highlight edge Renamed declarativeobserver plugin to qmldbg_inspector QmlDebugger: adding slots to items in Live Preview QmlDebugger: parsing packets iteratively in the communication protocol qmlplugindump: Bump QtQuick.tooling version to 1.1. qmlplugindump: Dump revision property. qmlplugindump: Fix --path usage with drive letters on Windows. ListView segmentation fault when setting highlight to null DeclarativeObserver: Fixed duplicates in item selection
| | | * | | | | | | | Revert "Fix compilation of lrelease on Windows"aavit2011-06-141-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit b9993f684c7ef8c04aa6a0e87af596609957f906.
| | | * | | | | | | | Merge remote branch 'qt-mainline/4.8'aavit2011-06-1481-429/+487
| | | |\ \ \ \ \ \ \ \ | | | | | |_|_|_|_|_|/ | | | | |/| | | | | |
| | * | | | | | | | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-teamQt Continuous Integration System2011-06-10262-5971/+15390
| | |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-team: (118 commits) Fix compilation of lrelease on Windows Allow selecting fonts with irregular style names Fix missing empty lines in Qt HTML when displayed in compliant browsers Fix autotest on Windows Update internal state before emitting configurationChanged() signals. Fix compilation of qtconfig without X11 Compile on Mac OS X Fixed qmlshadersplugin manual test shaders on SGX family GPU:s. Fixed qmlshadersplugin on windows VC2008 toolchain. Reset input context in Symbian when another window is opened. KERN-EXEC 3 panic in QCoeFepInputContext::translateInputWidget() Fix for QTBUG-18947. Changed the macosx deployment target to 10.5 Ammend last commit Implemented QAccessibleTextEdit::attributes() Changing cursor position in all boundaries code clean-up for QSystemSemaphore simplify QSharedMemoryPrivate::cleanHandle() minor improvements for QSharedMemory fix potential keyfile leaking refactoring of the QWSSharedMemory class ...
| | | * | | | | | | | Fix compilation of lrelease on Windowsaavit2011-06-101-0/+2
| | | | | | | | | | |
| | | * | | | | | | | Allow selecting fonts with irregular style namesJiang Jiang2011-06-1012-96/+217
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fonts like "Helvetica Neue UltraLight" or "Skia Regular Black Condensed" can't be selected in Qt because either they don't report correct numeric values for weight/stretch/etc. or these values are not mapped from QFont enums in a linear way. Thus we provide a shortcut to select these fonts with PostScript name or full name without resorting to family name matching in QFontDatabase (these fonts are not registered in font database anyway). After this, we can simply use: QFont font("Helvetica Neue"); font.setStyleName("UltraLight"); to select these fonts. QCoreTextFontEngineMulti matched like this can be created directly from the CTFontRef instance instead of creating from the font name, making this process faster. The commit also cleaned up the font loading process in Mac font database a bit, moving the code for family matching into a separate function. Add QFontInfo::styleName() and QRawFont::styleName() to access the resolved style name for a font. Task-number: QTBUG-19366 Change-Id: Iad07768c02ed06cc8d6b7395dec554384f410506 Reviewed-on: http://codereview.qt.nokia.com/333 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Jiang Jiang <jiang.jiang@nokia.com> (cherry picked from commit 97391be5ebddc62545ddb88f92fc2045bfa10711)
| | | * | | | | | | | Fix missing empty lines in Qt HTML when displayed in compliant browsersEskil Abrahamsen Blomfeldt2011-06-102-2/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When QTextDocument exports HTML, it makes an effort to be compatible with its own importer, hence it has to be compatible with the dialect of HTML which Qt has developed over the years. One incorrect interpretation in Qt is that an empty paragraph is interpreted as an empty line. So if you use a QTextDocument to produce HTML for text where an empty line has been added, this empty line will not be visible when the document is viewed in a compliant browser. The fix is to set the height of the empty paragraph to 1em, so that it will match the current pixel size of the font, thus look the same as a <p><br /></p> but without altering the structure of the document. Reviewed-by: Gunnar
| | | * | | | | | | | Merge remote branch 'qt-mainline/4.8'aavit2011-06-09249-5874/+15146
| | | |\ \ \ \ \ \ \ \
| | * | \ \ \ \ \ \ \ \ Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-teamQt Continuous Integration System2011-06-081-0/+16
| | |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-team: Protect against deleted windows
| | | * | | | | | | | | Protect against deleted windowsLars Knoll2011-06-081-0/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Check that the window is still there before trying to deliver an event to it. Reviewed-by: Samuel