Go to file
Morten Johan Sørvig c8d696eee7 Fix static builds on Mac.
QMacPasteboardMime is a public class in Qt 4. Qt 5 has
two copies, one public QtMacExtras and an internal
one in the cocoa plugin. This causes a symbol collision
when building statically.

Rename the internal copy to QMacInternalPasteboardMime.

Task-number: QTBUG-35310
Change-Id: I891787b451a0b342ed85aa7196e606bc11623e21
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
2013-12-18 20:28:37 +01:00
bin Merge "Merge remote-tracking branch 'origin/release' into stable" into refs/staging/stable 2013-06-15 22:39:25 +02:00
config.tests Revert "Move the glxfbconfig configtest to qpa and rename it to glx" 2013-12-07 21:17:07 +01:00
dist Update ChangeLog with new QImage formats 2013-12-06 11:32:16 +01:00
doc Doc: solved link problem for dombookmarks.qdoc 2013-12-16 19:29:52 +01:00
examples Doc: solved link problem for dombookmarks.qdoc 2013-12-16 19:29:52 +01:00
lib
mkspecs Add mkspec for clang using libc++ on Linux. 2013-12-09 22:23:59 +01:00
qmake Merge remote-tracking branch 'origin/release' into stable 2013-12-05 17:42:33 +01:00
src Fix static builds on Mac. 2013-12-18 20:28:37 +01:00
tests Use the short time format of the current locale on Windows 2013-12-16 22:26:37 +01:00
tools do not embed manifests into Qt plugins by default 2013-11-26 11:22:17 +01:00
util Remove empty QAccessible2 header 2013-11-20 15:11:24 +01:00
.gitattributes
.gitignore GitIgnore updates 2013-12-09 17:28:18 +01:00
.qmake.conf Enable -Werror for all of qtbase 2013-09-04 01:50:10 +02:00
.tag
configure Remove unused -sse (CFG_SSE) option 2013-12-09 17:28:18 +01:00
configure.bat get rid of syncqt wrapper scripts 2013-05-13 21:54:48 +02:00
header.BSD Update copyright year in Digia's license headers 2013-01-18 09:07:35 +01:00
header.FDL Update copyright year in Digia's license headers 2013-01-18 09:07:35 +01:00
header.LGPL Update copyright year in Digia's license headers 2013-01-18 09:07:35 +01:00
header.LGPL-ONLY Update copyright year in Digia's license headers 2013-01-18 09:07:35 +01:00
INSTALL INSTALL: Fix URL of Installing Qt documentation 2013-04-11 16:09:07 +02:00
LGPL_EXCEPTION.txt Change copyrights from Nokia to Digia 2012-09-22 19:20:11 +02:00
LICENSE.FDL
LICENSE.GPL
LICENSE.LGPL Update copyright year in Digia's license headers 2013-01-18 09:07:35 +01:00
LICENSE.PREVIEW.COMMERCIAL Update LICENSE.PREVIEW.COMMERCIAL license 2013-06-03 20:04:26 +02:00
qtbase.pro Merge remote-tracking branch 'origin/release' into stable 2013-12-05 17:42:33 +01:00
sync.profile generate qfeatures.h at build time 2013-10-29 15:37:58 +01:00