summaryrefslogtreecommitdiffstats
path: root/demos/browser
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-09-102-2/+2
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: bin/syncqt demos/declarative/snake/content/snake.js demos/declarative/snake/snake.qml doc/src/development/qmake-manual.qdoc src/corelib/plugin/plugin.pri src/gui/kernel/qapplication_win.cpp src/gui/kernel/qdesktopwidget_win.cpp src/gui/painting/qdrawhelper.cpp tests/auto/qdir/tst_qdir.cpp tools/qdoc3/test/assistant.qdocconf tools/qdoc3/test/designer.qdocconf tools/qdoc3/test/linguist.qdocconf
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7David Boddie2010-09-021-1/+1
| |\
| | * QString usage cleanupsOswald Buddenhagen2010-09-011-1/+1
| | | | | | | | | | | | | | | - tr() already returns a QString, duh - use multi-arg arg() (heh)
| * | Doc: Changed the default URL to avoid a Flash plugin crash on x86-64.David Boddie2010-09-021-1/+1
| |/ | | | | | | Reviewed-by: Kevin Wright
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-08-251-2/+2
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | Conflicts: qmake/generators/win32/msbuild_objectmodel.cpp src/declarative/qml/qdeclarativexmlhttprequest.cpp src/opengl/opengl.pro src/opengl/qgl_p.h src/plugins/bearer/connman/qconnmanservice_linux.cpp tests/auto/qpainter/tst_qpainter.cpp tools/assistant/tools/assistant/helpviewer_qwv.h tools/assistant/tools/assistant/openpageswidget.h
| * Use Ctrl rather than Alt for switching tabs in the demo browserTor Arne Vestbø2010-08-201-2/+2
| | | | | | | | | | | | | | Alt+1, Alt+2, etc produce actual symbols on some keyboard layouts, for example Norwegian, which prevents you from typing the @ symbol. Reviewed-by: Alexis Ménard <alexis.menard@nokia.com>
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-08-132-2/+2
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gui/painting/qpainter.cpp src/gui/text/qtextengine.cpp tests/auto/qimage/tst_qimage.cpp tests/auto/qpainter/tst_qpainter.cpp 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-html-templates.qdocconf tools/qdoc3/test/qt-html-templates_zh_CN.qdocconf tools/qdoc3/test/qt.qdocconf
| * Correcting spelling mistakes in documentation. Part of fix for QTBUG-11938.Jerome Pasion2010-08-092-2/+2
| | | | | | | | | | Reviewer: David Boddie Task number: QTBUG-11938
* | Remove the use of deprecated qVariant*Olivier Goffart2010-08-063-5/+5
|/ | | | | | | | | | | | | | | Test directory untouched. This just apply those regexp: git grep -O"sed -i 's/qVariantValue</qvariant_cast</'" qVariantValue git grep -O"sed -i 's/qVariantSetValue(\([^&*\(),]*\), */\\1.setValue(/'" qVariantSetValue git grep -O"sed -i 's/qVariantSetValue *<\([^>]*\)> *(\([^&*\(),]*\), */\\2.setValue<\\1>(/'" qVariantSetValue git grep -O"sed -i 's/qVariantCanConvert *<\([^>]*\)> *(\([^&*\(),]*\))/\\2.canConvert<\\1>()/g'" qVariantCanConvert git grep -O"sed -i 's/qVariantCanConvert *<\([^>]*\)> *(\([^&*\(),]*([^&*\(),]*)\))/\\2.canConvert<\\1>()/g'" qVariantCanConvert git grep -O"sed -i 's/qVariantFromValue\( *[(<]\)/QVariant::fromValue\\1/'" qVariantFromValue git checkout src/corelib/kernal/qvariant* Rev-by: dev mailing list
* Merge remote branch 'origin/4.6' into qt-master-from-4.6Thiago Macieira2010-02-123-6/+13
|\
| * Demo browser: Better handleUnsupportedContent implementationMarkus Goetz2010-02-091-3/+11
| | | | | | | | | | | | | | Do warnings instead of downloads for sub resources. Show error message for main resources. Reviewed-by: Tor Arne
| * demo browser: Fix the way warnings were (not) displayedMarkus Goetz2010-02-092-3/+2
| | | | | | | | Reviewed-by: TrustMe
* | Merge branch '4.6'Thiago Macieira2010-01-1342-42/+42
|\ \ | |/ | | | | | | | | | | | | | | | | | | 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
| * Update copyright year to 2010Jason McDonald2010-01-0642-42/+42
| | | | | | | | Reviewed-by: Trust Me
* | Merge branch '4.6'Thiago Macieira2009-11-2511-181/+139
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | 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
| * Ran the script utils/normalizeOlivier Goffart2009-11-1810-138/+138
| | | | | | | | Over src/ tools/ examples/ and demos/
| * QUrl::fromUserInput: improvements, corrections and make the demoJocelyn Turcotte2009-11-122-43/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | browser use it. - Handle windows files names by looking for paths first (and don't check that it exists first) - Handle host names without dots (it was not handled because of difficulties with the case host:port) - Return the parsed url only if the host or the path is not empty instead of returning a url that looks like "http:" Reviewed-by: Thiago Macieira
* | Remove mingw specific ifdefs after upgrade to mingw-gcc 4.4Thierry Bastian2009-11-171-2/+0
|/
* Removed Symbian exemption from adding QtUiTools to browser demo.Miikka Heikkinen2009-10-151-1/+1
| | | | | | | | The exemption was originally added to make the demo compile when QtUiTools was not yet compiled for Symbian. Task-number: QT-1018 Reviewed-by: Janne Anttila
* Fixing some GCC warningsJoão Abecasis2009-10-071-0/+2
| | | | Reviewed-by: Markus Goetz
* Only build demo-browser 32-bit if Qt was actually built 32-bitTor Arne Vestbø2009-10-061-2/+8
| | | | | | Also, add same trick for PPC Reviewed-by: MortenS
* Build the demo-browser 32-bit on Mac since there's no 64-bit FlashTor Arne Vestbø2009-10-061-0/+4
| | | | Reviewed-by: Simon Hausmann
* Demos and applications have a nice Qt logo when installed on SymbianEspen Riskedal2009-10-021-1/+1
| | | | | | | | | | 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
* Fix spelling error in the demo browser close-multiple-tabs dialogTor Arne Vestbø2009-09-291-1/+1
|
* browser demo: Disable debug logging in release modeTor Arne Vestbø2009-09-251-0/+2
|
* browser: Don't add closed tabs to the closed-tab history in privacy modeTor Arne Vestbø2009-09-251-4/+7
| | | | | Task-number: QTBUG-4508 Reviewed-by: Simon Hausmann
* Demo browser: Enable DNS prefetchingMarkus Goetz2009-09-211-0/+2
| | | | Reviewed-by: TrustMe
* Don't use UI_TOOLS for browser demo on QWSAnders Bakken2009-09-111-1/+1
| | | | | | | | | When cross-compiling and shadow building Makefiles are not generated for designer and libQtUiTools. For this reason designer usually doesn't build for people trying to compile the browser example on QWS due to unresolved externals or weird link errors when the build tries to pick up the system Qt libraries instead. The mechanism to fix this is already in place for S60.
* Update license headers again.Jason McDonald2009-09-0941-164/+164
| | | | Reviewed-by: Trust Me
* Merge branch '4.5' into 4.6Thiago Macieira2009-08-3141-533/+533
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * Update tech preview license header.Jason McDonald2009-08-3141-533/+533
| | | | | | | | Reviewed-by: Trust Me
| * Update URL for Qt Labs.Jason McDonald2009-08-111-1/+1
| | | | | | | | Reviewed-by: Trust Me
| * Update URL of online documentation.Jason McDonald2009-08-111-2/+2
| | | | | | | | Reviewed-by: Trust Me
| * Eliminate some mentions of Trolltech.Jason McDonald2009-08-112-3/+3
| | | | | | | | Reviewed-by: Trust Me
| * Qt's domain name is now qt.nokia.com.Jason McDonald2009-08-113-3/+3
| | | | | | | | Reviewed-by: Trust Me
| * Update license headers.Jason McDonald2009-08-1141-41/+41
| | | | | | | | Reviewed-by: Trust Me
* | Demo browser: Less verbose statistics in console outputMarkus Goetz2009-08-271-1/+4
| | | | | | | | Reviewed-by: TrustMe
* | Rename demobase.pri to symbianpkgrules.priEspen Riskedal2009-08-211-3/+4
| | | | | | | | | | | | | | | | | | demobase.pri sounded to generic, also I changed it to error on !symbian platforms, and test all the places we include it. That makes it more obvious when reading the .pro files that this is actually Symbian spesific stuff, not cross-platform Qt rules. Reviewed-by: axis
* | Merge commit 'qt/master'Jason Barron2009-08-202-1/+43
|\ \ | | | | | | | | | | | | | | | | | | | | | Conflicts: examples/painting/svgviewer/files/bubbles.svg src/corelib/kernel/qobject.cpp src/network/kernel/qhostinfo.cpp tests/auto/qhostinfo/tst_qhostinfo.cpp
| * | QNAM HTTP: New attribute, Demo browser: Some request statistic outputMarkus Goetz2009-08-202-8/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | New output that tells if a QNetworkReply was retrieved by using HTTP pipelining. The demo browser now shows some (debug) output about usage of cache, pipelining and SSL. Reviewed-by: Prasanth
| * | QNAM HTTP PipeliningMarkus Goetz2009-08-201-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | HTTP Pipelining should improve the performance of HTTP requests for high latency network links. Since some servers/proxies could have problems with it, it is disabled by default. Set the HttpPipeliningAllowed attribute of a QNetworkRequest to enable it for that request. Reviewed-by: Thiago
* | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtaxis2009-08-192-74/+36
|\ \ \ | |/ / | | | | | | | | | Conflicts: tests/auto/auto.pro
| * | Made the browser demo use the new QXmlStreamReader functionsThorbjørn Lindeijer2009-08-182-74/+36
| | | | | | | | | | | | Same as in the bookmarks example.
* | | Merge commit 'qt/master'Jason Barron2009-08-181-0/+3
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/src/examples.qdoc doc/src/plugins-howto.qdoc doc/src/topics.qdoc examples/phonon/musicplayer/mainwindow.cpp src/3rdparty/freetype/src/base/ftobjs.c src/corelib/global/qglobal.h src/corelib/tools/qalgorithms.h src/corelib/tools/qshareddata.cpp src/corelib/tools/qsharedpointer.cpp src/corelib/tools/tools.pri src/corelib/xml/qxmlstream.h src/gui/painting/painting.pri src/gui/widgets/qdatetimeedit.cpp tests/auto/qdesktopservices/qdesktopservices.pro tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp tests/auto/qtextcodec/test/test.pro
| * | Add qtbynokia Twitter account into demo browser bookmarksMarkus Goetz2009-08-171-0/+3
| | | | | | | | | | | | Reviewed-by: TrustMe
* | | Merge commit 'qt/master'Jason Barron2009-08-1343-50/+50
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: examples/opengl/samplebuffers/glwidget.cpp src/corelib/io/qfsfileengine_unix.cpp src/corelib/kernel/qobject.cpp src/corelib/tools/qsharedpointer.cpp src/gui/gui.pro tests/auto/qhttp/tst_qhttp.cpp tests/auto/qkeyevent/tst_qkeyevent.cpp
| * | Replace some mentions of Trolltech with more appropriate terms.Jason McDonald2009-08-122-3/+3
| | | | | | | | | | | | Reviewed-by: Trust Me
| * | Update obsolete URL's in code and docs.Jason McDonald2009-08-121-1/+1
| | | | | | | | | | | | Reviewed-by: Trust Me
| * | Update references to online documentation.Jason McDonald2009-08-121-2/+2
| | | | | | | | | | | | Reviewed-by: Trust Me
| * | Update URL's to use new domain.Jason McDonald2009-08-123-3/+3
| | | | | | | | | | | | Reviewed-by: Trust Me
generated by cgit v0.12 at 2024-12-02 12:31:40 (GMT)