| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
|
| |
Somehow, the latin-1 multiply symbol was used instead of an 'x' in
hex literals.
Task-number: QTBUG-15716
Reviewed-by: mread
|
| |
|
| |
|
| |
|
| |
|
| |
|
| |
|
|
|
|
| |
Reviewed-by: David Boddie
|
| |
|
|
|
|
| |
Added images, new doc build configurations, and example code.
|
|
|
|
| |
Task-number: QTBUG-15716
|
|
|
|
| |
Reviewed-by: Trust Me
|
| |
|
| |
|
| |
|
|
|
|
|
|
|
| |
Originally written by Jervey Kong.
Task-number: QTBUG-14154
Reviewed-by: David Boddie
|
|
|
|
|
| |
Reviewed-by: Trust Me
Requested-by: Legal
|
|\
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
examples/assistant/simpletextviewer/findfiledialog.cpp
qmake/generators/symbian/symmake.cpp
tools/assistant/lib/qhelpgenerator.cpp
tools/assistant/lib/qhelpsearchquerywidget.cpp
translations/translations.pri
|
| |
| |
| |
| | |
`QT += network' is required to find the network headers.
|
|\ \
| |/
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
bin/syncqt
doc/src/deployment/deployment.qdoc
src/corelib/io/qfsfileengine_win.cpp
src/corelib/xml/qxmlstream.cpp
src/opengl/gl2paintengineex/qpaintengineex_opengl2_p.h
tools/assistant/tools/assistant/centralwidget.cpp
tools/linguist/lupdate/main.cpp
|
| |
| |
| |
| |
| |
| | |
Now that it's there, we might as well use it!
Reviewed-by: Benjamin Poulain
|
| |
| |
| |
| |
| |
| | |
Merge-request: 2235
Reviewed-by: Thiago Macieira <thiago.macieira@nokia.com>
Reviewed-by: Simon Hausmann
|
| |\
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
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
|
|\ \ \
| |/ / |
|
| |/
| |
| |
| | |
Reviewed-by: TrustMe
|
|\ \
| |/
| |
| |
| |
| |
| | |
Conflicts:
examples/webkit/fancybrowser/main.cpp
src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
tools/assistant/tools/assistant/bookmarkmanager.cpp
|
| | |
|
| |
| |
| |
| |
| | |
Merge-request: 391
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
|
|\ \
| |/
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
doc/src/modules.qdoc
examples/assistant/simpletextviewer/findfiledialog.cpp
examples/webkit/fancybrowser/mainwindow.cpp
src/gui/widgets/qtabbar.cpp
src/gui/widgets/qtabbar_p.h
tests/auto/qpixmap/tst_qpixmap.cpp
tools/assistant/compat/helpdialog.cpp
tools/assistant/compat/tabbedbrowser.cpp
translations/translations.pri
|
| |
| |
| |
| |
| |
| |
| | |
Forward declarations outside namespace scope will
fail in this case.
Reviewed-by: brad
|
| |\ |
|
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
The name of the other examples are lowercase. The XML file of Qt Demo
reference a lowercase name.
Reviewed-by: Olivier Goffart
|
| | |
| | |
| | |
| | |
| | | |
Merge-request: 2142
Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
|
| |/
| |
| |
| |
| | |
Merge-request: 2142
Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
|
| |\ |
|
| | |
| | |
| | |
| | |
| | |
| | | |
See QTBUG-5532.
Reviewed-by: Jedrzej Nowacki
|
| |/
| |
| |
| | |
Over src/ tools/ examples/ and demos/
|
| |
| |
| |
| |
| |
| |
| | |
Include QtNetwork as module to work around abld issue of local includes
not working.
Reviewed-by: axis
|
|\ \
| |/ |
|
| |
| |
| |
| | |
Reviewed-by: Trust Me
|
| |
| |
| |
| | |
Reviewed-by: Trust Me
|
|\ \
| |/
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
src/gui/styles/qcommonstyle.cpp
tools/assistant/lib/lib.pro
tools/assistant/lib/qhelp_global.cpp
tools/assistant/tools/assistant/assistant.qch
tools/assistant/tools/assistant/mainwindow.cpp
|
| |
| |
| |
| |
| |
| |
| | |
This is actually only a workaround of what seems to be a QtWebKit bug.
See QTBUG-4649.
Reviewed-by: Jedrzej Nowacki
|
|/
|
|
|
|
|
|
|
| |
This example app is useful for debugging QtWebKit problems, it
was just missing a way to load the url from the command-line (to
avoid loading google first), and a "view page source" action.
Reviewed-By: Markus Goetz
Merge-Request: 2021
|
|
|
|
|
|
| |
Change ffeb6900 renamed a function but didn't rename all the calls.
Reviewed-by: Trust Me
|
|
|
|
|
|
|
|
|
|
| |
Added a line to the symbianpkgrules.pri files which includes an ICON
if the TARGET.UID3 is defined. We should fix the application_icon.prf to
handle ICON without UID3 situations more gracefully, but for now I
reordered existing UID3s to be specified before the symbianpkgrules.pri
includes.
Reviewed-by: Aleksandar Babic
|
|
|
|
| |
Reviewed-by: Simon Hausmann
|
|
|
|
|
|
|
| |
This reverts commit 59623e45ee31892c9ef210f8d7e396ccb0fe31a5.
A fix for the same problem had been pushed by Simon shortly before
that one.
|
|
|
|
|
|
|
| |
bail out if SSL is not supported; before it only showed "service
unavailable", which was somewhat confusing.
Reviewed-by: Tor Arne Vestbø
|