diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2013-04-11 17:02:10 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2013-04-11 17:25:40 +0200 |
| commit | a257b0ee55c250889707bead9157076a3ff9b869 (patch) | |
| tree | 37b707cd9e28de70e962fc4362ecbf0e3a40a779 /src | |
| parent | f212e46fe930ee89a8cb52beeeccc03369c015a1 (diff) | |
| parent | 1b02287e464efc999dda10ff57c0207e6f3648d5 (diff) | |
Merge branch 'release' into old/5.0old/5.0
Conflicts:
src/assistant/assistant/assistant.pro
Change-Id: Ifa7d318f8482c09367388d6c9f848c4931a5ead7
Diffstat (limited to 'src')
| -rw-r--r-- | src/assistant/assistant/assistant.pro | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/assistant/assistant/assistant.pro b/src/assistant/assistant/assistant.pro index 25e423883..c054147b8 100644 --- a/src/assistant/assistant/assistant.pro +++ b/src/assistant/assistant/assistant.pro @@ -107,7 +107,7 @@ mac { QMAKE_INFO_PLIST = Info_mac.plist } -QTPLUGIN += qsqlite +contains(SQLPLUGINS, sqlite):QTPLUGIN += qsqlite target.path=$$[QT_INSTALL_BINS] INSTALLS += target |