summaryrefslogtreecommitdiff
path: root/tests/auto
diff options
context:
space:
mode:
authorJake Petroules <jake.petroules@qt.io>2016-10-05 17:29:55 -0700
committerJake Petroules <jake.petroules@qt.io>2016-10-06 19:24:14 +0000
commit3bc99dd69fb9099a13dd94ebd081dba5c68d6def (patch)
treebd5747a3b1e7f60d3489a6f714d56c554e0d0926 /tests/auto
parent3b093789b07c670e29d3275e26c4e7122db042ae (diff)
downloadqtquickcontrols-3bc99dd69fb9099a13dd94ebd081dba5c68d6def.tar.gz
Rename QQuickDialog to QQuickDialog1v5.8.0-beta1
This fixes a linking error when Qt is built statically and both Qt Quick Controls 1 and Qt Quick Controls 2 are used in the same application, due to Qt Quick Controls 2 also containing a class named QQuickDialog. Change-Id: I16ad8b1a3c75d0fa3e4ba1c3ab54a63caf05bbea Reviewed-by: J-P Nurmi <jpnurmi@qt.io> Reviewed-by: Alex Leutgöb <alex@v-play.net> Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@qt.io>
Diffstat (limited to 'tests/auto')
0 files changed, 0 insertions, 0 deletions