diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2015-08-21 15:18:07 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2015-08-21 15:18:07 +0200 |
| commit | 4a1846acd122af58c601f9832ade4c4d8986e66a (patch) | |
| tree | 019b131bf411ba3c7e62fcff0199bdf073825fa2 /examples/quick | |
| parent | 3c63ac03ed262b59962b45ac974b82edc7c83880 (diff) | |
| parent | 27bee8076f50a948ffb9997e2a0673854681437d (diff) | |
Merge remote-tracking branch 'origin/5.5' into 5.6
Conflicts:
tools/qml/main.cpp
Change-Id: I6d521b21be85d91ebb96c28e2c64186f02d94842
Diffstat (limited to 'examples/quick')
| -rw-r--r-- | examples/quick/demos/samegame/samegame.pro | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/examples/quick/demos/samegame/samegame.pro b/examples/quick/demos/samegame/samegame.pro index 51e6f00321..e041dd61dd 100644 --- a/examples/quick/demos/samegame/samegame.pro +++ b/examples/quick/demos/samegame/samegame.pro @@ -7,4 +7,4 @@ RESOURCES += samegame.qrc target.path = $$[QT_INSTALL_EXAMPLES]/quick/demos/samegame INSTALLS += target -QTPLUGIN += qsqlite +!contains(sql-drivers, sqlite): QTPLUGIN += qsqlite |