path: root/qmake
diff options
authorMiikka Heikkinen <>2012-12-17 11:43:10 +0200
committerThe Qt Project <>2012-12-17 14:08:17 +0100
commit826c4f60b65532033045e76d34fb718957a26fa9 (patch)
treea5ddd83e521fcf604a08a8b76281f6b788e1c364 /qmake
parent3e94e8daf36e90e73ca475a81c9b9a3af40b45b3 (diff)
Rename conflicting symbol QVariantToVARIANT
It appears this method has been copied from ActiveQt. When building Qt statically, linking Windows platform plugin into any application that also uses ActiveQt will cause error about duplicate symbol. Renamed QVariantToVARIANT to QVariant2VARIANT to avoid conflicts. Renaming is done here rather than ActiveQt, as that symbol is in exported header in ActiveQt. Task-number: QTBUG-28645 Change-Id: Id0d7fc51d4455b463515e7c6178798ad61217c35 Reviewed-by: Friedemann Kleint <> Reviewed-by: Jan Arve Sæther <>
Diffstat (limited to 'qmake')
0 files changed, 0 insertions, 0 deletions