| Commit message (Collapse) | Author | Age | Files | Lines |
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (35 commits)
Doc: Added a config file for creating Simplified Chinese docs directly.
Doc: add a few lines about bearer managment to "What's New" page.
Fix the SIMD implementations of QString::toLatin1()
Update of the QScriptValue autotest suite.
New data set for QScriptValue autotest generator.
Autotest: make tst_qchar run out-of-source too
Autotest: add a test for roundtrips through toLatin1/fromLatin1
Implement toLatin1_helper with Neon
QRegExp::pos() should return -1 for empty/non-matching captures
Revert "qdoc: Finished "Inherited by" list for QML elements."
Revert "qdoc: List new QML elements in \sincelist for What's New page."
Add the Unicode normalisation properties.
Autotest: add a test for QDBusPendingCallWatcher use in threads
Doc: placeholders for new feature highlights.
doc: mark as reimplemented.
Update of the QScriptValue autotest suite.
New autotests cases for QScriptValue autotests generator.
QScriptValue autotest generator templates change.
Fix license template.
QScriptValue::isQMetaObject crash fix.
...
|
| |
| |
| |
| |
| |
| | |
Source: http://unicode.org/Public/5.0.0/ucd/DerivedNormalizationProps.txt
Reviewed-by: Trust Me
|
|/
|
|
| |
Reviewed-by: TrustMe
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Pixel metric values for PM_FocusFrameVMargin and PM_FocusFrameHMargin
were based on AVKON grid layout. Apparently, AVKON has a major
difference for text margin in lists and grids. List values are almost
double of what is used in the grids.
Original values were poor fit for list usability, it made the text items
very close to each anothre.
Task-number: QTBUG-7258
Reviewed-by: Alessandro Portale
|
|
|
|
| |
Reviewed-by: Trust Me
|
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (49 commits)
Reverted two commits that were pushed to the wrong branch.
Use the new QTextCodec api in the QXmlStreamWriter.
Added new functions to QTextCodec that accept ConversionFlags.
Fix passing of arguments to syncqt
doc: Fixed typos.
Fixes: Fix spinbox with NoButton style in QGtkStyle
doc: Explained parameter value defaults where appropriate.
Cocoa: Fix painting errors on QGLWidget resizing.
Fix broken QGLWidget::renderPixmap on Mac/Carbon
Fixes: Setting any style sheet breaks checkbox positioning
Fixes: MenuItem size fixes and missing separator with Gtk+
Autotest: add a test for QNAM's HTTP cache handling code
QNAM HTTP: just use the expirationDate in the code that validates the cache
QNAM HTTP: change the caching semantics to match documentation
QNAM HTTP: fix the caching algorithm from RFC 2616
Avoid repeatedly calling LookupAccountSid in QFSFileEngine::owner
improve readability a bit more
fix styling; improve readability
make it possible to retrieve name of the user who owns the file
Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( 99ccc1c3e4db5354246720f9b9aa3d282e64497d )
...
|
| |
| |
| |
| | |
Reviewed-by: Trust Me
|
|/
|
|
|
|
| |
Otherwise we don't see any console output on Windows.
Reviewed-by: Roberto Raggi
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Currently QS60Style stores pixel metrics values (96 of them for each
layout) in a static lookup table. There is one "line" for each
screensize, orientation and layout direction (ten in total).
This fix removes the layout direction specific "lines" as there are
only two pixel metrics values that differ depending on direction.
We can handle those two inside QS60Style::pixelMetrics() and
thus remove half of the rows, and thus gain 16*96*5 ~ 8kB of RAM.
Task-number: QTBUG-6803
Reviewed-by: Alessandro Portale
|
|
|
|
|
|
|
|
|
| |
Compiling s60pixelMetrics utility for ARMV5 urel gives two warnings:
a) unused variable - Solution: removed
b) transfer of control bypasses initialization (missing brackets within
a switch-case) - Solution: brackets added.
Reviewed-by: TrustMe
|
|
|
|
|
|
|
|
|
|
|
|
| |
some changes were made to qxmlstream_p.h and script files directly;
however, those files are generated automatically by
src/corelib/xml/make-parser.sh and src/script/parser/make-parser.sh,
respectively, so the generator would overwrite the manual changes to the
files the next time it is run. This patch integrates those changes into
the generator rather than into the files directly.
Reviewed-by: Roberto Raggi
Reviewed-by: Olivier Goffart
|
|
|
|
|
|
|
| |
- Use newest qtwebkit tag
- Keep BitmapInfo.h and BitmalInfo.cpp in src/3rdparty
Reviewed-by: TrustMe
|
|\ |
|
| |
| |
| |
| |
| |
| |
| |
| | |
Updated pixel metrics values from latest S60 layouts. Also, updated
pixel metrics harvester to collect pixel metric for QSplitter.
Task-number: QT-686
Reviewed-by: Shane Kearns
|
|/
|
|
| |
Reviewed-by: Trust Me
|
|
|
|
| |
Not-reviewed: No-big-deal
|
|
|
|
|
|
|
|
| |
Add precision modifiers to variable declarations in glsl for GL ES 2.0
compatibility. Precision modifiers are optional, so GL 2.0 languages
will continue to parse unchanged.
rweather
|
|
|
|
|
|
| |
Removed the word "troll" from the implementation to match the header.
Make qlalr compile.
|
|
|
|
| |
Rubber-stamped by: Simon Hausmann
|
| |
|
|
|
|
| |
Reviewed-by: Simon Hausmann
|
|
|
|
| |
Reviewed-by: Trust me
|
|
|
|
| |
Reviewed-by: Simon Hausmann
|
|
|
|
|
|
| |
Updated file lists.
Reviewed-by: Trust me
|
|
|
|
|
|
| |
Based on mkdist-webkit
Reviewed-by: Kent Hansen
|
|
|
|
| |
Reviewed-by: Trond
|
|
|
|
| |
Reviewed-by: Trust me
|
|
|
|
| |
Reviewed-by: Simon Hausmann
|
|
|
|
| |
Reviewed-by: Simon Hausmann
|
|
|
|
| |
Reviewed-by: Paul
|
|
|
|
| |
Reviewed-by: Trust Me
|
|
|
|
| |
Reviewed-by: Trust Me
|
|\ |
|
| |
| |
| |
| | |
Reviewed-by: Trust Me
|
| |
| |
| |
| | |
Reviewed-by: Trust Me
|
| |
| |
| |
| | |
Reviewed-by: Trust Me
|
| |
| |
| |
| |
| |
| | |
Missing from e3c62dc1def9270761ca63c73ae76fdca9d61582 is the actual
change to the (generated) scanner, namely to skip lowercase conversion
for each and every character.
|
|\ \
| |/
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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: Trust Me
|
| |
| |
| |
| | |
Reviewed-by: Trust Me
|
| |
| |
| |
| | |
Reviewed-by: Trust Me
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Instead of taking the lowercase of each tokenized character, it is
better to encode the logic in the automaton itself.
During the parsing of tiger.svg (tests/benchmarks/qsvgrenderer), the
time spent inside QCssScanner_Generated::lex() goes down from
0.53 millions instructions to just 0.23 millions (2x faster).
Autotests for qcssparser, qtextdocumentfragment, qstylesheet still pass.
Reviewed-by: Simon Hausmann
|
| |
| |
| |
| | |
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:
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
|
| |
| |
| |
| | |
Reviewed-by: Trust Me
|