Commit Graph

13 Commits

Author SHA1 Message Date
Lars Knoll 4ee2bc4e9c Turn the no-network support into a configurable feature
Change-Id: Ic70f60c124fe166b37fbe9b853735be3c5e0d46d
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2016-10-10 14:11:47 +00:00
Liang Qi 8ae479a8ea Merge remote-tracking branch 'origin/5.7' into dev
Conflicts:
	src/qml/jsruntime/qv4engine_p.h
	src/qml/jsruntime/qv4runtime_p.h
	src/qml/qml/qqmldelayedcallqueue.cpp
	src/qml/qml/qqmlvaluetypewrapper.cpp
	src/qml/qml/qqmlvmemetaobject.cpp
	src/qml/qml/v8/qv8engine_p.h
	tests/auto/quick/qquicktext/tst_qquicktext.cpp

Change-Id: I3f0608c7beb88088cbbef4d0db59920f56deaea9
2016-05-24 14:00:39 +02:00
Oswald Buddenhagen ee874f7e0a actually build and install the qml tutorials
Change-Id: Idf81981140e210b29239e91ff5b6b7c40e2f36de
Reviewed-by: Topi Reiniö <topi.reinio@theqtcompany.com>
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
2016-05-13 04:35:27 +00:00
Paolo Angelelli c7ac28fa35 QtLite: no_network option for QtDeclarative
This patch adds the support for a no_network option for
QtDeclarative, and the necessary #ifndef all around the
code.
no_network changes the interface of some classes, therefore
using it breaks source compatibility.

Change-Id: Iff612fb07041b8a7db99bd595bf038efaac2dd8a
Reviewed-by: Risto Avila <risto.avila@theqtcompany.com>
Reviewed-by: Paul Olav Tvete <paul.tvete@theqtcompany.com>
2016-03-04 13:09:51 +00:00
Oswald Buddenhagen 325161d1c4 the qmlextensionplugins example and a bunch of reference examples need QtQuick
Task-number: QTBUG-36893
Change-Id: If1f937113b651fd2255f8004739f2c601e3826bf
Reviewed-by: Alan Alpert <aalpert@blackberry.com>
2014-02-21 17:43:19 +01:00
Jerome Pasion f0e2853818 Doc: Renamed and moved examples/qml/i18n to examples/qml/qml-i18n
-the generated HTML page conflicts with the i18n.html page from qtdoc.
-edited the content.

Task-number: QTBUG-32580
Change-Id: I32ded1913d9faecb95e28043983e957ccd0e8749
Reviewed-by: Martin Smith <martin.smith@digia.com>
2013-08-13 14:52:27 +02:00
Jerome Pasion fc665d5127 Doc: Moved QML "plugins" example to "qmlextensionplugins"
The example generates a plugins.html which collides with the
plugins.html from qtbase repository.

Task-number: QTBUG-32580
Change-Id: I47ce9e00378738f7696672e6e47dd3337bb4fafc
Reviewed-by: Martin Smith <martin.smith@digia.com>
Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
2013-08-09 12:46:05 +02:00
Samuel Rødal 3598931461 Fixed build when Qt is configured with -no-opengl.
Task-number: QTBUG-28849
Change-Id: I331ebca76892ce7ffbc6f8e03ff4afe0c8e28d5e
Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
2013-02-20 08:52:28 +01:00
Alan Alpert eb6199da86 Move examples around
imageprovider is a QtQuick example. Models and Views examples are now split up,
as one is a collection of C++ examples and the other is banded into a single
QML example.

Task-Number: QTBUG-24133
Change-Id: I81874871bd69ffef6a88df84f3d3f649e0c56bc6
Reviewed-by: hjk <qthjk@ovi.com>
2012-12-11 00:42:36 +01:00
Oswald Buddenhagen a6065d60f1 centralize and fixup example sources install targets
follow respective change in qtbase

Change-Id: I27502eb7ebea973e19ec5f7c3ec0e2338556f6e0
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Alan Alpert (Personal) <416365416c@gmail.com>
2012-12-10 18:16:48 +01:00
Christian Kandeler aba67cc3f0 Fix installation of examples.
Enable examples to be built in the target tree. This entails installing
the project files and possibly other missing stuff.
Task-number: QTBUG-27977

Change-Id: I159fd8e3ebc7077e1d68e085c4947acc058ce594
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: hjk <qthjk@ovi.com>
2012-11-22 14:10:05 +01:00
Alan Alpert 0f04787ffb More consistent examples directory structure
Under examples the next directory level distinguishes imports/modules
and the next directory level distinguishes examples.

Change-Id: Icabadaac6ccb9c1c424efa9c9e64a7d94bc7c0da
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
2012-08-10 08:56:59 +02:00
Alan Alpert 9d2b618fa0 Start of examples refactor
This is the general reorg of the examples directory structure, plus additional
guidelines.

calculator, animations and accessibility have been updated to the new standards
and tested, as an example.

Task-number: QTBUG-24133
Change-Id: I76c3b86751d3195ba2a5474ff23afb875765e9a4
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
2012-02-24 10:24:58 +01:00