summaryrefslogtreecommitdiffstats
path: root/doc/src/platforms
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '4.6' of oslo-staging-1 into 4.6Simon Hausmann2009-11-192-4/+37
|\
| * Doc: List planned changes to platform support in Qt 4.7Volker Hilsheimer2009-11-181-0/+17
| |
| * doc: Added a further note about what the MinGW package is needed for.Martin Smith2009-11-181-0/+4
| | | | | | | | Task-number: QTBUG-5764
| * doc: Added note about which MinGW package to use and where to get it.Martin Smith2009-11-181-4/+16
| | | | | | | | Task-number: QTBUG-5764
* | Merge oslo-staging-2/4.6 into upstream/4.6Olivier Goffart2009-11-192-1/+136
|\ \
| * \ Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into ↵axis2009-11-181-24/+33
| |\ \ | | | | | | | | | | | | 4.6-staging2
| | * | Incorporate feedback by Espen.Frans Englich2009-11-171-24/+33
| | | | | | | | | | | | | | | | Reviewed-by: Espen Riskedal
| * | | Merge upstream/4.6 into oslo-staging-2Olivier Goffart2009-11-171-3/+3
| |\ \ \ | | |/ / | |/| / | | |/
| * | Fix typo.Frans Englich2009-11-171-1/+1
| | | | | | | | | | | | Reviewed-by: TrustMe
| * | Document the state of support in Symbian.Frans Englich2009-11-172-1/+127
| | | | | | | | | | | | | | | | | | | | | The content was compiled primarily by asking the members of the S60 team. Reviewed-by: David Boddie
* | | Symbian docs: Repair some documentation damage, remove obsolete file.Frans Englich2009-11-183-47/+24
| | | | | | | | | | | | Reviewed-by: TrustMe
* | | Incorporate feedback from marketing.Frans Englich2009-11-182-111/+83
| | |
* | | Symbian support: incorporate feedback from Lars.Frans Englich2009-11-181-9/+10
| | | | | | | | | | | | | | | Reviewed-by: Espen Riskedal Reviewed-by: Frans Englich
* | | Complement Phonon for Symbian documentation.Frans Englich2009-11-181-2/+6
| | | | | | | | | | | | Reviewed-by: Gareth Stockwell
* | | Incorporate feedback by Espen.Frans Englich2009-11-181-24/+33
| | | | | | | | | | | | Reviewed-by: Espen Riskedal
* | | Fix typo.Frans Englich2009-11-181-1/+1
| | | | | | | | | | | | Reviewed-by: TrustMe
* | | Document the state of support in Symbian.Frans Englich2009-11-182-1/+127
| |/ |/| | | | | | | | | | | The content was compiled primarily by asking the members of the S60 team. Reviewed-by: David Boddie
* | Doc: Correcting contact info.Morten Engvoldsen2009-11-161-3/+3
|/ | | | Correcting contact info. Removed email and redirecting reader to Jira
* Correct URL format.Jason McDonald2009-11-111-2/+2
| | | | Reviewed-by: Trust Me
* Doc: fix typo in linkVolker Hilsheimer2009-11-101-1/+1
|
* Update INSTALL and README + friends for the everywhere packageJason McDonald2009-11-091-0/+96
| | | | | | | | | Make INSTALL and README more generic, avoid repeating stuff that's already in the product docs, and move the Windows Signing stuff into the product docs. Task-number: QTBUG-5453 Reviewed-by: Espen Riskedal
* Doc: Moved external references to a separate collection.David Boddie2009-11-061-32/+22
| | | | Reviewed-by: Trust Me
* Doc: Fixed qdoc warnings.David Boddie2009-11-053-6/+18
| | | | Reviewed-by: Trust Me
* Documentation: Updating Embedded HW acc. docsMorten Engvoldsen2009-11-051-230/+0
| | | | | | Removing redundant file Task-number: QT-1109
* Documentation: Embedded hardware accelerationMorten Engvoldsen2009-11-0512-42/+1296
| | | | | | | | | | | | Adding docs on how to use hardware acceleration on Embedded Linux and Windows CE Task-number: QT-1109 Rev-by: Anders Bakken Rev-by: Rhys Weatherley Rev-by: Thomas Hartmann
* Doc: Fixed whitespace issue.David Boddie2009-10-261-4/+3
| | | | Reviewed-by: Trust Me
* Add Windows 7 with VC++2008 as a Tier 2 supported platform.Volker Hilsheimer2009-10-221-2/+0
|
* Update the OpenGL for Qt/Embedded documentationRhys Weatherley2009-10-131-122/+125
| | | | Reviewed-by: trustme
* Doc: Minor language fixes.David Boddie2009-10-091-14/+14
| | | | Reviewed-by: Trust Me
* Fixed miscellaneous minor problems with Symbian docs.Miikka Heikkinen2009-10-092-3/+5
| | | | Reviewed-by: Espen Riskedal
* Doc: update the compiler notes about Sun CC's STL not being supportedThiago Macieira2009-10-091-1/+13
| | | | | | | | | The default STL (Rogue Wave STL) is far too old for Qt. It doesn't meet the ISO C++ 98 specification. Using a more recent (and standards-compliant) STL like stlport4 enables Qt to build even QtWebKit on Solaris. Also change the note indicating we're using Sun Studio 12, not 8.
* Changing S60 to Symbian in the DocsMorten Engvoldsen2009-10-082-16/+18
| | | | | | | | Changing names to Symbian platform Task-number: QT-2268 Rev-by: Espen Riskedal
* Merge branch '4.6' of git@scm.dev.troll.no:qt/qt into 4.6Miikka Heikkinen2009-10-063-0/+394
|\
| * Document Embedded Linux with X11 and Scratchbox environment as Tier 2.Volker Hilsheimer2009-10-051-0/+2
| |
| * Doc: move new files into correct subdirectory.Volker Hilsheimer2009-10-052-0/+392
|/
* Doc: fix typoVolker Hilsheimer2009-10-021-1/+1
|
* Doc: RTOS'es are available under a commerical license, without support.Volker Hilsheimer2009-10-011-1/+8
| | | | Also point to the right contact-us address.
* Doc: gcc 3.4-based MinGW is downgraded to Tier 2 support, gcc 4.4 is Tier 1Volker Hilsheimer2009-10-011-1/+3
|
* Merge commit 'qt/4.6' into mmfphononFrans Englich2009-09-291-1/+7
|\
| * Doc: Snow Leopard is supported as a Tier 2 platform.Volker Hilsheimer2009-09-291-1/+7
| | | | | | | | | | Discussed in the program team - adding it as a Tier 1 platform is too ambitious.
* | Merge commit 'qt/4.6' into mmfphononFrans Englich2009-09-2335-592/+589
|\ \ | |/ | | | | | | | | | | | | | | | | Conflicts: demos/embedded/fluidlauncher/config_s60/config.xml demos/embedded/fluidlauncher/fluidlauncher.pro src/corelib/io/io.pri src/gui/kernel/qapplication_s60.cpp src/gui/kernel/qwidget_s60.cpp src/s60installs/qt_libs.pro
| * Doc: Updated the Qt for Embedded Platforms page.David Boddie2009-09-102-21/+21
| | | | | | | | Reviewed-by: Trust Me
| * Update license headers again.Jason McDonald2009-09-0935-140/+140
| | | | | | | | Reviewed-by: Trust Me
| * Added Symbian to our list of Tier1 platformsEspen Riskedal2009-09-041-0/+2
| | | | | | | | | | | | | | | | At the moment we only support S60 3.1, 3.2 and 5.0. Once Symbian Platforms actually gets publicly released we'll add those too. Reviewed-by: Volker Hilsheimer Reviewed-by: Jason Barron
| * Update license headersJason McDonald2009-09-041-0/+41
| | | | | | | | Reviewed-by: Trust Me
| * Merge branch '4.5' into 4.6Thiago Macieira2009-09-032-53/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/src/frameworks-technologies/dbus-adaptors.qdoc doc/src/qtdbus.qdoc src/gui/accessible/qaccessible_mac_cocoa.mm src/gui/kernel/qapplication_win.cpp src/xmlpatterns/parser/createTokenLookup.sh tests/auto/linguist/lupdate/testdata/good/merge_versions/project.ui tests/auto/linguist/lupdate/testdata/good/mergeui/project.ui tests/auto/linguist/lupdate/testdata/good/parseui/project.ui tests/auto/runQtXmlPatternsTests.sh tests/auto/test.pl tests/auto/uic/baseline/batchtranslation.ui tests/auto/uic/baseline/batchtranslation.ui.h tests/auto/uic/baseline/config.ui tests/auto/uic/baseline/config.ui.h tests/auto/uic/baseline/finddialog.ui tests/auto/uic/baseline/finddialog.ui.h tests/auto/uic/baseline/formwindowsettings.ui tests/auto/uic/baseline/formwindowsettings.ui.h tests/auto/uic/baseline/helpdialog.ui tests/auto/uic/baseline/helpdialog.ui.h tests/auto/uic/baseline/listwidgeteditor.ui tests/auto/uic/baseline/listwidgeteditor.ui.h tests/auto/uic/baseline/mainwindowbase.ui tests/auto/uic/baseline/mainwindowbase.ui.h tests/auto/uic/baseline/newactiondialog.ui tests/auto/uic/baseline/newactiondialog.ui.h tests/auto/uic/baseline/newform.ui tests/auto/uic/baseline/newform.ui.h tests/auto/uic/baseline/orderdialog.ui tests/auto/uic/baseline/orderdialog.ui.h tests/auto/uic/baseline/paletteeditor.ui tests/auto/uic/baseline/paletteeditor.ui.h tests/auto/uic/baseline/paletteeditoradvancedbase.ui tests/auto/uic/baseline/paletteeditoradvancedbase.ui.h tests/auto/uic/baseline/phrasebookbox.ui tests/auto/uic/baseline/phrasebookbox.ui.h tests/auto/uic/baseline/plugindialog.ui tests/auto/uic/baseline/plugindialog.ui.h tests/auto/uic/baseline/previewwidget.ui tests/auto/uic/baseline/previewwidget.ui.h tests/auto/uic/baseline/previewwidgetbase.ui tests/auto/uic/baseline/previewwidgetbase.ui.h tests/auto/uic/baseline/qfiledialog.ui tests/auto/uic/baseline/qfiledialog.ui.h tests/auto/uic/baseline/qtgradientdialog.ui tests/auto/uic/baseline/qtgradientdialog.ui.h tests/auto/uic/baseline/qtgradientviewdialog.ui tests/auto/uic/baseline/qtgradientviewdialog.ui.h tests/auto/uic/baseline/saveformastemplate.ui tests/auto/uic/baseline/saveformastemplate.ui.h tests/auto/uic/baseline/statistics.ui tests/auto/uic/baseline/statistics.ui.h tests/auto/uic/baseline/stringlisteditor.ui tests/auto/uic/baseline/stringlisteditor.ui.h tests/auto/uic/baseline/tabbedbrowser.ui tests/auto/uic/baseline/tabbedbrowser.ui.h tests/auto/uic/baseline/tablewidgeteditor.ui tests/auto/uic/baseline/tablewidgeteditor.ui.h tests/auto/uic/baseline/translatedialog.ui tests/auto/uic/baseline/translatedialog.ui.h tests/auto/uic/baseline/treewidgeteditor.ui tests/auto/uic/baseline/treewidgeteditor.ui.h tests/auto/uic/baseline/trpreviewtool.ui tests/auto/uic/baseline/trpreviewtool.ui.h tests/auto/uic3/baseline/about.ui tests/auto/uic3/baseline/about.ui.4 tests/auto/uic3/baseline/actioneditor.ui tests/auto/uic3/baseline/actioneditor.ui.4 tests/auto/uic3/baseline/config.ui tests/auto/uic3/baseline/config.ui.4 tests/auto/uic3/baseline/configtoolboxdialog.ui tests/auto/uic3/baseline/configtoolboxdialog.ui.4 tests/auto/uic3/baseline/connectiondialog.ui tests/auto/uic3/baseline/connectiondialog.ui.4 tests/auto/uic3/baseline/createtemplate.ui tests/auto/uic3/baseline/createtemplate.ui.4 tests/auto/uic3/baseline/customwidgeteditor.ui tests/auto/uic3/baseline/customwidgeteditor.ui.4 tests/auto/uic3/baseline/dbconnection.ui tests/auto/uic3/baseline/dbconnection.ui.4 tests/auto/uic3/baseline/dbconnectioneditor.ui tests/auto/uic3/baseline/dbconnectioneditor.ui.4 tests/auto/uic3/baseline/dbconnections.ui tests/auto/uic3/baseline/dbconnections.ui.4 tests/auto/uic3/baseline/editfunctions.ui tests/auto/uic3/baseline/editfunctions.ui.4 tests/auto/uic3/baseline/finddialog.ui tests/auto/uic3/baseline/finddialog.ui.4 tests/auto/uic3/baseline/formsettings.ui tests/auto/uic3/baseline/formsettings.ui.4 tests/auto/uic3/baseline/gotolinedialog.ui tests/auto/uic3/baseline/gotolinedialog.ui.4 tests/auto/uic3/baseline/helpdialog.ui tests/auto/uic3/baseline/helpdialog.ui.4 tests/auto/uic3/baseline/iconvieweditor.ui tests/auto/uic3/baseline/iconvieweditor.ui.4 tests/auto/uic3/baseline/listboxeditor.ui tests/auto/uic3/baseline/listboxeditor.ui.4 tests/auto/uic3/baseline/listeditor.ui tests/auto/uic3/baseline/listeditor.ui.4 tests/auto/uic3/baseline/listvieweditor.ui tests/auto/uic3/baseline/listvieweditor.ui.4 tests/auto/uic3/baseline/mainfilesettings.ui tests/auto/uic3/baseline/mainfilesettings.ui.4 tests/auto/uic3/baseline/mainwindowbase.ui tests/auto/uic3/baseline/mainwindowbase.ui.4 tests/auto/uic3/baseline/mainwindowwizard.ui tests/auto/uic3/baseline/mainwindowwizard.ui.4 tests/auto/uic3/baseline/multilineeditor.ui tests/auto/uic3/baseline/multilineeditor.ui.4 tests/auto/uic3/baseline/newform.ui tests/auto/uic3/baseline/newform.ui.4 tests/auto/uic3/baseline/paletteeditor.ui tests/auto/uic3/baseline/paletteeditor.ui.4 tests/auto/uic3/baseline/paletteeditoradvanced.ui tests/auto/uic3/baseline/paletteeditoradvanced.ui.4 tests/auto/uic3/baseline/paletteeditoradvancedbase.ui tests/auto/uic3/baseline/paletteeditoradvancedbase.ui.4 tests/auto/uic3/baseline/pixmapcollectioneditor.ui tests/auto/uic3/baseline/pixmapcollectioneditor.ui.4 tests/auto/uic3/baseline/pixmapfunction.ui tests/auto/uic3/baseline/pixmapfunction.ui.4 tests/auto/uic3/baseline/preferences.ui tests/auto/uic3/baseline/preferences.ui.4 tests/auto/uic3/baseline/previewwidget.ui tests/auto/uic3/baseline/previewwidget.ui.4 tests/auto/uic3/baseline/previewwidgetbase.ui tests/auto/uic3/baseline/previewwidgetbase.ui.4 tests/auto/uic3/baseline/projectsettings.ui tests/auto/uic3/baseline/projectsettings.ui.4 tests/auto/uic3/baseline/replacedialog.ui tests/auto/uic3/baseline/replacedialog.ui.4 tests/auto/uic3/baseline/richtextfontdialog.ui tests/auto/uic3/baseline/richtextfontdialog.ui.4 tests/auto/uic3/baseline/settingsdialog.ui tests/auto/uic3/baseline/settingsdialog.ui.4 tests/auto/uic3/baseline/sqlformwizard.ui tests/auto/uic3/baseline/sqlformwizard.ui.4 tests/auto/uic3/baseline/startdialog.ui tests/auto/uic3/baseline/startdialog.ui.4 tests/auto/uic3/baseline/statistics.ui tests/auto/uic3/baseline/statistics.ui.4 tests/auto/uic3/baseline/tabbedbrowser.ui tests/auto/uic3/baseline/tabbedbrowser.ui.4 tests/auto/uic3/baseline/tableeditor.ui tests/auto/uic3/baseline/tableeditor.ui.4 tests/auto/uic3/baseline/topicchooser.ui tests/auto/uic3/baseline/topicchooser.ui.4 tests/auto/uic3/baseline/variabledialog.ui tests/auto/uic3/baseline/variabledialog.ui.4 tests/auto/uic3/baseline/wizardeditor.ui.4 tests/auto/uiloader/baseline/batchtranslation.ui tests/auto/uiloader/baseline/config.ui tests/auto/uiloader/baseline/finddialog.ui tests/auto/uiloader/baseline/formwindowsettings.ui tests/auto/uiloader/baseline/helpdialog.ui tests/auto/uiloader/baseline/listwidgeteditor.ui tests/auto/uiloader/baseline/mainwindowbase.ui tests/auto/uiloader/baseline/newactiondialog.ui tests/auto/uiloader/baseline/newform.ui tests/auto/uiloader/baseline/orderdialog.ui tests/auto/uiloader/baseline/paletteeditor.ui tests/auto/uiloader/baseline/paletteeditoradvancedbase.ui tests/auto/uiloader/baseline/phrasebookbox.ui tests/auto/uiloader/baseline/plugindialog.ui tests/auto/uiloader/baseline/previewwidget.ui tests/auto/uiloader/baseline/previewwidgetbase.ui tests/auto/uiloader/baseline/qfiledialog.ui tests/auto/uiloader/baseline/qtgradientdialog.ui tests/auto/uiloader/baseline/qtgradienteditor.ui tests/auto/uiloader/baseline/qtgradientviewdialog.ui tests/auto/uiloader/baseline/saveformastemplate.ui tests/auto/uiloader/baseline/statistics.ui tests/auto/uiloader/baseline/stringlisteditor.ui tests/auto/uiloader/baseline/tabbedbrowser.ui tests/auto/uiloader/baseline/tablewidgeteditor.ui tests/auto/uiloader/baseline/translatedialog.ui tests/auto/uiloader/baseline/treewidgeteditor.ui tests/auto/uiloader/baseline/trpreviewtool.ui tools/assistant/compat/mainwindow.cpp tools/assistant/tools/assistant/mainwindow.cpp tools/designer/src/designer/versiondialog.cpp tools/linguist/linguist/mainwindow.cpp tools/linguist/shared/make-qscript.sh tools/qdbus/qdbusviewer/qdbusviewer.cpp
| * doc: Fixed several qdoc errors.Martin Smith2009-09-023-4/+4
| | | | | | | | That's the last of them... for now.
| * Update tech preview license header for files that are new in 4.6.Jason McDonald2009-08-317-91/+91
| | | | | | | | Reviewed-by: Trust Me
| * Merge branch '4.5' into 4.6Thiago Macieira2009-08-3127-364/+364
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: demos/boxes/glshaders.cpp demos/boxes/vector.h demos/embedded/fluidlauncher/pictureflow.cpp demos/embedded/fluidlauncher/pictureflow.h doc/src/desktop-integration.qdoc doc/src/distributingqt.qdoc doc/src/examples-overview.qdoc doc/src/examples.qdoc doc/src/frameworks-technologies/dbus-adaptors.qdoc doc/src/geometry.qdoc doc/src/groups.qdoc doc/src/objecttrees.qdoc doc/src/platform-notes.qdoc doc/src/plugins-howto.qdoc doc/src/qt3support.qdoc doc/src/qtdbus.qdoc doc/src/qtdesigner.qdoc doc/src/qtgui.qdoc doc/src/qtmain.qdoc doc/src/qtopengl.qdoc doc/src/qtsvg.qdoc doc/src/qtuiloader.qdoc doc/src/qundo.qdoc doc/src/richtext.qdoc doc/src/topics.qdoc src/corelib/tools/qdumper.cpp src/gui/embedded/qkbdpc101_qws.cpp src/gui/embedded/qkbdsl5000_qws.cpp src/gui/embedded/qkbdusb_qws.cpp src/gui/embedded/qkbdvr41xx_qws.cpp src/gui/embedded/qkbdyopy_qws.cpp src/gui/embedded/qmousebus_qws.cpp src/gui/embedded/qmousevr41xx_qws.cpp src/gui/embedded/qmouseyopy_qws.cpp src/gui/painting/qpaintengine_d3d.cpp src/gui/painting/qwindowsurface_d3d.cpp src/opengl/gl2paintengineex/glgc_shader_source.h src/opengl/gl2paintengineex/qglpexshadermanager.cpp src/opengl/gl2paintengineex/qglpexshadermanager_p.h src/opengl/gl2paintengineex/qglshader.cpp src/opengl/gl2paintengineex/qglshader_p.h src/opengl/util/fragmentprograms_p.h src/plugins/kbddrivers/linuxis/linuxiskbdhandler.cpp src/plugins/mousedrivers/linuxis/linuxismousehandler.cpp src/script/parser/qscript.g src/script/qscriptarray_p.h src/script/qscriptasm_p.h src/script/qscriptbuffer_p.h src/script/qscriptclass.cpp src/script/qscriptclassdata_p.h src/script/qscriptcompiler.cpp src/script/qscriptcompiler_p.h src/script/qscriptcontext.cpp src/script/qscriptcontext_p.cpp src/script/qscriptcontext_p.h src/script/qscriptcontextfwd_p.h src/script/qscriptecmaarray.cpp src/script/qscriptecmaarray_p.h src/script/qscriptecmaboolean.cpp src/script/qscriptecmacore.cpp src/script/qscriptecmadate.cpp src/script/qscriptecmadate_p.h src/script/qscriptecmaerror.cpp src/script/qscriptecmaerror_p.h src/script/qscriptecmafunction.cpp src/script/qscriptecmafunction_p.h src/script/qscriptecmaglobal.cpp src/script/qscriptecmaglobal_p.h src/script/qscriptecmamath.cpp src/script/qscriptecmamath_p.h src/script/qscriptecmanumber.cpp src/script/qscriptecmanumber_p.h src/script/qscriptecmaobject.cpp src/script/qscriptecmaobject_p.h src/script/qscriptecmaregexp.cpp src/script/qscriptecmaregexp_p.h src/script/qscriptecmastring.cpp src/script/qscriptecmastring_p.h src/script/qscriptengine.cpp src/script/qscriptengine_p.cpp src/script/qscriptengine_p.h src/script/qscriptenginefwd_p.h src/script/qscriptextenumeration.cpp src/script/qscriptextenumeration_p.h src/script/qscriptextqobject.cpp src/script/qscriptextqobject_p.h src/script/qscriptextvariant.cpp src/script/qscriptfunction.cpp src/script/qscriptfunction_p.h src/script/qscriptgc_p.h src/script/qscriptmember_p.h src/script/qscriptobject_p.h src/script/qscriptprettypretty.cpp src/script/qscriptprettypretty_p.h src/script/qscriptvalue.cpp src/script/qscriptvalueimpl.cpp src/script/qscriptvalueimpl_p.h src/script/qscriptvalueimplfwd_p.h src/script/qscriptvalueiteratorimpl.cpp src/script/qscriptxmlgenerator.cpp src/script/qscriptxmlgenerator_p.h tests/auto/linguist/lupdate/testdata/recursivescan/project.ui tests/auto/linguist/lupdate/testdata/recursivescan/sub/finddialog.cpp tests/auto/qkeyevent/tst_qkeyevent.cpp tools/linguist/shared/cpp.cpp
| * Merge branch '4.6'Thiago Macieira2009-08-271-1/+1
| |\ | | | | | | | | | | | | Conflicts: src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp