diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2017-05-30 19:42:14 +0200 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2017-05-30 19:42:14 +0200 |
| commit | 7d592bcbfb604b1179004e311aa6a972fab6707c (patch) | |
| tree | 92d7ea1e139c3d264dd75dc527c2113e279db9f6 /examples | |
| parent | f57f2d9e45b177232b76bde07ff96ef3e43fe5b1 (diff) | |
| parent | 44dd55be23138f0a6495b08818acaaa0ff68b086 (diff) | |
Merge remote-tracking branch 'origin/5.9' into dev
Conflicts:
src/quicktemplates2/qquickrangeslider.cpp
Change-Id: I7eb990cfdc91173f86552841ba16536b35ea09cf
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/quickcontrols2/chattutorial/chapter4-models/chapter4-models.pro | 2 | ||||
| -rw-r--r-- | examples/quickcontrols2/chattutorial/chapter5-styling/chapter5-styling.pro | 2 |
2 files changed, 0 insertions, 4 deletions
diff --git a/examples/quickcontrols2/chattutorial/chapter4-models/chapter4-models.pro b/examples/quickcontrols2/chattutorial/chapter4-models/chapter4-models.pro index 75d37ca3..2a2d955b 100644 --- a/examples/quickcontrols2/chattutorial/chapter4-models/chapter4-models.pro +++ b/examples/quickcontrols2/chattutorial/chapter4-models/chapter4-models.pro @@ -3,8 +3,6 @@ TEMPLATE = app QT += qml quick sql CONFIG += c++11 -!qtConfig(sql-sqlite): QTPLUGIN += qsqlite - HEADERS += sqlcontactmodel.h \ sqlconversationmodel.h diff --git a/examples/quickcontrols2/chattutorial/chapter5-styling/chapter5-styling.pro b/examples/quickcontrols2/chattutorial/chapter5-styling/chapter5-styling.pro index 007d23b3..e798fe3c 100644 --- a/examples/quickcontrols2/chattutorial/chapter5-styling/chapter5-styling.pro +++ b/examples/quickcontrols2/chattutorial/chapter5-styling/chapter5-styling.pro @@ -3,8 +3,6 @@ TEMPLATE = app QT += qml quick sql CONFIG += c++11 -!qtConfig(sql-sqlite): QTPLUGIN += qsqlite - HEADERS += sqlcontactmodel.h \ sqlconversationmodel.h |