diff options
| author | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2015-04-21 16:26:04 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2015-04-21 16:26:04 +0200 |
| commit | 9edcb248898bb6f515b1ca9068205669b2bf6b9e (patch) | |
| tree | 6d5ca927eaaed271b9a97befd679d88870eb492f /qt.pro | |
| parent | b34e3669ff5dff4ab791eeb699e5284ed4332dc1 (diff) | |
| parent | 976ffd988e7ec7b595ed610d86bf58307c5e5434 (diff) | |
Merge remote-tracking branch 'origin/5.5' into dev
Conflicts:
qt3d
qtactiveqt
qtandroidextras
qtbase
qtcanvas3d
qtconnectivity
qtdeclarative
qtdoc
qtenginio
qtimageformats
qtlocation
qtmacextras
qtmultimedia
qtqa
qtquick1
qtquickcontrols
qtrepotools
qtscript
qtsensors
qtserialport
qtsvg
qttools
qttranslations
qtwayland
qtwebengine
qtwebkit
qtwebkit-examples
qtwebsockets
qtwinextras
qtxmlpatterns
Change-Id: I691dbbe6d3399d601336bb7e309579fb89d6381c
Diffstat (limited to 'qt.pro')
| -rw-r--r-- | qt.pro | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -86,7 +86,7 @@ addModule(qtgraphicaleffects, qtdeclarative) addModule(qtscript, qtbase, qttools) addModule(qtquick1, qtscript, qtsvg qtxmlpatterns qtwebkit) addModule(qtdocgallery, qtdeclarative) -linux:!android: addModule(qtwayland, qtbase, qtdeclarative) +addModule(qtwayland, qtbase, qtdeclarative) addModule(qtserialport, qtbase) addModule(qtenginio, qtdeclarative) addModule(qtwebengine, qtquickcontrols qtwebchannel, qtwebkit qtlocation) |