OSDN Git Service
Ivailo Monev [Mon, 8 Feb 2016 11:24:13 +0000 (13:24 +0200)]
remove unnecessary headers inclusion
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
Ivailo Monev [Mon, 8 Feb 2016 11:00:21 +0000 (13:00 +0200)]
Merge branch 'master' of https://github.com/fluxer/katie
Ivailo Monev [Mon, 8 Feb 2016 10:59:39 +0000 (12:59 +0200)]
misc cleanups
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
Ivailo Monev [Sun, 7 Feb 2016 23:01:21 +0000 (01:01 +0200)]
fix build of gui component without zlib
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
Ivailo Monev [Sun, 7 Feb 2016 17:29:16 +0000 (19:29 +0200)]
fix regression since
48f9a83a
Ivailo Monev [Sun, 7 Feb 2016 16:18:52 +0000 (16:18 +0000)]
fix static assert for x86_64
the offset has changed when the profiler was removed
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
Ivailo Monev [Sun, 7 Feb 2016 15:19:54 +0000 (15:19 +0000)]
fix some compiler warnings
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
Ivailo Monev [Sun, 7 Feb 2016 13:43:21 +0000 (15:43 +0200)]
inline some methods
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
Ivailo Monev [Sun, 7 Feb 2016 01:46:11 +0000 (03:46 +0200)]
update translations
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
Ivailo Monev [Sun, 7 Feb 2016 01:24:51 +0000 (03:24 +0200)]
remove unused variable from ODBC driver
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
Ivailo Monev [Sun, 7 Feb 2016 01:07:34 +0000 (03:07 +0200)]
update lrelease and lupdate manual pages
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
Ivailo Monev [Sun, 7 Feb 2016 00:59:36 +0000 (02:59 +0200)]
add manual pages for qdbus and moc tools from Debian
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
Ivailo Monev [Sun, 7 Feb 2016 00:03:19 +0000 (02:03 +0200)]
fix compile error if openssl is built with no-ssl3-method
patch adapted from Debian
upstream commits:
https://github.com/qtproject/qtbase/commit/
6839aead0430a9b07b60fa3a1a7d685fe5d2d1ef
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
Ivailo Monev [Sat, 6 Feb 2016 03:27:21 +0000 (05:27 +0200)]
remove unused variable from UIC tool
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
Ivailo Monev [Sat, 6 Feb 2016 03:16:05 +0000 (05:16 +0200)]
inline some methods in declerative component
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
Ivailo Monev [Fri, 5 Feb 2016 21:42:30 +0000 (23:42 +0200)]
adjust the Windows print dialog to recent QMessageBox changes
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
Ivailo Monev [Fri, 5 Feb 2016 21:42:10 +0000 (23:42 +0200)]
include the qt_windows header in the win32 platform header
this ensures that definitions from the qt_windows header are really before
anything that includes windows, fixes build with MinGW on Windows host
because WINVER is overriden from qt_windows header
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
Ivailo Monev [Fri, 5 Feb 2016 19:17:23 +0000 (21:17 +0200)]
make the win32 mkspecs MinGW aware
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
Ivailo Monev [Fri, 5 Feb 2016 19:16:35 +0000 (21:16 +0200)]
remove CMake platform target properties entirely
they cause different (troublesome) behaviour depending on wheather the
build is performed on Windows or UNIX host
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
Ivailo Monev [Fri, 5 Feb 2016 15:50:09 +0000 (17:50 +0200)]
prioratize CMake target properties
this fixes an issue where running executables build with MinGW on Windows
host does nothing and the final executable is useless
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
Ivailo Monev [Fri, 5 Feb 2016 15:41:15 +0000 (17:41 +0200)]
fix conditional for TCMalloc
it seems that running CMake from Git Bash shell makes CMake think that it
is running on UNIX system
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
Ivailo Monev [Fri, 5 Feb 2016 15:22:33 +0000 (17:22 +0200)]
add CMake toolchain file for use on Windows
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
Ivailo Monev [Fri, 5 Feb 2016 15:20:56 +0000 (17:20 +0200)]
fix incompatibility with Windows version older thatn Vista
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
Ivailo Monev [Fri, 5 Feb 2016 16:53:26 +0000 (18:53 +0200)]
actually, make that conditional and add a comment
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
Ivailo Monev [Fri, 5 Feb 2016 16:50:52 +0000 (18:50 +0200)]
make the svg component miniz compatible
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
Ivailo Monev [Fri, 5 Feb 2016 16:17:58 +0000 (18:17 +0200)]
use miniz when zlib is not available
since the compression is required for the network component, rcc and other
cruft a minimal zlib replacement should do just fine for that purpose.
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
Ivailo Monev [Fri, 5 Feb 2016 15:13:45 +0000 (17:13 +0200)]
oops, remove accidently added plus sign
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
Ivailo Monev [Fri, 5 Feb 2016 14:59:05 +0000 (16:59 +0200)]
fix mkspecs architecture detection on pure Win32
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
Ivailo Monev [Fri, 5 Feb 2016 14:56:31 +0000 (16:56 +0200)]
silence some compiler warnings
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
Ivailo Monev [Fri, 5 Feb 2016 14:56:07 +0000 (16:56 +0200)]
ICD bearer plugin requires D-Bus, not sure if it is only for Win32 anymore
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
Ivailo Monev [Thu, 4 Feb 2016 20:50:43 +0000 (22:50 +0200)]
fix some compiler warnings
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
Ivailo Monev [Thu, 4 Feb 2016 19:51:16 +0000 (21:51 +0200)]
fix compiler warnings in JavaScriptCore
some of the changes are not part of the upstream commit
upstream commits:
https://github.com/qtproject/qtscript/commit/
38f5d4df0783169a02fce171e7947f18f3815b32.patch
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
Ivailo Monev [Wed, 3 Feb 2016 15:34:16 +0000 (17:34 +0200)]
fix some more compiler warnings
some of the changes are my own
upstream commits:
https://github.com/qtproject/qtsvg/commit/
1ce9af6c1c32b20dedc33bd46cde5ee4b34a04c1
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
Ivailo Monev [Wed, 3 Feb 2016 15:13:09 +0000 (17:13 +0200)]
fix some compiler warnings
upstream commits that make questionable changes and need further investigation:
https://github.com/qtproject/qtxmlpatterns/commit/
4bd45d7d2a32a170b4ed11b03752726b446fbb79
https://github.com/qtproject/qtbase/commit/
336eac089623be3c824b19a1161d19906ae6125f
upstream commits:
https://github.com/qtproject/qtbase/commit/
6a11dd166985d7804b6861662193093aa84cdd0c
https://github.com/qtproject/qtxmlpatterns/commit/
8a95cb56f5ecadb450de545061e8444e9698d21f
https://github.com/qtproject/qtbase/commit/
c550a5d42c1188c0ccd11c205665e2608dbec61f
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
Ivailo Monev [Wed, 3 Feb 2016 12:55:43 +0000 (14:55 +0200)]
adjust some benchamrks so they build
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
Ivailo Monev [Tue, 2 Feb 2016 21:00:43 +0000 (23:00 +0200)]
QMessageBox cleanup
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
Ivailo Monev [Tue, 2 Feb 2016 16:45:51 +0000 (18:45 +0200)]
add network settings header for the benchmarks and tests
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
Ivailo Monev [Tue, 2 Feb 2016 16:44:05 +0000 (18:44 +0200)]
port script benchmarks to CMake build system
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
Ivailo Monev [Mon, 1 Feb 2016 20:42:59 +0000 (22:42 +0200)]
minor doxygen config cleanup
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
Ivailo Monev [Mon, 1 Feb 2016 18:21:48 +0000 (20:21 +0200)]
deal with some obsolete headers
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
Ivailo Monev [Mon, 1 Feb 2016 18:12:04 +0000 (20:12 +0200)]
port gui and network benchmarks to CMake build system
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
Ivailo Monev [Mon, 1 Feb 2016 13:29:04 +0000 (15:29 +0200)]
fix ICD plugin source entries
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
Ivailo Monev [Mon, 1 Feb 2016 13:26:26 +0000 (15:26 +0200)]
build system cleanups
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
Ivailo Monev [Mon, 1 Feb 2016 01:33:31 +0000 (03:33 +0200)]
add benchmarks from Qt4, some of which not yet ported to CMake build system
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
Ivailo Monev [Sun, 31 Jan 2016 21:24:32 +0000 (23:24 +0200)]
most tests/benchamrk require GUI access, enable that
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
Ivailo Monev [Sun, 31 Jan 2016 20:46:13 +0000 (22:46 +0200)]
remove syncqt workarounds
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
Ivailo Monev [Sun, 31 Jan 2016 19:58:39 +0000 (21:58 +0200)]
misc cleanups
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
Ivailo Monev [Sun, 31 Jan 2016 16:44:04 +0000 (18:44 +0200)]
the declarative component does not depends on the svg component
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
Ivailo Monev [Sun, 31 Jan 2016 16:01:17 +0000 (18:01 +0200)]
g_thread_init is deprecated
unlike the upstream changes my make it so that a runtime warning is printed
that QT_NO_THREADED_GLIB has no effect
upstream commits:
https://github.com/qtproject/qtbase/commit/
3372b0faa74114184afbfde20a3bc27049df2c94
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
Ivailo Monev [Sun, 31 Jan 2016 15:59:24 +0000 (17:59 +0200)]
misc cleanups
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
Ivailo Monev [Sun, 31 Jan 2016 13:58:37 +0000 (15:58 +0200)]
misc cleanups
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
Ivailo Monev [Sat, 30 Jan 2016 17:37:11 +0000 (19:37 +0200)]
do not expose QVariant to JSON types conversion on bootstrap
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
Ivailo Monev [Sat, 30 Jan 2016 14:02:10 +0000 (16:02 +0200)]
fix two compiler warnings
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
Ivailo Monev [Sat, 30 Jan 2016 03:49:08 +0000 (05:49 +0200)]
do not use -Winline, gcc 4.8.3 warns even if the function is not marked inlined
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
Ivailo Monev [Sat, 30 Jan 2016 02:08:28 +0000 (04:08 +0200)]
inline QCryptographicHash::addData() overload
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
Ivailo Monev [Sat, 30 Jan 2016 02:07:41 +0000 (04:07 +0200)]
fix constant false comparison of out-of-range enums
upstream commits:
https://github.com/qtproject/qtbase/commit/
5dd2713c8ba98e06ae5c4f3da44b2ed73121d247
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
Ivailo Monev [Fri, 29 Jan 2016 21:21:02 +0000 (23:21 +0200)]
some benchmarks expect SRCDIR to end with separator
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
Ivailo Monev [Fri, 29 Jan 2016 21:19:23 +0000 (23:19 +0200)]
make CPack aware of the README file
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
Ivailo Monev [Fri, 29 Jan 2016 21:18:48 +0000 (23:18 +0200)]
export QTDIR for the tests
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
Ivailo Monev [Fri, 29 Jan 2016 21:18:34 +0000 (23:18 +0200)]
remove qdoc leftovers from qmetatype header
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
Ivailo Monev [Fri, 29 Jan 2016 17:04:18 +0000 (19:04 +0200)]
misc cleanups
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
Ivailo Monev [Fri, 29 Jan 2016 17:03:19 +0000 (19:03 +0200)]
add README
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
Ivailo Monev [Fri, 29 Jan 2016 17:01:40 +0000 (19:01 +0200)]
fix copy and paste error
upstream commits:
https://github.com/qtproject/qtxmlpatterns/commit/
73a29b4800234bb5919fb6300f317b25d0bbaa89
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
Ivailo Monev [Fri, 29 Jan 2016 16:58:18 +0000 (18:58 +0200)]
fix (!a == b) bug
upstream commits:
https://github.com/qtproject/qtxmlpatterns/commit/
5b4b3fb34679c2768d5c830cb8b9c88506aca75b
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
Ivailo Monev [Fri, 29 Jan 2016 16:56:45 +0000 (18:56 +0200)]
fix conditionals in DayTimeDuration::stringValue()
upstream commits:
https://github.com/qtproject/qtxmlpatterns/commit/
494882adadb33ffb7a7a9b2fa9356362df87d3bf
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
Ivailo Monev [Fri, 29 Jan 2016 16:54:03 +0000 (18:54 +0200)]
fix copy and paste error
upstream commits:
https://github.com/qtproject/qtxmlpatterns/commit/
e13d30be68228ccda3b6310ac44a84981b17f03b
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
Ivailo Monev [Fri, 29 Jan 2016 00:47:40 +0000 (02:47 +0200)]
misc cleanups
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
Ivailo Monev [Thu, 28 Jan 2016 12:41:24 +0000 (14:41 +0200)]
fix crashes in script component
that code was guarded by !PLATFORM(QT) which I overlooked and
unconditionalized leaving the code, deleting the data should not
be done
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
Ivailo Monev [Thu, 28 Jan 2016 00:28:29 +0000 (02:28 +0200)]
add generate utility
just for refence, the concurrent code has been hand-edited
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
Ivailo Monev [Wed, 27 Jan 2016 23:43:36 +0000 (01:43 +0200)]
remove cotire support
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
Ivailo Monev [Wed, 27 Jan 2016 17:19:57 +0000 (19:19 +0200)]
UIC does not need the XML component
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
Ivailo Monev [Wed, 27 Jan 2016 17:15:15 +0000 (19:15 +0200)]
do not build and use bootstrapped UIC and RCC
this allows RCC to compress the resources, if it's worth it
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
Ivailo Monev [Wed, 27 Jan 2016 16:56:41 +0000 (18:56 +0200)]
mention -list command line option in -help output
upstream commits:
https://github.com/qtproject/qtbase/commit/
90cdac061783eb2ffd68615016c883ea958c497c
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
Ivailo Monev [Wed, 27 Jan 2016 14:42:07 +0000 (16:42 +0200)]
improve Freetype module compat
under strange circumstances CMake still assumes that Freetype was
not found, like calling find_package() for package that searches
for Freetype internally (e.g. GTK+). it should fix other edge
cases too.
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
Ivailo Monev [Wed, 27 Jan 2016 13:37:54 +0000 (15:37 +0200)]
cleanup includes
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
Ivailo Monev [Wed, 27 Jan 2016 13:19:03 +0000 (15:19 +0200)]
add inline assembly checks to build system
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
Ivailo Monev [Wed, 27 Jan 2016 12:50:22 +0000 (14:50 +0200)]
minor cleanups
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
Ivailo Monev [Wed, 27 Jan 2016 12:45:16 +0000 (14:45 +0200)]
use custom module for Freetype2 detection
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
Ivailo Monev [Wed, 27 Jan 2016 12:10:57 +0000 (14:10 +0200)]
remove useless JavaScriptCore file
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
Ivailo Monev [Wed, 27 Jan 2016 12:10:40 +0000 (14:10 +0200)]
set version in qglobal header during configuration
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
Ivailo Monev [Wed, 27 Jan 2016 02:57:07 +0000 (04:57 +0200)]
fix compiler warning about unused function
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
Ivailo Monev [Wed, 27 Jan 2016 02:51:54 +0000 (04:51 +0200)]
make use of the recent C++ additions
these should be guarded by QT_NO_STD and are probably not going to work on
all platforms, Qt5 does a lot of magic for this
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
Ivailo Monev [Tue, 26 Jan 2016 23:25:54 +0000 (01:25 +0200)]
fix compiler warning about unused function
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
Ivailo Monev [Tue, 26 Jan 2016 23:19:07 +0000 (01:19 +0200)]
setup flags for executables and shared targets
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
Ivailo Monev [Tue, 26 Jan 2016 23:08:55 +0000 (01:08 +0200)]
avoid x86_64 being detected as x86
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
Ivailo Monev [Tue, 26 Jan 2016 15:34:47 +0000 (17:34 +0200)]
add default conversion for types long and ulong
upstream commits:
https://github.com/qtproject/qtscript/commit/
b0c4e816e6da2c09593cf8de2f563093947ebdaf
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
Ivailo Monev [Tue, 26 Jan 2016 15:33:20 +0000 (17:33 +0200)]
fix GC issues related to QObject connections and ownership
upstream commits:
https://github.com/qtproject/qtscript/commit/
d7bba09f263a522d36fd4a704e6667e7a9efd297
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
Ivailo Monev [Tue, 26 Jan 2016 15:32:18 +0000 (17:32 +0200)]
Ensure QObject wrappers are garbage-collected if appropriate
upstrema commits:
https://github.com/qtproject/qtscript/commit/
378416af7542e34196908896c9a69573b995adb0
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
Ivailo Monev [Tue, 26 Jan 2016 14:10:31 +0000 (16:10 +0200)]
update translations
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
Ivailo Monev [Tue, 26 Jan 2016 14:04:52 +0000 (16:04 +0200)]
fix some compiler warnings
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
Ivailo Monev [Tue, 26 Jan 2016 13:43:04 +0000 (15:43 +0200)]
cleanup includes
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
Ivailo Monev [Tue, 26 Jan 2016 13:16:40 +0000 (15:16 +0200)]
fix data race on isDebugging bool
also fixed warning about undefined QDBUS_THREAD_DEBUG
upstream commits:
https://github.com/qtproject/qtbase/commit/
7a4dcbaabf037a6913a5662ebb74cc47e04673b9
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
Ivailo Monev [Tue, 26 Jan 2016 12:44:28 +0000 (14:44 +0200)]
return proper type from QMetaMethod::attributes()
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
Ivailo Monev [Tue, 26 Jan 2016 12:37:49 +0000 (14:37 +0200)]
document JSON types
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
Ivailo Monev [Tue, 26 Jan 2016 00:39:51 +0000 (02:39 +0200)]
oops, initialize headerProtection
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
Ivailo Monev [Tue, 26 Jan 2016 00:30:03 +0000 (02:30 +0200)]
remove Java support from lupdate and uic
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
Ivailo Monev [Mon, 25 Jan 2016 22:40:53 +0000 (00:40 +0200)]
cleanup includes
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
Ivailo Monev [Mon, 25 Jan 2016 21:53:28 +0000 (23:53 +0200)]
remove unnecessary includes
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
Ivailo Monev [Mon, 25 Jan 2016 21:41:28 +0000 (23:41 +0200)]
remove unused static variable
it is unused since https://github.com/fluxer/katie/commit/
165b738265e266e236b3b0d53bbe0af58a2ffa76
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
Ivailo Monev [Mon, 25 Jan 2016 16:19:14 +0000 (18:19 +0200)]
redefinition of QVariant::Type
upstream commits:
https://github.com/qtproject/qtbase/commit/
79923f5b32f0e0b745d5465d73fe13c43bcbbd41
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
OSDN Git Service
