diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-04-22 09:31:58 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-04-25 14:03:45 +0200 |
| commit | bb4b86618dc930e0035c5829e336f2606d140ada (patch) | |
| tree | 6e36808ca46244373bc70aabbb926cc114538beb /mkspecs/macx-clang/qmake.conf | |
| parent | 276adc5a09914fd89d976bb90cc0cd67de9d3d6e (diff) | |
| parent | bbd1228b17ee3f3a5483f88b0a581d6a60c41cad (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts:
config.tests/unix/compile.test
configure
src/android/jar/src/org/qtproject/qt5/android/QtMessageDialogHelper.java
src/corelib/global/qglobal.cpp
src/widgets/kernel/qapplication.cpp
src/widgets/styles/qwindowsvistastyle.cpp
tests/auto/corelib/kernel/qobject/tst_qobject.cpp
Change-Id: I067083f34e5290aa5f7565e40c30a069cc37b83a
Diffstat (limited to 'mkspecs/macx-clang/qmake.conf')
0 files changed, 0 insertions, 0 deletions