diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2015-03-03 11:21:03 +0100 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2015-03-03 11:21:03 +0100 |
| commit | 4b962aee8260f4cb709eae2534bc13785fcc2712 (patch) | |
| tree | 9511fb4ea009e74c3798ef726fc44150e40905cc | |
| parent | c2d151522bf8ae761937b51d1a630d3c5eb7a449 (diff) | |
| parent | 811a77a53c9e5a05e01928f8efb6678e4637a4bf (diff) | |
Merge remote-tracking branch 'origin/dev' into 5.5
Conflicts:
.gitmodules
Change-Id: I45e015a2c4eb3778d2346569de9b7f09e72a58bf
| -rw-r--r-- | qt.pro | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -69,7 +69,7 @@ addModule(qtmultimedia, qtbase, qtdeclarative) addModule(qtwinextras, qtbase, qtdeclarative qtmultimedia) addModule(qtactiveqt, qtbase) addModule(qtsystems, qtbase, qtdeclarative) -addModule(qtlocation, qtbase, qtsystems) +addModule(qtlocation, qtbase, qtdeclarative qtsystems) addModule(qtsensors, qtbase, qtdeclarative) addModule(qtconnectivity, qtbase $$ANDROID_EXTRAS, qtdeclarative) addModule(qtfeedback, qtdeclarative, qtmultimedia) |