summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* win32-g++: Correct the order of linked Windows librariesJonathan Liu2011-04-044-4/+4
| | | | | | | | | | | | | | | On Windows 7, kernel32.dll exports many of the same functions as advapi32.dll. If executables link to these functions in kernel32.dll instead of advapi32.dll, running these executables on older versions of Windows will cause an entry point error. This would occur due to kernel32 being specified before advapi32. To resolve this issue, advapi32 is specified before kernel32 when linking. Task-number: QTBUG-18537 Merge-request: 1169 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Fixing a traling space on if statement that fails in Solaris.Sergio Ahumada2011-04-041-1/+1
| | | | | | | | | | | | | | 64e640716204af69056c34ddac5ce26628a1edd2 broke configure in Solaris. + /export/home/qt/config.tests/unix/fvisibility.test g++ no CFG_REDUCE_EXPORTS=no + [ no != no ] + [ no = auto ] + [ maybe = yes ] + [ no = yes] configure: test: ] missing Reviewed-by: Liang Qi
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-04-044-4/+211
|\ | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Fix failing autotest XmlListModel should allow types other than application/xml Document using Behaviors with States.
| * Fix failing autotestBea Lam2011-04-041-1/+1
| | | | | | | | Caused by 4391e2a1c35a53cc5f116926a1e5177e9ee4f51e
| * XmlListModel should allow types other than application/xmlBea Lam2011-04-041-1/+1
| | | | | | | | | | | | | | | | | | application/xml is the most appropriate content type but some servers may use other types, e.g. text/xml, so allow */* as a fallback. Task-number: QTBUG-18005 Change-Id: I0442148233e06aacb2cbfaaf7ae624ba733d5f9a Reviewed-by: Michael Brasser
| * Document using Behaviors with States.Michael Brasser2011-04-042-2/+209
| | | | | | | | | | | | Change-Id: I74f163cef8caa16cccb158061ec30ffb4e471fd1 Task-number: QTBUG-16856 Reviewed-by: Bea Lam
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-staging into ↵Qt Continuous Integration System2011-04-01658-605/+45731
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-staging: (45 commits) Removed mobile demos from the Symbian build in demos.pro Fixed demo subdirs for mobile examples. qdoc: Updates to the qdoc manual. Moved a couple of links into one list. Doc: Work on GettingStartedQt tutorial Added a link to the Debugging Techniques article. qdoc: Updates to the qdoc manual. qdoc: Added a way to exclude directories from receiving default metadata Edited the Tutorials and Examples pages. Renamed links in index.qdoc. Doc: Update to QStyledItemDelegate::displayText() qdoc: Added default values to config file for DITA Doc: Work on QAudioInput::start() functions. Avoided the use of hard-coded file names. Copied the declarative parser into qdoc3 to avoid dependency issues. qdoc: Don't wrap <image> in <fig> if in an <xref> Doc: Work on a11y docs qdoc: Added <copyright>, <copyryear>, and <copyrholder>. qdoc: Completed metadata handling. Doc: Small update to QImageReader/Writer::supportedImageFomrmats() Edited QtWebKit Guide qdoc and added external links. ...
| * \ Merge branch '4.7' of git://scm.dev.nokia.troll.no/qt/qt-doc-teamQt Continuous Integration System2011-04-014-6/+8
| |\ \ | | | | | | | | | | | | | | | | * '4.7' of git://scm.dev.nokia.troll.no/qt/qt-doc-team: Removed mobile demos from the Symbian build in demos.pro
| | * | Removed mobile demos from the Symbian build in demos.proJerome Pasion2011-04-014-6/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The demos require QtMobility libraries. Added notices in the demo pages about the requirement. Reviewed-by: Casper van Donderen
| * | | Merge branch '4.7' of git://scm.dev.nokia.troll.no/qt/qt-doc-teamQt Continuous Integration System2011-03-316-30/+41
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of git://scm.dev.nokia.troll.no/qt/qt-doc-team: Fixed demo subdirs for mobile examples. QSoftkeyManager auto test update Corrected case mismatch. Fixed pro file syntax in demos/spectrum Fix for failing autotest QToolBar/Symbian Removed useless Exit button in Symbian^3
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7Jerome Pasion2011-03-315-24/+35
| | |\ \
| | * | | Fixed demo subdirs for mobile examples.Jerome Pasion2011-03-301-6/+6
| | | | |
| * | | | Merge branch '4.7' of git://scm.dev.nokia.troll.no/qt/qt-doc-teamQt Continuous Integration System2011-03-3010-76/+128
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of git://scm.dev.nokia.troll.no/qt/qt-doc-team: qdoc: Updates to the qdoc manual. Return correct boundaries reasons from QTextBoundaryFinder. GridView jumps to beginning of list when resized Update changes for 4.7.3 QMeeGoLivePixmapData: Verify dimensions of locked pixmap directfb: avoid version dependency by setting DSPD_DST blend functions manually fix -enable-stdcall-fixup usage Report that an update is needed if no update was done
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Jerome Pasion2011-03-301-25/+71
| | |\ \ \
| | | * \ \ Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Martin Smith2011-03-3079-416/+1603
| | | |\ \ \
| | | * | | | qdoc: Updates to the qdoc manual.Martin Smith2011-03-301-25/+71
| | | | | | |
| | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7Jerome Pasion2011-03-309-51/+57
| | |\ \ \ \ \ | | | |_|/ / / | | |/| | | |
| * | | | | | Merge branch '4.7' of git://scm.dev.nokia.troll.no/qt/qt-doc-teamQt Continuous Integration System2011-03-3051-215/+676
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of git://scm.dev.nokia.troll.no/qt/qt-doc-team: Moved a couple of links into one list. Show softkeys when opening a dialog that has a fullscreen parent. Fixed infinite loop in QPainterPath::intersects() when qreal=float. Fix text selection with shift-click. QSslSocket: add test for blacklisted certificates Fixed autotests on Windows. QSslSocket internals: abort on encountering blacklisted certificates QS60Style: draw QComboBox menu correctly Remove two compilation warnings for ARM QTabWidget tabs are resized in wrong way when device rotates Symbian: QComboBox popup Listbox size is not adjusted QSslCertificate: fix test for blacklisted certs on Windows Switched back to using symlinks for all mkspecs on Linux. QS60Style: Support for Menu separators QSslCertificate: report fraudulent certificates as invalid Native image handle provider support in QGLPixmapData Fix an issue with VGImage readback in openvg. FTP: Only read as much as the buffer size the user provided QSysInfo support for next generation Symbian devices. Call FixNativeOrientation on Symbian for certain fullscreen qml views.
| | * | | | | Moved a couple of links into one list.Jerome Pasion2011-03-291-3/+1
| | | | | | |
| | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Jerome Pasion2011-03-297-110/+582
| | |\ \ \ \ \
| | * \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7Jerome Pasion2011-03-2950-212/+675
| | |\ \ \ \ \ \
| * | \ \ \ \ \ \ Merge branch '4.7' of git://scm.dev.nokia.troll.no/qt/qt-doc-teamQt Continuous Integration System2011-03-297-110/+582
| |\ \ \ \ \ \ \ \ | | | |_|/ / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of git://scm.dev.nokia.troll.no/qt/qt-doc-team: Doc: Work on GettingStartedQt tutorial
| | * | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Geir Vattekar2011-03-2931-219/+530
| | |\ \ \ \ \ \ \ | | | |/ / / / / /
| | * | | | | | | Doc: Work on GettingStartedQt tutorialGeir Vattekar2011-03-297-110/+582
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-16609
| * | | | | | | | Merge branch '4.7' of git://scm.dev.nokia.troll.no/qt/qt-doc-teamQt Continuous Integration System2011-03-2825-91/+345
| |\ \ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of git://scm.dev.nokia.troll.no/qt/qt-doc-team: Added a link to the Debugging Techniques article. Fix QUnifiedTimer bug Make sure num_glyphs pass to HarfBuzz is large enough Fix memory leak. Icon in QMessageBox::question is deformed on Symbian Prevent crash when connecting signal in splitview GraphicsViews: Focused widget is not visible after orientation change GraphicsViews: Focused widget is not visible after orientation change Add missing nullify for the s60 style's background pixmap pointer. Fixes QT-4753 sort out stdout vs. stderr usage Changes for 4.7.3 Implement tiled image and pixmap drawing in VG paint engine. Changed maximum heap size for qmlflickr on Symbian. Change Symbian to use destroyed swap behaviour in GL Remove useless profile reference. Text bounding rect calculated incorrectly if non-top aligned.
| | * | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Jerome Pasion2011-03-281-53/+38
| | |\ \ \ \ \ \ \ | | | | |_|_|/ / / | | | |/| | | | |
| | * | | | | | | Added a link to the Debugging Techniques article.Jerome Pasion2011-03-281-0/+1
| | | | | | | | |
| | * | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7Jerome Pasion2011-03-2824-91/+344
| | |\ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ Merge branch '4.7' of git://scm.dev.nokia.troll.no/qt/qt-doc-teamQt Continuous Integration System2011-03-281-53/+38
| |\ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of git://scm.dev.nokia.troll.no/qt/qt-doc-team: qdoc: Updates to the qdoc manual.
| | * | | | | | | | qdoc: Updates to the qdoc manual.Martin Smith2011-03-281-53/+38
| | |/ / / / / / /
| * | | | | | | | Merge branch '4.7' of git://scm.dev.nokia.troll.no/qt/qt-doc-teamQt Continuous Integration System2011-03-281-0/+20
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of git://scm.dev.nokia.troll.no/qt/qt-doc-team: qdoc: Added a way to exclude directories from receiving default metadata
| | * | | | | | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Martin Smith2011-03-285-75/+132
| | |\ \ \ \ \ \ \
| | * | | | | | | | qdoc: Added a way to exclude directories from receiving default metadataMartin Smith2011-03-281-0/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | But it is ifdefed out because I think we won't use it.
| * | | | | | | | | Merge branch '4.7' of git://scm.dev.nokia.troll.no/qt/qt-doc-teamQt Continuous Integration System2011-03-27649-426/+45028
| |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of git://scm.dev.nokia.troll.no/qt/qt-doc-team: (37 commits) Edited the Tutorials and Examples pages. Renamed links in index.qdoc. Doc: Update to QStyledItemDelegate::displayText() qdoc: Added default values to config file for DITA Doc: Work on QAudioInput::start() functions. Avoided the use of hard-coded file names. Copied the declarative parser into qdoc3 to avoid dependency issues. qdoc: Don't wrap <image> in <fig> if in an <xref> Doc: Work on a11y docs qdoc: Added <copyright>, <copyryear>, and <copyrholder>. qdoc: Completed metadata handling. Doc: Small update to QImageReader/Writer::supportedImageFomrmats() Edited QtWebKit Guide qdoc and added external links. Fixed external link in QtWebKit Guide. Added QtWebKit Guide JavaScript files. Adding QtWebKit Guide example images and created links to images. Fixed style issue and replaced image. Adding QtWebKit Guide CSS files. Changed QtWebKit Guide chapter names and fixed a link. Changing qt-webpages.qdoc to contain http links. Online version. Adopting changes from a merge with qt-doc-team repo, 4.7 branch ...
| | * | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Jerome Pasion2011-03-257-16/+66
| | |\ \ \ \ \ \ \ \ | | | | |_|/ / / / / | | | |/| | | | | |
| | | * | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Geir Vattekar2011-03-256-16/+61
| | | |\ \ \ \ \ \ \ | | | | |/ / / / / /
| | | | * | | | | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Martin Smith2011-03-2521-39/+12915
| | | | |\ \ \ \ \ \
| | | | * | | | | | | qdoc: Added default values to config file for DITAMartin Smith2011-03-256-16/+61
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also added the handling of these default values: dita.metadata.default.author = Qt Development Frameworks dita.metadata.default.permissions = all dita.metadata.default.publisher = Nokia dita.metadata.default.copyryear = 2011 dita.metadata.default.copyrholder = Nokia dita.metadata.default.audience = programmer
| | | * | | | | | | | Doc: Update to QStyledItemDelegate::displayText()Geir Vattekar2011-03-251-0/+5
| | | | |/ / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-7567
| | * | | | | | | | Edited the Tutorials and Examples pages. Renamed links in index.qdoc.Jerome Pasion2011-03-254-75/+127
| | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added a link to the eLearning materials and Creator manual. Reviewed-by: David Boddie
| | * | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Geir Vattekar2011-03-2521-37/+12906
| | |\ \ \ \ \ \ \
| | | * \ \ \ \ \ \ Merge branch '4.7' of ../qt-doc-review into 4.7David Boddie2011-03-240-0/+0
| | | |\ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-staging into 4.7David Boddie2011-03-240-0/+0
| | | | |\ \ \ \ \ \ \ | | |_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/src/declarative/dynamicobjects.qdoc
| | | * | | | | | | | Avoided the use of hard-coded file names.David Boddie2011-03-241-34/+70
| | | | | | | | | | |
| | | * | | | | | | | Copied the declarative parser into qdoc3 to avoid dependency issues.David Boddie2011-03-2419-1/+12832
| | | | | | | | | | |
| | | * | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2011-03-24623-310/+31934
| | | |\ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | / / / / / / | | | | |/ / / / / / | | | |/| | | | | |
| | | * | | | | | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Martin Smith2011-03-243-33/+35
| | | |\ \ \ \ \ \ \
| | | * | | | | | | | qdoc: Don't wrap <image> in <fig> if in an <xref>Martin Smith2011-03-241-2/+4
| | | | | | | | | | |
| | * | | | | | | | | Doc: Work on QAudioInput::start() functions.Geir Vattekar2011-03-251-4/+13
| | | |/ / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-7892 Reviewed-by: Jason McDonald
| | * | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Geir Vattekar2011-03-249-128/+169
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / /
generated by cgit v0.12 at 2025-09-23 04:27:30 (GMT)