diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-01 19:26:04 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-01 19:26:04 (GMT) |
| commit | 82991e40afd46f91de42dec048df705441b6b0cf (patch) | |
| tree | f4127a385279cfbe5e560463827ab5a95d38daeb /src/gui/egl/qegl_qws.cpp | |
| parent | 2d719ce634efa5e0abfb5d76eb516133753b5a62 (diff) | |
| parent | f2dd19b1ad656f18991b543b32c5eae9cfbc28d0 (diff) | |
| download | Qt-82991e40afd46f91de42dec048df705441b6b0cf.zip Qt-82991e40afd46f91de42dec048df705441b6b0cf.tar.gz Qt-82991e40afd46f91de42dec048df705441b6b0cf.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
typo for windows ce exclusion rule
Updated .gitignore with the new name of the qmlviewer
Fixed the close button of the find widget in Assistant
Doc: brief Qt Quick introduction on "What's New" page.
Interview Demo: Fix warning about pixmap leak on X11.
Perform latin1 conversion directly on JSC::UString
Avoid conversion between JavaScriptCore String type and QString
Doc: Rephrase documentation for QColor::isValidColor and add \since 4.7.
Use QList::reserve() in QDataStream>>QList
Added static method isValidColor to QColor.
compile fix with namespaces
build fix for WinCE
qDetectCPUFeatures: compile fix with namespaces
compile fix for WinCE
Mac: using Qt to write plugins disables quit for 3rd party application
doc: Fixed building documentation
Updated syncqt to use relative include paths on cygwin as well.
Diffstat (limited to 'src/gui/egl/qegl_qws.cpp')
0 files changed, 0 insertions, 0 deletions