summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* qt project files: create pkg-config files for mingwMark Brand2011-01-1022-23/+29
| | | | | | | This is mostly the same as for unix. Merge-request: 2543 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* qmake: write and install pkg-config files for mingwMark Brand2011-01-102-0/+15
| | | | | Merge-request: 2543 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* qmake: don't limit pkg-config writing to unix generatorMark Brand2011-01-104-182/+183
| | | | | | | | Move pkg-config related methods from unix generator to base class so they can be used by other generators too. Merge-request: 2543 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* qmake: fix double directory separatorMark Brand2011-01-101-2/+7
| | | | | Merge-request: 2543 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Fix reversed condition introduced in 9a6cfc07e5João Abecasis2011-01-101-1/+1
| | | | Reviewed-by: Bradley T. Hughes
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2011-01-085-5/+12
|\ | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Add /DYNAMICBASE /NXCOMPAT to linker options in Visual Studio 2005 and higher Fix compilation error on Solaris Check elapsed time only once
| * Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2011-01-075-5/+12
| |\ | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Add /DYNAMICBASE /NXCOMPAT to linker options in Visual Studio 2005 and higher Fix compilation error on Solaris Check elapsed time only once
| | * Add /DYNAMICBASE /NXCOMPAT to linker options in Visual Studio 2005 and higherminiak2011-01-073-3/+3
| | | | | | | | | | | | | | | | | | | | | Native Win32 C++ projects created in Visual Studio have this enabled in the default configuration in order to increase security. Merge-request: 2539 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
| | * Fix compilation error on SolarisJoão Abecasis2011-01-071-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d_type in dirent is a non-standard extension to POSIX available on some platforms (namely BSDs, Mac, Linux, Symbian). Taking the conservative approach and using this information only on platforms known to support it. Reviewed-by: Shane Kearns
| | * Check elapsed time only onceJoão Abecasis2011-01-071-2/+3
| | | | | | | | | | | | | | | Task-number: QTBUG-16262 Reviewed-by: Bradley T. Hughes
* | | Merge branch 'qt-master-from-4.7' of ↵Qt Continuous Integration System2011-01-088-17/+27
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | scm.dev.nokia.troll.no:qt/qt-integration into master-integration * 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration: QmlViewer: Remove unused class variables Fixed bug and performance problem in windowsstyle. Restored old flushing behavior in -graphicssystem opengl on desktop. Fix KERN-EXEC 0 panic on exit when bearer is searching for WLANs Designer: Block QEvent::WinIdChange. QUrl::setUrl should call detach qkeymapper_x11.cpp: fix compilation with LSB and without XKB
| * | Merge branch 'qt-master-from-4.7' of ↵Qt Continuous Integration System2011-01-078-17/+27
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | scm.dev.nokia.troll.no:qt/qt-integration into master-integration * 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration: QmlViewer: Remove unused class variables Fixed bug and performance problem in windowsstyle. Restored old flushing behavior in -graphicssystem opengl on desktop. Fix KERN-EXEC 0 panic on exit when bearer is searching for WLANs Designer: Block QEvent::WinIdChange. QUrl::setUrl should call detach qkeymapper_x11.cpp: fix compilation with LSB and without XKB
| | * \ Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2011-01-078-17/+27
| | |\ \
| | | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-01-071-2/+0
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: QmlViewer: Remove unused class variables
| | | | * | QmlViewer: Remove unused class variablesKai Koehne2011-01-071-2/+0
| | | | | |
| | | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2011-01-072-5/+6
| | | |\ \ \ | | | | |/ / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Fixed bug and performance problem in windowsstyle. Restored old flushing behavior in -graphicssystem opengl on desktop.
| | | | * | Fixed bug and performance problem in windowsstyle.Samuel Rødal2011-01-071-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QImage::fill(Qt::transparent) pre-4.8 is a bug, also using Format_ARGB32 is very unoptimal compared to Format_ARGB32_Premultiplied. Task-number: QTBUG-16439 Reviewed-by: Eskil Abrahamsen Blomfeldt
| | | | * | Restored old flushing behavior in -graphicssystem opengl on desktop.Samuel Rødal2011-01-071-3/+4
| | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change 284211ccbd2cbd recently introduced a fix for EGL, to prevent flushing when nothing has been rendered into the back buffer. However, the skip should only be done when there's no partial update support in the window surface. If there is partial update support we can still flush as usual. Reviewed-by: Gunnar Sletta
| | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2011-01-061-2/+4
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Fix KERN-EXEC 0 panic on exit when bearer is searching for WLANs
| | | | * | Fix KERN-EXEC 0 panic on exit when bearer is searching for WLANsShane Kearns2011-01-061-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The access point scanner cancels itself in the destructor. This requires the handle to be valid, but it was closed in the symbian engine destructor immediately before deleting the AP scanner. Because of the way symbian active objects work, the crashing function is only called if there was an asynchronous request in progress. So it could be missed in cases where the scan completes faster than the test case. Task-number: QTBUG-16484 Reviewed-by: Markus Goetz
| | | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2011-01-064-8/+17
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Designer: Block QEvent::WinIdChange. QUrl::setUrl should call detach qkeymapper_x11.cpp: fix compilation with LSB and without XKB
| | | | * | | Designer: Block QEvent::WinIdChange.Friedemann Kleint2011-01-061-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As it causes an obscure deletion crash related to the formeditor rubberband on Mac. Reviewed-by: con
| | | | * | | QUrl::setUrl should call detachOlivier Goffart2011-01-062-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-16425 Reviewed-by: Gabriel Reviewed-by: Markus Goetz
| | | | * | | qkeymapper_x11.cpp: fix compilation with LSB and without XKBOlivier Goffart2011-01-061-8/+7
| | | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-16312 Reviewed-by: Marius Storm-Olsen
* | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2011-01-074-71/+140
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Added api for efficient data driven baseline testing Need not keep client waiting until server has saved
| * | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2aavit2011-01-07260-5879/+88973
| |\ \ \ \ \ | | |/ / / /
| * | | | | Merge branch 'lancelot'aavit2011-01-074-71/+140
| |\ \ \ \ \
| | * | | | | Added api for efficient data driven baseline testingaavit2011-01-073-63/+133
| | | | | | |
| | * | | | | Need not keep client waiting until server has savedaavit2010-12-161-8/+7
| | | | | | |
* | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2011-01-072-26/+21
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | / | | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Assistant: Fix warnings. Assistant: Don't tabify "Open Pages" dock widget by default.
| * | | | | Assistant: Fix warnings.Christian Kandeler2011-01-072-23/+19
| | | | | |
| * | | | | Assistant: Don't tabify "Open Pages" dock widget by default.Christian Kandeler2011-01-071-3/+2
|/ / / / / | | | | | | | | | | | | | | | The user is likely to always want to see it plus one of the others.
* | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-releng-staging into ↵Qt Continuous Integration System2011-01-072-42/+41
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-releng-staging: Remove unnecessarily frozen functions from QtOpenGL WINSCW DEF file Updated QTOpenGL DEF files for WINSCW and ARMV5 Updated DEF files for QtOpenGL for WINSCW and ARMV5
| * \ \ \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-releng-staging into ↵Qt Continuous Integration System2011-01-062-42/+41
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-releng-staging: Remove unnecessarily frozen functions from QtOpenGL WINSCW DEF file Updated QTOpenGL DEF files for WINSCW and ARMV5 Updated DEF files for QtOpenGL for WINSCW and ARMV5
| | * \ \ \ \ Merge commit 'qt-releng-review/master'Eckhart Koppen2011-01-062-42/+41
| | |\ \ \ \ \
| | | * \ \ \ \ Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-releng-teamQt Continuous Integration System2011-01-061-124/+0
| | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qt-releng-team: Remove unnecessarily frozen functions from QtOpenGL WINSCW DEF file
| | | | * | | | | Remove unnecessarily frozen functions from QtOpenGL WINSCW DEF fileEckhart Koppen2011-01-061-124/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: TrustMe
| | | * | | | | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-releng-teamQt Continuous Integration System2011-01-062-39/+162
| | | |\ \ \ \ \ \ | | | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qt-releng-team: Updated QTOpenGL DEF files for WINSCW and ARMV5
| | | | * | | | | Updated QTOpenGL DEF files for WINSCW and ARMV5Eckhart Koppen2011-01-062-39/+162
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Marked more functions absent Reviewed-by: TrustMe
| | | * | | | | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-releng-teamQt Continuous Integration System2011-01-06185-4660/+8360
| | | |\ \ \ \ \ \ | | | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qt-releng-team: (118 commits) Updated DEF files for QtOpenGL for WINSCW and ARMV5 Fix link error on MacOS Allow QWidget with size larger than 16383 on Mac OS X (Cocoa) Set no brush when the brush is a solid patern transparent color. Fixed networkselftest failing to resolve hostname tst_qmessagebox: fix `about' test on mac tst_qmessagebox: make the failure message better for detailsButtonText tst_qmessagebox: simulate key events more robustly Clear WSERV content when a native child receives an "expose" Fixed a bug in elf2e32_qtwrapper regarding spaces in def files. Fixed several compile and deployment issues in the mmf phonon plugin. Fix fullscreen/Maximized dialog misplacement in Symbian Whitespace change Fix for coding conventions. Fix resource leak in QCLuceneStandardAnalyzer::QCLuceneStandardAnalyzer. Fix resource leak in QCLuceneStopAnalyzer::QCLuceneStopAnalyzer. Add Postgresql 8.x and 9 supports WorkerScript could starve image loading of CPU. More docs for FolderListModel Improve docs on attached properties on view delegates. ...
| | | | * | | | | Updated DEF files for QtOpenGL for WINSCW and ARMV5Eckhart Koppen2011-01-052-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Marked QGLContextResource::value absent Reviewed-by: TrustMe
| | | | * | | | | Merge commit 'qt-master/master'Eckhart Koppen2011-01-05196-5364/+8752
| | | | |\ \ \ \ \
* | | | | \ \ \ \ \ Merge branch 'qt-master-from-4.7' of ↵Qt Continuous Integration System2011-01-078-118/+221
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | scm.dev.nokia.troll.no:qt/qt-integration into master-integration * 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration: PathView crashed when the path is provided with undefined values. PathView: update modelCount before attempting to regenerate delegates. Update docs - calling overloaded functions from QML is now supported Doc fixes for introduction page and Item docs
| * | | | | | | | | Merge branch 'qt-master-from-4.7' of ↵Qt Continuous Integration System2011-01-068-118/+221
| |\ \ \ \ \ \ \ \ \ |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | scm.dev.nokia.troll.no:qt/qt-integration into master-integration * 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration: PathView crashed when the path is provided with undefined values. PathView: update modelCount before attempting to regenerate delegates. Update docs - calling overloaded functions from QML is now supported Doc fixes for introduction page and Item docs
| * | | | | | | | | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2011-01-068-118/+221
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ / | | |/| | | | | | |
| | * | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-01-065-2/+83
| | |\ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: PathView crashed when the path is provided with undefined values. PathView: update modelCount before attempting to regenerate delegates.
| | | * | | | | | | PathView crashed when the path is provided with undefined values.Martin Jones2011-01-063-1/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-16356 Reviewed-by: Bea Lam
| | | * | | | | | | PathView: update modelCount before attempting to regenerate delegates.Martin Jones2011-01-063-1/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the model is a VisualDataModel, the count will initally be zero and modelCount is not updated due to itemsInserted() before the component is completed. Task-number: QTBUG-16357 Reviewed-by: Bea Lam
| | * | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-01-063-116/+138
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Update docs - calling overloaded functions from QML is now supported Doc fixes for introduction page and Item docs
| | | * | | | | | | Update docs - calling overloaded functions from QML is now supportedBea Lam2011-01-061-5/+8
| | | | | | | | | |
generated by cgit v0.12 at 2024-12-04 05:41:47 (GMT)