AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
11,257 Commits 4 Branches 0 Tags 339 MiB
C++ 84.2%
HTML 5.1%
C 4.2%
CMake 2.9%
Objective-C++ 2%
Other 1%
826c4f60b6
Go to file
Miikka Heikkinen 826c4f60b6 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 <Friedemann.Kleint@digia.com>
Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>
2012-12-17 14:08:17 +01:00
bin fix installation of aux headers 2012-12-13 09:11:03 +01:00
config.tests Add configure option to minimize xcb runtime dependencies 2012-11-07 16:55:50 +01:00
dist Add Platforms and Mac info to changelog. 2012-12-17 09:31:16 +01:00
doc QtBase: Removed moved linguist examples. 2012-12-14 11:02:47 +01:00
examples Fix mandlebrot and imagescaling example qdoc markup. 2012-12-17 11:57:02 +01:00
lib Initial import from the monolithic Qt. 2011-04-27 12:05:43 +02:00
mkspecs Fix installation of plugin module .pris in static Qt builds 2012-12-17 14:08:17 +01:00
qmake fix duplicate TRANSLATION entry in generated RC file 2012-12-17 14:08:17 +01:00
src Rename conflicting symbol QVariantToVARIANT 2012-12-17 14:08:17 +01:00
tests Compile. 2012-12-17 11:57:02 +01:00
tools Consistently prefix all platform plugin libraries with "q". 2012-12-11 13:37:57 +01:00
util More changes from Nokia to Digia 2012-11-30 00:50:47 +01:00
.gitattributes Update the git-archive export options 2012-09-07 15:39:31 +02:00
.gitignore Fix docs for Drag and Drop examples 2012-11-30 18:37:35 +01:00
.qmake.conf don't auto-install example sources by default for all modules 2012-12-03 15:56:28 +01:00
.tag Update the git-archive export options 2012-09-07 15:39:31 +02:00
configure Add directwrite support to the configure script 2012-12-12 15:23:41 +01:00
configure.bat Change copyrights from Nokia to Digia 2012-09-22 19:20:11 +02:00
header.BSD Change copyrights from Nokia to Digia 2012-09-22 19:20:11 +02:00
header.FDL Change copyrights from Nokia to Digia 2012-09-22 19:20:11 +02:00
header.LGPL Change copyrights from Nokia to Digia 2012-09-22 19:20:11 +02:00
header.LGPL-ONLY Change copyrights from Nokia to Digia 2012-09-22 19:20:11 +02:00
INSTALL fix links in INSTALL 2012-10-10 08:45:22 +02:00
LGPL_EXCEPTION.txt Change copyrights from Nokia to Digia 2012-09-22 19:20:11 +02:00
LICENSE.FDL Initial import from the monolithic Qt. 2011-04-27 12:05:43 +02:00
LICENSE.GPL Add the LICENSE.GPL file to the module referenced from license headers 2012-05-20 22:41:08 +02:00
LICENSE.LGPL Change copyrights from Nokia to Digia 2012-09-22 19:20:11 +02:00
LICENSE.PREVIEW.COMMERCIAL Change copyrights from Nokia to Digia 2012-09-22 19:20:11 +02:00
qtbase.pro rewrite default spec handling 2012-11-01 20:17:57 +01:00
sync.profile properly syncqt-ize harfbuzz headers 2012-12-04 13:57:55 +01:00