| Commit message (Collapse) | Author | Age | Files | Lines |
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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
|
| |
| |
| |
| | |
Reviewed-by: Trust Me
|
| |
| |
| |
| | |
Reviewed-by: mauricek
|
| |
| |
| |
| | |
Reviewed-by: Trust Me
|
| |
| |
| |
| |
| |
| | |
Renaming done based feedback.
Reviewed-by: TrustMe
|
| |
| |
| |
| | |
That's the last of them... for now.
|
| |
| |
| |
| |
| | |
Task-number: 235550
Reviewed-by: Olivier Goffart
|
| |
| |
| |
| |
| | |
Task-number: 257292
Reviewed-by: Trust Me
|
| |
| |
| |
| | |
Reviewed-by: trustme
|
|\ \ |
|
| | |
| | |
| | |
| | | |
Reviewed-by: Trust Me
|
|\ \ \
| |/ / |
|
| | |
| | |
| | |
| | | |
Reviewed-by: Trust Me
|
| |\ \
| | |/
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
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
|
| | |
| | |
| | |
| | | |
Reviewed-by: Trust Me
|
| |\ \
| | |/
| | |
| | |
| | | |
Conflicts:
tests/auto/xmlpatternsxqts/lib/tests/XMLWriterTest.cpp
|
| | |
| | |
| | |
| | | |
Reviewed-by: Trust Me
|
| |\ \ |
|
| | | |
| | | |
| | | |
| | | | |
Reviewed-by: Miikka Heikkinen
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Opacity masks enable you to make portions of an element transparent.
More information about opacity masks here:
http://msdn.microsoft.com/en-us/library/ms743320.aspx
Reviewed-by: Samuel
|
|/ / /
| | |
| | |
| | |
| | | |
Task-number: 158631
Reviewed-by: Andreas Aardal Hanssen
|
| | |
| | |
| | |
| | |
| | | |
Task-number: 234150
Reviewed-by: Trust Me
|
|\ \ \ |
|
| | | | |
|
| | | | |
|
|\ \ \ \
| |/ / /
|/| / /
| |/ / |
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
The included fixes / cleanups:
- QtLibs PKG filename changed
- Component name in Qt libs pkg changed to "Qt for S60"
* Done in order to make SISX upgrade possible after pre-release.
- Removed passing of 'fixedTarget' member variable as an argument
- Removed whitespaces from generated file names
- Fixed 'make sisx' calling syntax when custom makefile name used
- Fixed MAKEFILE variable content in generated makefiles
- Changed names of environment variables used by 'make sisx'
* Nee variables have 'QT_SISX_' prefix
Reviewed-By: Miikka Heikkinen
|
|\ \ \
| | |/
| |/|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Conflicts:
config.tests/unix/opengles2/opengles2.cpp
tests/auto/linguist/lupdate/testdata/recursivescan/bar.ts.result
tests/auto/linguist/lupdate/testdata/recursivescan/foo.ts.result
tests/auto/linguist/lupdate/testdata/recursivescan/project.ui
tests/auto/linguist/lupdate/testdata/recursivescan/sub/finddialog.cpp
tests/auto/windowsmobile/test/ddhelper.cpp
tests/auto/windowsmobile/testQMenuBar/main.cpp
tests/auto/xmlpatternsxqts/lib/ASTItem.cpp
tests/auto/xmlpatternsxqts/lib/DebugExpressionFactory.cpp
tests/auto/xmlpatternsxqts/lib/ErrorHandler.cpp
tests/auto/xmlpatternsxqts/lib/ErrorItem.cpp
tests/auto/xmlpatternsxqts/lib/ExpressionInfo.cpp
tests/auto/xmlpatternsxqts/lib/ExpressionNamer.cpp
tests/auto/xmlpatternsxqts/lib/ExternalSourceLoader.cpp
tests/auto/xmlpatternsxqts/lib/Global.cpp
tests/auto/xmlpatternsxqts/lib/ResultThreader.cpp
tests/auto/xmlpatternsxqts/lib/TestBaseLine.cpp
tests/auto/xmlpatternsxqts/lib/TestCase.cpp
tests/auto/xmlpatternsxqts/lib/TestContainer.cpp
tests/auto/xmlpatternsxqts/lib/TestGroup.cpp
tests/auto/xmlpatternsxqts/lib/TestResult.cpp
tests/auto/xmlpatternsxqts/lib/TestResultHandler.cpp
tests/auto/xmlpatternsxqts/lib/TestSuite.cpp
tests/auto/xmlpatternsxqts/lib/TestSuiteHandler.cpp
tests/auto/xmlpatternsxqts/lib/TestSuiteResult.cpp
tests/auto/xmlpatternsxqts/lib/TreeItem.cpp
tests/auto/xmlpatternsxqts/lib/TreeModel.cpp
tests/auto/xmlpatternsxqts/lib/Worker.cpp
tests/auto/xmlpatternsxqts/lib/XMLWriter.cpp
tests/auto/xmlpatternsxqts/lib/XQTSTestCase.cpp
tests/auto/xmlpatternsxqts/lib/XSLTTestSuiteHandler.cpp
tests/benchmarks/qgraphicswidget/tst_qgraphicswidget.cpp
tools/linguist/tests/data/main.cpp
tools/linguist/tests/tst_linguist.cpp
tools/linguist/tests/tst_lupdate.cpp
tools/linguist/tests/tst_simtexth.cpp
util/qlalr/examples/dummy-xml/ll/dummy-xml-ll.cpp
util/qlalr/examples/lambda/main.cpp
util/qlalr/examples/qparser/qparser.cpp
|
| | |
| | |
| | |
| | | |
Reviewed-by: Trust Me
|
| | | |
|
|\ \ \ |
|
| | | |
| | | |
| | | |
| | | | |
RevBy: Trust me
|
| | | | |
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
RevBy: David Boddie
David's fixes are in the next two commits.
|
| | | | |
|
|\ \ \ \
| | | | |
| | | | |
| | | | |
| | | | | |
Conflicts:
src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
|
| |\ \ \ \ |
|
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Reviewed-by: Trust Me
|
| | | | | | |
|
| |/ / / /
| | | | |
| | | | |
| | | | | |
Reviewed-by: Trust Me
|
| |\ \ \ \ |
|
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Since the GL 2 engine can't set/unset every single GL state that
a user might possibly change, we have to make a rule that if something
is changed from its default state, it needs to be reset before
the GL 2 engine can draw correctly.
Reviewed-by: Samuel
|
| |/ / / /
| | | | |
| | | | |
| | | | |
| | | | | |
Task-number: 201882
Reviewed-by: Trust Me
|
| |/ / /
| | | |
| | | |
| | | |
| | | | |
Task-number: 253749
Reviewed-by: Trust Me
|
|\ \ \ \
| |/ / / |
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
This introduces a QAbstractVideoSurface interface for implementing arbitrary
video outputs, and a QVideoFrame type. Also included is the
QVideoSurfaceFormat class which is used to configure the input to a video
surface, and the QAbstractVideoBuffer class which allows QVideoFrames
to be constructed from non-native frame types.
Reviewed-by: Dmytro Poplavskiy
|
| |\ \ \ |
|
| | |\ \ \
| | | |/ /
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Conflicts:
bin/syncqt
configure
demos/boxes/glshaders.cpp
demos/boxes/vector.h
demos/embedded/fluidlauncher/pictureflow.cpp
demos/embedded/fluidlauncher/pictureflow.h
dist/README
dist/changes-3.0.0
dist/changes-3.0.0-beta1
dist/changes-4.3.0
doc/src/desktop-integration.qdoc
doc/src/development/designer-manual.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/index.qdoc
doc/src/objecttrees.qdoc
doc/src/platform-notes.qdoc
doc/src/plugins-howto.qdoc
doc/src/porting/porting4.qdoc
doc/src/porting4-obsoletedmechanism.qdocinc
doc/src/qt-webpages.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/snippets/code/src_corelib_tools_qregexp.cpp
doc/src/snippets/code/src_qt3support_network_q3ftp.cpp
doc/src/snippets/qstring/main.cpp
doc/src/snippets/textdocument-blocks/xmlwriter.cpp
doc/src/snippets/textdocument-frames/xmlwriter.cpp
doc/src/snippets/textdocument-tables/xmlwriter.cpp
doc/src/tech-preview/known-issues.html
doc/src/topics.qdoc
doc/src/xml-processing/xml-processing.qdoc
examples/xml/saxbookmarks/jennifer.xbel
src/3rdparty/phonon/ds9/mediaobject.cpp
src/3rdparty/phonon/ds9/mediaobject.h
src/corelib/io/qurl.cpp
src/corelib/tools/qdumper.cpp
src/corelib/xml/qxmlstream.h
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/image/qpixmapcache.cpp
src/gui/kernel/qmotifdnd_x11.cpp
src/gui/painting/qpaintengine_d3d.cpp
src/gui/painting/qpaintengine_raster.cpp
src/gui/painting/qwindowsurface_d3d.cpp
src/gui/styles/qmacstyle_mac.mm
src/gui/text/qtextformat.cpp
src/gui/text/qtextobject_p.h
src/network/access/qhttp.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/plugins/codecs/kr/qeuckrcodec.cpp
src/plugins/kbddrivers/linuxis/linuxiskbdhandler.cpp
src/plugins/mousedrivers/linuxis/linuxismousehandler.cpp
src/qt3support/network/q3http.cpp
src/script/qscriptarray_p.h
src/script/qscriptasm_p.h
src/script/qscriptbuffer_p.h
src/script/qscriptclass.cpp
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
src/sql/drivers/sqlite/qsql_sqlite.cpp
src/svg/qsvghandler.cpp
src/svg/qsvgstyle.cpp
src/xmlpatterns/expr/qcastingplatform_p.h
src/xmlpatterns/iterators/qcachingiterator_p.h
src/xmlpatterns/parser/qquerytransformparser_p.h
tests/auto/q3uridrag/tst_q3uridrag.cpp
tests/auto/qcombobox/tst_qcombobox.cpp
tests/auto/qgraphicswidget/tst_qgraphicswidget.cpp
tests/auto/qkeyevent/tst_qkeyevent.cpp
tests/auto/qmainwindow/tst_qmainwindow.cpp
tests/auto/qnetworkcookiejar/tst_qnetworkcookiejar.cpp
tests/auto/qsqltablemodel/tst_qsqltablemodel.cpp
tests/auto/qsslsocket/tst_qsslsocket.cpp
tests/auto/qurl/tst_qurl.cpp
tests/auto/qvariant/tst_qvariant.cpp
tests/auto/qwidget/tst_qwidget.cpp
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/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/qactivexselect.ui
tests/auto/uic3/baseline/qactivexselect.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
tests/auto/windowsmobile/test/test.pro
tests/auto/xmlpatternsdiagnosticsts/test/tst_xmlpatternsdiagnosticsts.cpp
tools/doxygen/config/header.html
tools/doxygen/config/phonon.doxyfile
tools/installer/nsis/opensource.ini
tools/linguist/phrasebooks/polish.qph
tools/linguist/shared/cpp.cpp
tools/linguist/shared/ts.dtd
tools/qdoc3/test/assistant.qdocconf
tools/qdoc3/test/designer.qdocconf
tools/qdoc3/test/linguist.qdocconf
tools/qdoc3/test/qmake.qdocconf
tools/qdoc3/test/qt-build-docs.qdocconf
tools/qdoc3/test/qt-inc.qdocconf
tools/qdoc3/test/qt.qdocconf
tools/qvfb/qtopiakeysym.h
tools/qvfb/qvfbx11view.cpp
tools/qvfb/qvfbx11view.h
tools/qvfb/x11keyfaker.cpp
tools/xmlpatterns/main.cpp
tools/xmlpatterns/main.h
tools/xmlpatterns/qcoloringmessagehandler_p.h
tools/xmlpatterns/qcoloroutput.cpp
tools/xmlpatterns/qcoloroutput_p.h
translations/assistant_de.ts
translations/qt_ar.ts
translations/qt_da.ts
translations/qt_de.ts
translations/qt_fr.ts
translations/qt_ja_JP.ts
translations/qt_ru.ts
translations/qt_uk.ts
translations/qt_zh_CN.ts
util/qlalr/compress.cpp
util/qlalr/cppgenerator.cpp
util/qlalr/dotgraph.cpp
util/qlalr/grammar.cpp
util/qlalr/lalr.cpp
util/qlalr/main.cpp
util/qlalr/parsetable.cpp
util/qlalr/recognizer.cpp
|
| | | | |
| | | | |
| | | | |
| | | | | |
Reviewed-by: Trust Me
|
| | | | |
| | | | |
| | | | |
| | | | | |
Reviewed-by: Trust Me
|