summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* create a pwd string with a trailing slash only on demandOswald Buddenhagen2011-04-121-6/+7
| | | | Reviewed-by: mariusSO
* make uic3-generated moc files depend on mocinclude.tmpOswald Buddenhagen2011-04-121-0/+1
| | | | | Task-number: QTBUG-16951 Reviewed-by: mariusSO
* useful location reporting for errors from QMAKE_SUBSTITUTESOswald Buddenhagen2011-04-123-1/+16
| | | | Reviewed-by: mariusSO
* clean up visual studio identification codeOswald Buddenhagen2011-04-1212-22/+16
| | | | | | | TEMPLATE is (now) reliably prefixed with "vc" when a vs generator is used. Reviewed-by: mariusSO
* prefix TEMPLATE_PREFIX to TEMPLATE even if it is "default-constructed"Oswald Buddenhagen2011-04-121-7/+7
| | | | | | | that way prf files don't have to check both the prefix and the actual template to identify visual studio mode. Reviewed-by: mariusSO
* 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.
* [QTBUG-15278] QWidget::windowState gets out of sync (Aero Snap)Arnold Konrad2011-04-081-9/+25
| | | | | | | | | Windows 7 sends WM_SIZE messages without preceding WM_SYSCOMMAND when a window is maximized or restored via Aero Snap. These messages are now handled correctly. Merge-request: 1105 Reviewed-by: Prasanth Ullattil <prasanth.ullattil@nokia.com>
* HTTP cacheing: do not store the date header with the resourcePeter Hartmann2011-04-081-8/+5
| | | | | | | | | | | ... to avoid re-writing the resource to disk when retrieving the resource from cache. We are currently using the "Expires", "max-age" and "s-maxage" headers to determine when a cached resource will expire. Autotests still pass and the demo browser reports the same amount of pages loaded from the cache. Reviewed-by: Markus Goetz
* make -markuntranslated work without -idbasedOswald Buddenhagen2011-04-081-1/+1
| | | | Task-number: QTBUG-18625
* fix conditional on shell typeOswald Buddenhagen2011-04-081-1/+1
|
* Ensure shared network session deleted from correct threadShane Kearns2011-04-071-1/+6
| | | | | | | | | | Due to threaded http, the shared QNetworkSession can have its last reference removed from a http delegate thread. To avoid this deadlocking use a deleteLater custom deleter so that the QNS is deleted from the thread it has affinity for. Reviewed-by: Markus Goetz Task-Number: QTBUG-17464
* Revert "Remove SIGBUS emission from QNetworkSession destruction."Adrian Constantin2011-04-071-1/+1
| | | | | | | | | | This reverts commit b40d04a19f4c186bf47aad128b0618c629629e07. Reviewed-by: Shane Kearns It is usual for QXyzPrivate implementation to assume that the parent QXyz is a valid object. Reviewed-by: Cristiano di Flora
* Fixed license headers for examples in 4.7Timo Turunen2011-04-057-189/+182
| | | | | | All examples should carry the BSD header. Reviewed-by: Trust Me
* Removing extra comma in `enum' declaration.Sergio Ahumada2011-04-051-1/+1
|
* win32-g++: Correct the order of linked Windows librariesMark Brand2011-04-051-1/+1
| | | | | | | | Commit a6d48ca corrected the problem for win32-g++. Here we do the same for win32-g++-cross. Merge-request: 1173 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Remove SIGBUS emission from QNetworkSession destruction.Cristiano di Flora2011-04-051-1/+1
| | | | Task-Number: QTBUG-17464
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2011-04-041-13/+0
|\ | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Remove obsolete files from qt.iby
| * Remove obsolete files from qt.ibyMiikka Heikkinen2011-04-041-13/+0
| | | | | | | | | | | | | | | | | | | | | | | | - qaudio.dll is no longer built separately, it is static part of QtMultimedia.dll - s60main resources are no longer needed or generated - Webkit files are installed via separate IBY Task-number: QT-4839 Reviewed-by: Guoqing Zhang
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2011-04-045-5/+5
|\ \ | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: win32-g++: Correct the order of linked Windows libraries Fixing a traling space on if statement that fails in Solaris.
| * | 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-s60-public into ↵Qt Continuous Integration System2011-04-044-7/+18
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Fix QGradient stop with NaN position on Symbian. Do not add project path to SYMBIAN_MATCHED_TRANSLATIONS if not needed QApplication does not define flag for "single touch" Native dialog softkeys are covered by QApplication softkeys
| * | Fix QGradient stop with NaN position on Symbian.Laszlo Agocs2011-04-041-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The qbrush autotest was failing on Symbian, because gradient stops with NaN position cannot be inserted on Symbian. This is caused by the pos > 1 || pos < 0 check in setColorAt() which is incorrect on ARM as NaN > 1 will evaluate to true. Task-number: QTBUG-17874 Reviewed-by: Samuel Rødal
| * | Do not add project path to SYMBIAN_MATCHED_TRANSLATIONS if not neededMiikka Heikkinen2011-04-041-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | If the path to translation file is already absolute, do not add the $$_PRO_FILE_PWD_ to it in symbian.conf Task-number: QT-4842 Reviewed-by: axis
| * | QApplication does not define flag for "single touch"Sami Merila2011-04-041-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Qt application was previously not setting a native framework's flag to indicate that is supports "single touch" (i.e. activating an item would only need one tap, instead of one tap to highlight and another to activate) for Sym^3. This was causing the native dialogs launched from within the application to behave as Sym^1 dialogs. As a fix, set the native flag when running Qt in Sym^3. Task-number: QT-4569 Reviewed-by: Jani Hautakangas
| * | Native dialog softkeys are covered by QApplication softkeysSami Merila2011-04-041-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Dialog softkeys are covered by Qt Application's Softkeys Updating softkeys while showing a native dialog, pushes Qt application CBA on top of dialog CBA. Therefore, native dialog can not be dismissed. As a workaround, when gaining focus to a window, do not update application softkeys, if there is a native dialog shown. Task-number: QTBUG-18486 Reviewed-by: mread
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-water-staging into ↵Qt Continuous Integration System2011-04-043-8/+24
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-water-staging: Cocoa: p1 bugfix, add widget flag MacNoCocoaChildWindow
| * | Cocoa: p1 bugfix, add widget flag MacNoCocoaChildWindowRichard Moe Gustavsen2011-04-043-8/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This problem has been known for a long time, but a good solution has never been found. The problem is that a child window should always stay on top of it's parent, if not for anything else than secure that a modal child does not block input while hiding behind the parent at the same time. The only sensible solution found to ensure this in the Cocoa port is to use Cocoa child windows. But this API has a sad side effect; it will move the child along with the parent when the parent is moved on screen. This is something it seems we have to live with. But for those users that wants to handle this issue otherwise, we now add a widget flag to switch this off. Task-number: QTBUG-11481 Reviewed-by: msorvig
* | | 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
generated by cgit v0.12 at 2024-11-24 17:44:33 (GMT)