summaryrefslogtreecommitdiffstats
path: root/.qmake.conf
diff options
context:
space:
mode:
authorFrederik Gladhorn <frederik.gladhorn@digia.com>2014-08-04 09:47:52 +0200
committerFrederik Gladhorn <frederik.gladhorn@digia.com>2014-08-04 09:51:36 +0200
commit0936bc54f907066644503c7d4c390968711c73a7 (patch)
tree6eb8c614e7083eae6ca619435f901dcb1380108f /.qmake.conf
parent83080e8a7cb7aaa794a9659eeaf34690afe71ddb (diff)
parentffd44acd0de4fc7079e76f1fe4689b655f9dc763 (diff)
Merge remote-tracking branch 'origin/5.3' into dev
Conflicts: config.tests/arch/arch.cpp src/opengl/qgl_qpa.cpp src/widgets/kernel/qapplication.cpp Change-Id: I80b442a4c2c9632743a5b5c7319ff201ec5bc4fd
Diffstat (limited to '.qmake.conf')
0 files changed, 0 insertions, 0 deletions