qiurui
/
qtdeclarative
mirror of https://github.com/qt/qtdeclarative.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
qtdeclarative/examples/quick
History
Simon Hausmann 24d0266ee4 Merge remote-tracking branch 'origin/5.9' into HEAD 
Conflicts:
	src/plugins/qmltooling/qmldbg_debugger/qv4datacollector.cpp
	src/qml/jit/qv4assembler.cpp
	src/qml/jit/qv4assembler_p.h
	src/qml/jit/qv4isel_masm.cpp
	src/qml/jsruntime/qv4context.cpp
	src/qml/jsruntime/qv4context_p.h
	src/qml/jsruntime/qv4engine.cpp
	src/qml/jsruntime/qv4vme_moth.cpp
	src/qml/memory/qv4mmdefs_p.h

Change-Id: I9966750b7cd9106b78e4c4779f12b95a481cca40
 		2017-03-23 14:43:46 +01:00
..
animation Purge sRGB chunks from PNGs in examples. 2016-03-24 19:40:15 +00:00
canvas Fix smile qml example 2017-02-21 12:30:17 +00:00
customitems Merge remote-tracking branch 'origin/5.6' into 5.7 2016-05-19 20:41:34 +02:00
demos stocqt Demo: Add error checks 2017-03-20 08:57:28 +00:00
draganddrop Doc: Changed title GridView example 2015-03-05 14:35:49 +00:00
embeddedinwidgets examples: replace 'foreach' with 'range for' 2016-09-03 16:50:01 +00:00
externaldraganddrop Fixed license headers 2015-02-17 13:33:18 +00:00
imageelements Purge sRGB chunks from PNGs in examples. 2016-03-24 19:40:15 +00:00
imageprovider fix example installs 2016-05-13 04:35:24 +00:00
imageresponseprovider Improve QQuickAsyncImageProvider example 2017-02-08 10:07:41 +00:00
keyinteraction Purge sRGB chunks from PNGs in examples. 2016-03-24 19:40:15 +00:00
layouts Move QtQuick.Layouts to qtdeclarative from qtquickcontrols 2016-02-26 13:18:27 +00:00
localstorage Example: corrected screenshot of the localstorage app 2016-12-21 09:37:01 +00:00
models Purge sRGB chunks from PNG in documentation. 2016-03-24 19:40:25 +00:00
mousearea Update examples to deal correctly with fine-grained wheel events 2015-11-30 15:32:20 +00:00
particles Purge sRGB chunks from PNGs in examples. 2016-03-24 19:40:15 +00:00
positioners Adjust positioners example for tooling 2016-11-15 10:52:59 +00:00
quick-accessibility Merge remote-tracking branch 'origin/5.6' into 5.7 2016-05-19 20:41:34 +02:00
quickwidgets Merge remote-tracking branch 'origin/5.8' into dev 2016-12-14 19:01:23 +01:00
rendercontrol Document and demo that fboId can be 0 2017-03-17 11:26:07 +00:00
righttoleft Fixed license headers 2015-02-17 13:33:18 +00:00
scenegraph Merge remote-tracking branch 'origin/5.8' into dev 2017-01-14 22:17:32 +01:00
shadereffects Migrate shadereffects example to be cross-backend 2016-06-29 12:00:09 +00:00
shared Merge remote-tracking branch 'origin/5.8' into dev 2016-11-23 10:49:37 +01:00
text Purge sRGB chunks from PNGs in examples. 2016-03-24 19:40:15 +00:00
textureprovider Merge remote-tracking branch 'origin/5.6' into 5.7 2016-06-20 12:26:08 +02:00
threading Doc: Added brief statements for Qt examples overview page 2016-01-05 12:23:28 +00:00
touchinteraction Purge sRGB chunks from PNGs in examples. 2016-03-24 19:40:15 +00:00
tutorials actually build and install the qml tutorials 2016-05-13 04:35:27 +00:00
views Purge sRGB chunks from PNGs in examples. 2016-03-24 19:40:15 +00:00
window Add 10mm rectangle to screen example to verify Screen.pixelDensity 2017-01-27 17:22:32 +00:00
quick.pro Adjust decarative after qtConfig changes in qtbase 2016-08-19 11:16:18 +00:00