summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* modelviews/visualitemmodel example changesartoka2011-11-178-550/+6
| | | | | | | | | Modified the example to use centralized qmlapplicationviewer, removed duplicate files and modified project files according to the changes. Merge-request: 2719 Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
* Modelviews Examples Modificationsartoka2011-11-1792-2625/+43
| | | | | | | | | | | | modelviews/webview/ alerts, autosize, googlemaps, inlinehtml and newwindows example modifications Modified examples to use centralized qmlapplicationviewer, removed duplicate files and modified project files according to the changes. Merge-request: 2719 Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
* modelviews/stringlistmodel example modificationsartoka2011-11-173-19/+43
| | | | | | | | | Modified the example to use centralized qmlapplicationviewer, removed duplicate files and modified project files according to the changes. Merge-request: 2719 Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
* modelviews/pathview example modificationsartoka2011-11-1714-436/+6
| | | | | | | | | Modified the example to use centralized qmlapplicationviewer, removed duplicate files and modified project files according to the changes. Merge-request: 2719 Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
* modelviews/parallax example modificationsartoka2011-11-1717-8/+214
| | | | | | | | | Modified the example to use centralized qmlapplicationviewer, removed duplicate files and modified project files according to the changes Merge-request: 2719 Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
* modelviews/package example modificationsartoka2011-11-1710-3/+209
| | | | | | | | | Modified the example to use centralized qmlapplicationviewer, removed duplicate files and modified project files according to the changes Merge-request: 2719 Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
* modelview/objectlistmodel example modificationsartoka2011-11-174-26/+44
| | | | | | | | Modified example to use centralized qmlapplicationviewer, removed duplicate files and modified project files according to the changes. Merge-request: 2719 Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
* Modelview examples modifications.artoka2011-11-17151-3309/+43
| | | | | | | | | | | | modelviews\listview dynamiclist, expandingdelegates, highlight, hightlightranges and sections example modifications Modified the examples to use centralized qmlapplicationviewer, removed duplicate files and modified project files according to the changes. Merge-request: 2719 Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
* modelviews/gridview-example example modificationsartoka2011-11-1714-436/+6
| | | | | | | | | Modified the example to use centralized qmlapplicationviewer, deleted duplicate files and modified the project files according to the changes. Merge-request: 2719 Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
* modelviews/delegate example modificationsartoka2011-11-178-437/+7
| | | | | | | | | Modified the project to use centralized qmlapplicationviewer, deleted duplicate files and modified project files according to the changes. Merge-request: 2719 Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
* modelviews/abstractitemmodel example modificationsartoka2011-11-173-10/+41
| | | | | | | | | Modified the project to use centralized qmlapplicationviewer, deleted duplicate files and modified the project files according to the changes. Merge-request: 2719 Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
* keyintegration example modificationsartoka2011-11-1718-909/+8
| | | | | | | | | Modified the example to use centralized qmlapplicationviewer, removed duplicate files and modified project files according to the changes. Merge-request: 2719 Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
* imageelements/borderimage, image and shadows example modificationsartoka2011-11-1745-1739/+18
| | | | | | | | | Modified the examples to use centralized qmlapplicationviewer, removed duplicate files and modified the project files according to the changes. Merge-request: 2719 Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
* i18n example modificationsartoka2011-11-178-514/+6
| | | | | | | | | Modified the project to use centralized qmlapplicationviewer, removed duplicate files and modified project files according to the changes. Merge-request: 2719 Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
* cppextensions/qgraphicslayouts examples modificationsartoka2011-11-178-29/+120
| | | | | | | | Modified projects to use centralized qmlapplicationviewer, removed duplicated files and modified project files according to the changes. Merge-request: 2719 Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
* cppextensions/networkaccessmanagerfactory modificationsartoka2011-11-175-24/+52
| | | | | | | | | Modified the example to use centralized qmlapplicationviewer, removed duplicated files and modified project files according to the changes. Merge-request: 2719 Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
* animations/states example modificationsartoka2011-11-1711-667/+6
| | | | | | | | | Modified the project to use centralized qmlapplicationviewer, removed duplicate files and modified project files according to the changes. Merge-request: 2719 Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
* animation/easing example modificationsartoka2011-11-1710-488/+6
| | | | | | | | | Modified the project to use centralized qmlapplicationviewer, removed duplicated files and modified project files according to the changes. Merge-request: 2719 Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
* behaviors/behavior-example modificationsartoka2011-11-1713-740/+6
| | | | | | | | | Modified the example to use centralized qmlapplicationviewer, removed duplicated files and modified project files according to the changes. Merge-request: 2719 Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
* Basics example cleanupartoka2011-11-173-231/+0
| | | | | | | Removed duplicated files from basics examples Merge-request: 2719 Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
* basics/property-animation modificationsartoka2011-11-1713-546/+6
| | | | | | | | | Modified the example to use centralized qmlapplicationviewer, removed duplicated files and modified project files according to the changes. Merge-request: 2719 Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
* Basics/color-animation modificationsartoka2011-11-1713-541/+8
| | | | | | | | Example was modified to use centralized qmlapplicationviewer, duplicate files were removed, and project files updated. Merge-request: 2719 Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
* Centralized qmlapplicationviewer for declarative examples and demosartoka2011-11-173-0/+421
| | | | | | | | | These centralized qmlapplicationviewer files are used from declarative examples and demos. Centralization decreases duplicate files and eases maintaining. Merge-request: 2719 Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
* Merge remote-tracking branch 'mainline/4.8'Casper van Donderen2011-11-17168-49263/+24199
|\
| * Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into ↵Qt Continuous Integration System2011-11-171-2/+29
| |\ | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging: QNAM: make systemProxyForQuery respect http_proxy
| | * QNAM: make systemProxyForQuery respect http_proxyArvid Ephraim Picciani2011-11-171-2/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | the generic systemProxyForQuery will use http_proxy from the environment, if it is set. Change-Id: Ie685c47eb6df1fdd2ab223defc7172bb25e6fe30 Reviewed-by: Thiago Macieira (Intel) <thiago.macieira@intel.com> (cherry picked from commit b22d290a37903f2c5ecfe58e8183cd293ead99dc)
| * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2011-11-168-16/+275
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Rebuild configure.exe with support for MinGW 4.6 Windows: Add gcc 4.6.
| | * \ Merge remote-tracking branch 'mainline/4.8'Oswald Buddenhagen2011-11-16124-50916/+23481
| | |\ \ | | |/ / | |/| |
| * | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into ↵Qt Continuous Integration System2011-11-166-4/+23
| |\ \ \ | | | |/ | | |/| | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging: Add the ability to do unsafe SSL renegotiation as a fallback.
| | * | Add the ability to do unsafe SSL renegotiation as a fallback.Richard Moore2011-11-156-4/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit adds the ability to perform legacy SSL renegotiation as a fallback via QSsl::SslOptions. This is something that used to work, but has been disabled by default in newer versions of openssl. The need for this has been reported by users (eg. in QTBUG-14983). Change-Id: I5b80f3ffd07e0c5faddc469f6a8f857bac5740f7 Reviewed-by: Corentin Chary <corentin.chary@gmail.com> Reviewed-by: Peter Hartmann <peter.hartmann@nokia.com> (cherry picked from commit 75b2a4960b753766ea2eec4dbd34c67733ca8089)
| * | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2011-11-1524-160/+187
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (24 commits) Amend qfiledialog INTEGRITY patch Update to latest INTEGRITY Framebuffer API. Remove support for tilde expansion as there is no home on INTEGRITY. Remove docs and translations generation for INTEGRITY. Add XPLATFORM_INTEGRITY to define defaults for INTEGRITY. Remove QT 3 API support by default for INTEGRITY. Disable some tests because INTEGRITY doesn't support shared libraries. Add specific INTEGRITY cases for autotests requiring a target path. Improve default mkspec for INTEGRITY. Use Q_FUNC_INFO without line number on GHS compiler. Add INTEGRITY gbuild.* files to qmake project. Use the project root from .gpj project files, instead of local path. Make sure QMAKE_CXX is defined to prevent crashing on some projects. Add support for .pro-type subdirectories. Add relative path to the work directory, to prevent filename clashes. Only call moc if the file needs it. Use outname to specify the output .gpj to generate. Use "dll" instead of "shared". Instead of translating / into _, check if subdir is a .pro. Do not generate -D defines for project types. ...
| * \ \ \ Merge branch 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration ↵Qt Continuous Integration System2011-11-156-6/+65
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into master-integration * 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration: tests: allow unstable tests to be marked with CONFIG+=insignificant_test Fix focusScopeItemChange setting crash Fix crash in QHttpNetworkReplyPrivate::gunzipBodyPartiallyEnd symbian - handle path being passed as part of filename in QTranslator Symbian - fix compile error when default configured Compile when -no-rtti is specified as a configure option Ensure that the RC_FILE is correctly handled in a single configuration
| | * \ \ \ Merge branch 4.7 into qt-4.8-from-4.7Sergio Ahumada2011-11-158-8/+92
| | |\ \ \ \
| | | * \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qa-staging into ↵Qt Continuous Integration System2011-11-151-0/+4
| | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-qa-staging: tests: allow unstable tests to be marked with CONFIG+=insignificant_test
| | | | * | | | tests: allow unstable tests to be marked with CONFIG+=insignificant_testRohan McGovern2011-11-151-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Marking a test with CONFIG+=insignificant_test will cause the exit code of the test to be discarded during `make check'. This is intended to be used for tests which are valuable to run, but are known to be unstable and are not feasible to immediately fix. Reviewed-by: Jason McDonald Change-Id: I50a712c33c2ebb0af39f1ea0bf2adef7f0936425 (cherry picked from commit b0a5a988900b777cb08012408eb108512a3e873b)
| | | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-11-151-1/+4
| | | |\ \ \ \ \ | | | | |/ / / / | | | |/| | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Fix focusScopeItemChange setting crash
| | | | * | | | Fix focusScopeItemChange setting crashDamian Jansen2011-11-151-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Delay focusScopeItemChange to after reparenting, to prevent an invalid focusScopeItem pointer crash. Task-number: QTBUG-21640 Reviewed-by: Martin Jones
| | | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2011-11-112-2/+27
| | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Fix crash in QHttpNetworkReplyPrivate::gunzipBodyPartiallyEnd
| | | | * | | | | Fix crash in QHttpNetworkReplyPrivate::gunzipBodyPartiallyEndSami Rosendahl2011-11-112-2/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If a HTTP server responds with gzip-encoded empty content without defining Content-Length in the response header QHttpNetworkReplyPrivate::gunzipBodyPartiallyEnd will crash because it calls zlib inflateEnd for an uninitialized stream. - Fixed the crash by adding a check if the stream is initialized to gunzipBodyPartiallyEnd. - Added a regression test tst_QNetworkReply::nb279420gzipNoContentLengthEmptyContentDisconnect PMO 279420 Task-number: QTBUG-22660 Signed-off-by: Sami Rosendahl <sami.rosendahl@reaktor.fi> Merge-request: 1465 Reviewed-by: Peter Hartmann <peter.hartmann@nokia.com>
| | | * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2011-11-095-8/+57
| | | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: symbian - handle path being passed as part of filename in QTranslator Symbian - fix compile error when default configured
| | | | * | | | | | symbian - handle path being passed as part of filename in QTranslatorShane Kearns2011-11-074-5/+54
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Although incorrect API usage, this was a regression from 4.7.3 behaviour Task-number: QTBUG-22489 Reviewed-by: mread
| | | | * | | | | | Symbian - fix compile error when default configuredShane Kearns2011-11-071-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | New code assumed building with OpenGL/OpenVG, which is the production configuration, but not the default configuration Reviewed-By: Jani Hautakangas Task-Number: QTBUG-21996
| | | * | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2011-11-082-0/+5
| | | |\ \ \ \ \ \ \ | | | | | |/ / / / / | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Compile when -no-rtti is specified as a configure option Ensure that the RC_FILE is correctly handled in a single configuration
| | | | * | | | | | Compile when -no-rtti is specified as a configure optionAndy Shaw2011-11-071-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | After discussing with Marko who did the original backport of the ShaderEffect to Qt 4.7 it was agreed that this is the correct thing to do in this case. Merge-request: 2713 Task-number: QTBUG-22419 Reviewed-by: Marko Niemelä
| | | | * | | | | | Ensure that the RC_FILE is correctly handled in a single configurationAndy Shaw2011-11-071-0/+1
| | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With MSVC 2010 if a single configuration vcxproj file was created then it would not have an entry for the .rc file only the .res file that would be compiled from it. Without the entry for the .rc file then it would not compile the .res file. Task-number: QTBUG-22545 Merge-request: 1452 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
| * | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into ↵Qt Continuous Integration System2011-11-153-16/+126
| |\ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging: Properly protect access to pixmap reader thread with mutex
| | * | | | | | | Properly protect access to pixmap reader thread with mutexChris Adams2011-11-153-16/+126
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, access to the data from the reader thread wasn't guarded properly, causing a crash when the reader thread was deleted prior to QDeclarativePixmapData (which then attempted to dereference the thread pointer to cancel the request), or in the case where a QDeclarativePixmapData was deleted after its QDeclarativePixmapReply was removed from the jobs queue but prior to processing. Reviewed-by: Martin Jones Task-number: QTBUG-22125
| * | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2011-11-153-28/+102
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Revert "Improved performance of mapFromGlobal/mapToGlobal on X11" Fix QDockWidget titlebar button positioning on Mac OS X Fixed memory leak in Windows Vista style widgets
| * \ \ \ \ \ \ \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging into ↵Qt Continuous Integration System2011-11-152-1/+10
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging: Update the supported platforms page. Increase qdoc3 stack size when using MSVC to 4M.
| * \ \ \ \ \ \ \ \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into ↵Qt Continuous Integration System2011-11-142-0/+40
| |\ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging: network auto tests: add QNetworkReply test for pipelining HTTP: blacklist server for pipelining
generated by cgit v0.12 at 2025-01-04 12:13:35 (GMT)