From 0f85a8da17bb110f6c39abefd4debf36864550e8 Mon Sep 17 00:00:00 2001 From: dcoppa Date: Fri, 4 Oct 2013 13:15:39 +0000 Subject: [PATCH] Maintenance update to qt-4.8.5 (plus three bugfixes from upstream via Arch Linux). Feedback from zhuk@, espie@, and Amit Kulkarni. ABI/API compatibility analysis done with abi-compliance-checker. ok espie@ (MAINTAINER) --- x11/qt4/Makefile | 22 +-- x11/qt4/distinfo | 7 +- x11/qt4/patches/patch-configure | 14 +- x11/qt4/patches/patch-mkspecs_features_qt_prf | 8 +- ...vascriptcore_JavaScriptCore_wtf_Platform_h | 8 +- .../patch-src_corelib_global_qglobal_h | 8 +- .../patch-src_dbus_qdbusintegrator_cpp | 10 +- ...atch-src_gui_dialogs_qprintdialog_unix_cpp | 42 ++++++ .../patch-src_gui_itemviews_qlistview_cpp | 8 +- ...atch-src_gui_painting_qcosmeticstroker_cpp | 126 ++++++++++++++++++ ...atch-src_gui_painting_qcosmeticstroker_p_h | 31 +++++ .../patch-src_gui_painting_qprinter_cpp | 54 ++++++++ ...atch-src_network_access_qhttpmultipart_cpp | 33 +++++ .../patch-src_network_ssl_qsslsocket_cpp | 10 +- x11/qt4/patches/patch-src_tools_moc_main_cpp | 21 ++- x11/qt4/pkg/PLIST-examples | 18 ++- x11/qt4/pkg/PLIST-html | 39 ++++-- x11/qt4/pkg/PLIST-main | 105 +++++++++++---- 18 files changed, 454 insertions(+), 110 deletions(-) create mode 100644 x11/qt4/patches/patch-src_gui_dialogs_qprintdialog_unix_cpp create mode 100644 x11/qt4/patches/patch-src_gui_painting_qcosmeticstroker_cpp create mode 100644 x11/qt4/patches/patch-src_gui_painting_qcosmeticstroker_p_h create mode 100644 x11/qt4/patches/patch-src_gui_painting_qprinter_cpp create mode 100644 x11/qt4/patches/patch-src_network_access_qhttpmultipart_cpp diff --git a/x11/qt4/Makefile b/x11/qt4/Makefile index 74bdfa46928..10c22f7f46f 100644 --- a/x11/qt4/Makefile +++ b/x11/qt4/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.114 2013/06/12 20:36:34 brad Exp $ +# $OpenBSD: Makefile,v 1.115 2013/10/04 13:15:39 dcoppa Exp $ ONLY_FOR_ARCHS = ${GCC4_ARCHS} SHARED_ONLY = Yes @@ -24,14 +24,6 @@ PKGNAME-debug = qt4-debug-${PKGVERSION} FULLPKGNAME-html = qt4-html-${PKGVERSION} FULLPKGPATH-html = ${BASE_PKGPATH},-html -REVISION-main= 7 -REVISION-mysql= 3 -REVISION-postgresql= 1 -REVISION-examples= 0 -REVISION-sqlite2= 1 -REVISION-tds= 1 -REVISION-debug= 0 - # XXX qmake include parser is bogus DPB_PROPERTIES = parallel nojunk @@ -39,7 +31,7 @@ SHARED_LIBS = Qt3Support 8.0 \ QtCore 9.0 \ QtDesigner 7.0 \ QtDesignerComponents 7.0 \ - QtGui 10.0 \ + QtGui 10.1 \ QtNetwork 9.1 \ QtOpenGL 7.0 \ QtSql 8.0 \ @@ -53,19 +45,19 @@ SHARED_LIBS = Qt3Support 8.0 \ QtHelp 1.0 \ QtXmlPatterns 0.0 \ QtScriptTools 0.0 \ - QtWebKit 2.0 \ + QtWebKit 3.0 \ phonon 4.1 \ QtDeclarative 0.0 -VERSION = 4.8.2 -PKGVERSION = 4.8.2 +VERSION = 4.8.5 +PKGVERSION = 4.8.5 DISTNAME = qt-everywhere-opensource-src-${VERSION} CATEGORIES = x11 -MASTER_SITES = http://releases.qt-project.org/qt4/source/ +MASTER_SITES = http://download.qt-project.org/official_releases/qt/4.8/${VERSION}/ -HOMEPAGE = http://qt.nokia.com/ +HOMEPAGE = http://qt-project.org/ MAINTAINER = Marc Espie diff --git a/x11/qt4/distinfo b/x11/qt4/distinfo index 537023bd301..535a5a0d62c 100644 --- a/x11/qt4/distinfo +++ b/x11/qt4/distinfo @@ -1,5 +1,2 @@ -MD5 (qt-everywhere-opensource-src-4.8.2.tar.gz) = PBFG3fViR+FngvlpEKhCOw== -RMD160 (qt-everywhere-opensource-src-4.8.2.tar.gz) = ahUHeu4ehAdjgHhxJ7gMe7l+voY= -SHA1 (qt-everywhere-opensource-src-4.8.2.tar.gz) = 4eLt7x1j7Wd9ZTTTKADC4fetDnM= -SHA256 (qt-everywhere-opensource-src-4.8.2.tar.gz) = khsqLQYJNM7aZa5GFe3sR0zqE9PIk+ffGa0SYufcI3k= -SIZE (qt-everywhere-opensource-src-4.8.2.tar.gz) = 239108331 +SHA256 (qt-everywhere-opensource-src-4.8.5.tar.gz) = 63KPgmiDHcQ3O+ZAO33V1d3gPBaa1ogvmoy1YN9qoTg= +SIZE (qt-everywhere-opensource-src-4.8.5.tar.gz) = 241491467 diff --git a/x11/qt4/patches/patch-configure b/x11/qt4/patches/patch-configure index d1deb59d248..2ed93c890f7 100644 --- a/x11/qt4/patches/patch-configure +++ b/x11/qt4/patches/patch-configure @@ -1,7 +1,7 @@ -$OpenBSD: patch-configure,v 1.24 2012/06/14 09:38:35 espie Exp $ ---- configure.orig Thu Apr 26 21:46:24 2012 -+++ configure Sun Jun 10 13:25:08 2012 -@@ -890,7 +890,7 @@ CFG_SILENT=no +$OpenBSD: patch-configure,v 1.25 2013/10/04 13:15:40 dcoppa Exp $ +--- configure.orig Fri Jun 7 07:16:41 2013 ++++ configure Fri Sep 27 10:10:55 2013 +@@ -917,7 +917,7 @@ CFG_SILENT=no CFG_GRAPHICS_SYSTEM=default CFG_RUNTIME_SYSTEM= CFG_ALSA=auto @@ -10,7 +10,7 @@ $OpenBSD: patch-configure,v 1.24 2012/06/14 09:38:35 espie Exp $ CFG_COREWLAN=auto CFG_ICD=auto CFG_NOPROCESS=no -@@ -2347,7 +2347,7 @@ while [ "$#" -gt 0 ]; do +@@ -2408,7 +2408,7 @@ while [ "$#" -gt 0 ]; do v|verbose) if [ "$VAL" = "yes" ]; then if [ "$OPT_VERBOSE" = "$VAL" ]; then # takes two verboses to turn on qmake debugs @@ -19,7 +19,7 @@ $OpenBSD: patch-configure,v 1.24 2012/06/14 09:38:35 espie Exp $ else OPT_VERBOSE=yes fi -@@ -4897,7 +4897,7 @@ if true; then ###[ '!' -f "$outpath/bin/qmake" ]; +@@ -4958,7 +4958,7 @@ if true; then ###[ '!' -f "$outpath/bin/qmake" ]; EXTRA_OBJS= EXTRA_SRCS= EXTRA_CFLAGS="\$(QMAKE_CFLAGS)" @@ -28,7 +28,7 @@ $OpenBSD: patch-configure,v 1.24 2012/06/14 09:38:35 espie Exp $ EXTRA_LFLAGS="\$(QMAKE_LFLAGS)" if [ "$PLATFORM" = "irix-cc" ] || [ "$PLATFORM" = "irix-cc-64" ]; then -@@ -4997,7 +4997,7 @@ if true; then ###[ '!' -f "$outpath/bin/qmake" ]; +@@ -5058,7 +5058,7 @@ if true; then ###[ '!' -f "$outpath/bin/qmake" ]; done QMAKE_BUILD_ERROR=no diff --git a/x11/qt4/patches/patch-mkspecs_features_qt_prf b/x11/qt4/patches/patch-mkspecs_features_qt_prf index db92dde5e58..b3a5f313d8d 100644 --- a/x11/qt4/patches/patch-mkspecs_features_qt_prf +++ b/x11/qt4/patches/patch-mkspecs_features_qt_prf @@ -1,7 +1,7 @@ -$OpenBSD: patch-mkspecs_features_qt_prf,v 1.2 2012/06/14 09:38:35 espie Exp $ ---- mkspecs/features/qt.prf.orig Thu Dec 8 06:06:02 2011 -+++ mkspecs/features/qt.prf Thu Dec 15 20:09:13 2011 -@@ -218,10 +218,10 @@ mac { +$OpenBSD: patch-mkspecs_features_qt_prf,v 1.3 2013/10/04 13:15:40 dcoppa Exp $ +--- mkspecs/features/qt.prf.orig Fri Jun 7 07:17:00 2013 ++++ mkspecs/features/qt.prf Fri Sep 27 10:10:55 2013 +@@ -229,10 +229,10 @@ unset(_QT5_MODULES_TO_IGNORE_) mmx:DEFINES += QT_HAVE_MMX 3dnow:DEFINES += QT_HAVE_3DNOW sse:DEFINES += QT_HAVE_SSE QT_HAVE_MMXEXT diff --git a/x11/qt4/patches/patch-src_3rdparty_javascriptcore_JavaScriptCore_wtf_Platform_h b/x11/qt4/patches/patch-src_3rdparty_javascriptcore_JavaScriptCore_wtf_Platform_h index 6415d799861..0bc3b7099a0 100644 --- a/x11/qt4/patches/patch-src_3rdparty_javascriptcore_JavaScriptCore_wtf_Platform_h +++ b/x11/qt4/patches/patch-src_3rdparty_javascriptcore_JavaScriptCore_wtf_Platform_h @@ -1,6 +1,6 @@ -$OpenBSD: patch-src_3rdparty_javascriptcore_JavaScriptCore_wtf_Platform_h,v 1.6 2013/01/14 22:09:43 bcallah Exp $ ---- src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h.orig Thu Apr 26 15:46:22 2012 -+++ src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h Wed Jan 9 13:47:38 2013 +$OpenBSD: patch-src_3rdparty_javascriptcore_JavaScriptCore_wtf_Platform_h,v 1.7 2013/10/04 13:15:40 dcoppa Exp $ +--- src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h.orig Fri Jun 7 07:16:58 2013 ++++ src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h Fri Sep 27 10:10:55 2013 @@ -142,6 +142,30 @@ #endif #endif @@ -44,7 +44,7 @@ $OpenBSD: patch-src_3rdparty_javascriptcore_JavaScriptCore_wtf_Platform_h,v 1.6 /* ==== OS() - underlying operating system; only to be used for mandated low-level services like virtual memory, not to choose a GUI toolkit ==== */ -@@ -884,7 +910,7 @@ +@@ -873,7 +899,7 @@ #endif #if !defined(WTF_USE_JSVALUE64) && !defined(WTF_USE_JSVALUE32) && !defined(WTF_USE_JSVALUE32_64) diff --git a/x11/qt4/patches/patch-src_corelib_global_qglobal_h b/x11/qt4/patches/patch-src_corelib_global_qglobal_h index c6d41579959..876555a7870 100644 --- a/x11/qt4/patches/patch-src_corelib_global_qglobal_h +++ b/x11/qt4/patches/patch-src_corelib_global_qglobal_h @@ -1,7 +1,7 @@ -$OpenBSD: patch-src_corelib_global_qglobal_h,v 1.15 2012/06/14 09:38:35 espie Exp $ ---- src/corelib/global/qglobal.h.orig Thu Apr 26 21:46:08 2012 -+++ src/corelib/global/qglobal.h Sun Jun 10 13:25:08 2012 -@@ -2336,7 +2336,7 @@ typedef uint Flags; +$OpenBSD: patch-src_corelib_global_qglobal_h,v 1.16 2013/10/04 13:15:40 dcoppa Exp $ +--- src/corelib/global/qglobal.h.orig Fri Jun 7 07:16:52 2013 ++++ src/corelib/global/qglobal.h Fri Sep 27 10:10:56 2013 +@@ -2359,7 +2359,7 @@ typedef uint Flags; #endif /* Q_NO_TYPESAFE_FLAGS */ diff --git a/x11/qt4/patches/patch-src_dbus_qdbusintegrator_cpp b/x11/qt4/patches/patch-src_dbus_qdbusintegrator_cpp index 801769b1dba..e7007161820 100644 --- a/x11/qt4/patches/patch-src_dbus_qdbusintegrator_cpp +++ b/x11/qt4/patches/patch-src_dbus_qdbusintegrator_cpp @@ -1,11 +1,11 @@ -$OpenBSD: patch-src_dbus_qdbusintegrator_cpp,v 1.2 2012/06/14 09:38:35 espie Exp $ +$OpenBSD: patch-src_dbus_qdbusintegrator_cpp,v 1.3 2013/10/04 13:15:40 dcoppa Exp $ Fixes an invalid conversion error on sparc64. -http://bugreports.qt.nokia.com/browse/QTBUG-17962 +https://bugreports.qt-project.org/browse/QTBUG-17962 ---- src/dbus/qdbusintegrator.cpp.orig Thu Dec 8 06:06:03 2011 -+++ src/dbus/qdbusintegrator.cpp Thu Dec 15 20:11:04 2011 -@@ -72,7 +72,7 @@ QT_BEGIN_NAMESPACE +--- src/dbus/qdbusintegrator.cpp.orig Fri Jun 7 07:16:52 2013 ++++ src/dbus/qdbusintegrator.cpp Fri Sep 27 10:10:56 2013 +@@ -73,7 +73,7 @@ QT_BEGIN_NAMESPACE static bool isDebugging; #define qDBusDebug if (!::isDebugging); else qDebug diff --git a/x11/qt4/patches/patch-src_gui_dialogs_qprintdialog_unix_cpp b/x11/qt4/patches/patch-src_gui_dialogs_qprintdialog_unix_cpp new file mode 100644 index 00000000000..55d7b321d0c --- /dev/null +++ b/x11/qt4/patches/patch-src_gui_dialogs_qprintdialog_unix_cpp @@ -0,0 +1,42 @@ +$OpenBSD: patch-src_gui_dialogs_qprintdialog_unix_cpp,v 1.6 2013/10/04 13:15:40 dcoppa Exp $ + +Improve CUPS support. + +https://bugreports.qt-project.org/browse/QTBUG-6433 +https://bugs.kde.org/show_bug.cgi?id=180051 + +--- src/gui/dialogs/qprintdialog_unix.cpp.orig Fri Jun 7 07:16:59 2013 ++++ src/gui/dialogs/qprintdialog_unix.cpp Fri Sep 27 10:29:54 2013 +@@ -579,6 +579,32 @@ void QPrintDialogPrivate::setTabs(const QListsetEnabled(cups && cups->ppdOption("Duplex")); ++ ++ if (cups) { ++ const ppd_option_t* duplex = cups->ppdOption("Duplex"); ++ if (duplex) { ++ // copy default ppd duplex to qt dialog ++ if (qstrcmp(duplex->defchoice, "DuplexTumble") == 0) ++ options.duplexShort->setChecked(true); ++ else if (qstrcmp(duplex->defchoice, "DuplexNoTumble") == 0) ++ options.duplexLong->setChecked(true); ++ else ++ options.noDuplex->setChecked(true); ++ } ++ ++ if (cups->currentPPD()) { ++ // set default color ++ if (cups->currentPPD()->color_device) ++ options.color->setChecked(true); ++ else ++ options.grayscale->setChecked(true); ++ } ++ ++ // set collation ++ const ppd_option_t *collate = cups->ppdOption("Collate"); ++ if (collate) ++ options.collate->setChecked(qstrcmp(collate->defchoice, "True")==0); ++ } + } + #endif + diff --git a/x11/qt4/patches/patch-src_gui_itemviews_qlistview_cpp b/x11/qt4/patches/patch-src_gui_itemviews_qlistview_cpp index 3fbb00e2600..a25b211395b 100644 --- a/x11/qt4/patches/patch-src_gui_itemviews_qlistview_cpp +++ b/x11/qt4/patches/patch-src_gui_itemviews_qlistview_cpp @@ -1,7 +1,7 @@ -$OpenBSD: patch-src_gui_itemviews_qlistview_cpp,v 1.3 2012/06/14 09:38:35 espie Exp $ ---- src/gui/itemviews/qlistview.cpp.orig Thu Dec 8 06:06:02 2011 -+++ src/gui/itemviews/qlistview.cpp Thu Dec 15 20:11:04 2011 -@@ -2907,7 +2907,8 @@ void QIconModeViewBase::doDynamicLayout(const QListVie +$OpenBSD: patch-src_gui_itemviews_qlistview_cpp,v 1.4 2013/10/04 13:15:40 dcoppa Exp $ +--- src/gui/itemviews/qlistview.cpp.orig Fri Jun 7 07:16:59 2013 ++++ src/gui/itemviews/qlistview.cpp Fri Sep 27 10:10:56 2013 +@@ -2921,7 +2921,8 @@ void QIconModeViewBase::doDynamicLayout(const QListVie if (moved.count() != items.count()) moved.resize(items.count()); diff --git a/x11/qt4/patches/patch-src_gui_painting_qcosmeticstroker_cpp b/x11/qt4/patches/patch-src_gui_painting_qcosmeticstroker_cpp new file mode 100644 index 00000000000..87cc9b626af --- /dev/null +++ b/x11/qt4/patches/patch-src_gui_painting_qcosmeticstroker_cpp @@ -0,0 +1,126 @@ +$OpenBSD: patch-src_gui_painting_qcosmeticstroker_cpp,v 1.1 2013/10/04 13:15:40 dcoppa Exp $ + +From 2a6537f0629aaff53a42d993ad94ad4de3cd3030 Mon Sep 17 00:00:00 2001 +From: Gunnar Sletta +Date: Thu, 4 Jul 2013 16:20:40 +1000 +Subject: [PATCH] Fix drawing of 0-width polylines from outside the devicerect. + +This was broken by a previous fix which aimed to fix gaps in +polylines with tiny line segments. The result was that we +skipped updating the origin point when stroke() didn't produce +pixels which accidentally included the case of the line +being completely outside the deviceRect. I fixed this +by returning the value of clipLine in drawLine to the caller +so we could still update the origin for this case. + +Task-number: QTBUG-31579 +Change-Id: Iac29436f042da7658bbeaf9370351dc6f2c95065 +(cherry picked from qtbase/900cccfd459fcbdbc4aa3d313afe12cfbf68fd87) +Reviewed-by: Gunnar Sletta + +--- src/gui/painting/qcosmeticstroker.cpp.orig Fri Jun 7 07:16:59 2013 ++++ src/gui/painting/qcosmeticstroker.cpp Fri Sep 27 10:37:52 2013 +@@ -133,10 +133,15 @@ struct NoDasher { + + }; + ++/* ++ * The return value is the result of the clipLine() call performed at the start ++ * of each of the two functions, aka "false" means completely outside the devices ++ * rect. ++ */ + template +-static void drawLine(QCosmeticStroker *stroker, qreal x1, qreal y1, qreal x2, qreal y2, int caps); ++static bool drawLine(QCosmeticStroker *stroker, qreal x1, qreal y1, qreal x2, qreal y2, int caps); + template +-static void drawLineAA(QCosmeticStroker *stroker, qreal x1, qreal y1, qreal x2, qreal y2, int caps); ++static bool drawLineAA(QCosmeticStroker *stroker, qreal x1, qreal y1, qreal x2, qreal y2, int caps); + + inline void drawPixel(QCosmeticStroker *stroker, int x, int y, int coverage) + { +@@ -602,17 +607,20 @@ void QCosmeticStroker::drawPath(const QVectorPath &pat + caps |= CapEnd; + + QCosmeticStroker::Point last = this->lastPixel; +- stroke(this, p.x(), p.y(), p2.x(), p2.y(), caps); ++ bool unclipped = stroke(this, p.x(), p.y(), p2.x(), p2.y(), caps); + + /* fix for gaps in polylines with fastpen and aliased in a sequence + of points with small distances: if current point p2 has been dropped +- out, keep last non dropped point p. */ +- if (fastPenAliased) { +- if (last.x != lastPixel.x || last.y != lastPixel.y || +- points == begin + 2 || points == end - 2 ) { +- { +- p = p2; +- } ++ out, keep last non dropped point p. ++ ++ However, if the line was completely outside the devicerect, we ++ still need to update p to avoid drawing the line after this one from ++ a bad starting position. ++ */ ++ if (fastPenAliased && unclipped) { ++ if (last.x != lastPixel.x || last.y != lastPixel.y ++ || points == begin + 2 || points == end - 2) { ++ p = p2; + } + } else { + p = p2; +@@ -720,10 +728,10 @@ static inline void capAdjust(int caps, int &x1, int &x + the drawing shifts from horizontal to vertical or back. + */ + template +-static void drawLine(QCosmeticStroker *stroker, qreal rx1, qreal ry1, qreal rx2, qreal ry2, int caps) ++static bool drawLine(QCosmeticStroker *stroker, qreal rx1, qreal ry1, qreal rx2, qreal ry2, int caps) + { + if (stroker->clipLine(rx1, ry1, rx2, ry2)) +- return; ++ return false; + + static const int half = 31; + int x1 = toF26Dot6(rx1) + half; +@@ -813,7 +821,7 @@ static void drawLine(QCosmeticStroker *stroker, qreal + } else { + // horizontal + if (!dx) +- return; ++ return true; + + QCosmeticStroker::Direction dir = QCosmeticStroker::LeftToRight; + +@@ -886,14 +894,15 @@ static void drawLine(QCosmeticStroker *stroker, qreal + } + } + stroker->lastPixel = last; ++ return true; + } + + + template +-static void drawLineAA(QCosmeticStroker *stroker, qreal rx1, qreal ry1, qreal rx2, qreal ry2, int caps) ++static bool drawLineAA(QCosmeticStroker *stroker, qreal rx1, qreal ry1, qreal rx2, qreal ry2, int caps) + { + if (stroker->clipLine(rx1, ry1, rx2, ry2)) +- return; ++ return false; + + int x1 = toF26Dot6(rx1); + int y1 = toF26Dot6(ry1); +@@ -967,7 +976,7 @@ static void drawLineAA(QCosmeticStroker *stroker, qrea + } else { + // horizontal + if (!dx) +- return; ++ return true; + + int yinc = F16Dot16FixedDiv(dy, dx); + +@@ -1029,6 +1038,7 @@ static void drawLineAA(QCosmeticStroker *stroker, qrea + drawPixel(stroker, x, (y>>16) + 1, alpha * alphaEnd >> 6); + } + } ++ return true; + } + + QT_END_NAMESPACE diff --git a/x11/qt4/patches/patch-src_gui_painting_qcosmeticstroker_p_h b/x11/qt4/patches/patch-src_gui_painting_qcosmeticstroker_p_h new file mode 100644 index 00000000000..5c6b6125218 --- /dev/null +++ b/x11/qt4/patches/patch-src_gui_painting_qcosmeticstroker_p_h @@ -0,0 +1,31 @@ +$OpenBSD: patch-src_gui_painting_qcosmeticstroker_p_h,v 1.1 2013/10/04 13:15:40 dcoppa Exp $ + +From 2a6537f0629aaff53a42d993ad94ad4de3cd3030 Mon Sep 17 00:00:00 2001 +From: Gunnar Sletta +Date: Thu, 4 Jul 2013 16:20:40 +1000 +Subject: [PATCH] Fix drawing of 0-width polylines from outside the devicerect. + +This was broken by a previous fix which aimed to fix gaps in +polylines with tiny line segments. The result was that we +skipped updating the origin point when stroke() didn't produce +pixels which accidentally included the case of the line +being completely outside the deviceRect. I fixed this +by returning the value of clipLine in drawLine to the caller +so we could still update the origin for this case. + +Task-number: QTBUG-31579 +Change-Id: Iac29436f042da7658bbeaf9370351dc6f2c95065 +(cherry picked from qtbase/900cccfd459fcbdbc4aa3d313afe12cfbf68fd87) +Reviewed-by: Gunnar Sletta + +--- src/gui/painting/qcosmeticstroker_p.h.orig Fri Jun 7 07:16:59 2013 ++++ src/gui/painting/qcosmeticstroker_p.h Fri Sep 27 10:37:52 2013 +@@ -56,7 +56,7 @@ QT_MODULE(Gui) + class QCosmeticStroker; + + +-typedef void (*StrokeLine)(QCosmeticStroker *stroker, qreal x1, qreal y1, qreal x2, qreal y2, int caps); ++typedef bool (*StrokeLine)(QCosmeticStroker *stroker, qreal x1, qreal y1, qreal x2, qreal y2, int caps); + + class QCosmeticStroker + { diff --git a/x11/qt4/patches/patch-src_gui_painting_qprinter_cpp b/x11/qt4/patches/patch-src_gui_painting_qprinter_cpp new file mode 100644 index 00000000000..dfc0a285ae6 --- /dev/null +++ b/x11/qt4/patches/patch-src_gui_painting_qprinter_cpp @@ -0,0 +1,54 @@ +$OpenBSD: patch-src_gui_painting_qprinter_cpp,v 1.1 2013/10/04 13:15:41 dcoppa Exp $ + +Improve CUPS support. + +https://bugreports.qt-project.org/browse/QTBUG-6433 +https://bugs.kde.org/show_bug.cgi?id=180051 + +--- src/gui/painting/qprinter.cpp.orig Fri Jun 7 07:16:59 2013 ++++ src/gui/painting/qprinter.cpp Fri Sep 27 10:29:54 2013 +@@ -609,6 +609,44 @@ QPrinter::QPrinter(PrinterMode mode) + && d_ptr->paintEngine->type() != QPaintEngine::MacPrinter) { + setOutputFormat(QPrinter::PdfFormat); + } ++ ++#if !defined(QT_NO_CUPS) && !defined(QT_NO_LIBRARY) ++ // fill in defaults from ppd file ++ QCUPSSupport cups; ++ ++ int printernum = -1; ++ for (int i = 0; i < cups.availablePrintersCount(); i++) { ++ if (printerName().toLocal8Bit() == cups.availablePrinters()[i].name) ++ printernum = i; ++ } ++ if (printernum >= 0) { ++ cups.setCurrentPrinter(printernum); ++ ++ const ppd_option_t* duplex = cups.ppdOption("Duplex"); ++ if (duplex) { ++ // copy default ppd duplex to qt dialog ++ if (qstrcmp(duplex->defchoice, "DuplexTumble") == 0) ++ setDuplex(DuplexShortSide); ++ else if (qstrcmp(duplex->defchoice, "DuplexNoTumble") == 0) ++ setDuplex(DuplexLongSide); ++ else ++ setDuplex(DuplexNone); ++ } ++ ++ if (cups.currentPPD()) { ++ // set default color ++ if (cups.currentPPD()->color_device) ++ setColorMode(Color); ++ else ++ setColorMode(GrayScale); ++ } ++ ++ // set collation ++ const ppd_option_t *collate = cups.ppdOption("Collate"); ++ if (collate) ++ setCollateCopies(qstrcmp(collate->defchoice, "True")==0); ++ } ++#endif + } + + /*! diff --git a/x11/qt4/patches/patch-src_network_access_qhttpmultipart_cpp b/x11/qt4/patches/patch-src_network_access_qhttpmultipart_cpp new file mode 100644 index 00000000000..e6cbbf1302d --- /dev/null +++ b/x11/qt4/patches/patch-src_network_access_qhttpmultipart_cpp @@ -0,0 +1,33 @@ +$OpenBSD: patch-src_network_access_qhttpmultipart_cpp,v 1.1 2013/10/04 13:15:41 dcoppa Exp $ + +From 1f40ed553e618c3b0511c7db4b4fd26c2d2b65bf Mon Sep 17 00:00:00 2001 +From: Peter Hartmann +Date: Thu, 25 Jul 2013 12:05:29 -0400 +Subject: [PATCH] QHttpMultiPart: fix data corruption in readData method + +When readData() is called repeatedly, we need to keep track which +part of the multipart message we are currently reading from. +Hereby we also need to take the boundary size into account, and not +only the size of the multipart; otherwise we would skip a not +completely read part. This would then later lead to advancing the +read pointer by negative indexes and data loss. + +Task-number: QTBUG-32534 +Change-Id: Ibb6dff16adaf4ea67181d23d1d0c8459e33a0ed0 +Reviewed-by: Jonathan Liu +Reviewed-by: Shane Kearns +(cherry picked from qtbase/af96c6fed931564c95037539f07e9c8e33c69529) +Reviewed-by: Thiago Macieira + +--- src/network/access/qhttpmultipart.cpp.orig Fri Jun 7 07:17:00 2013 ++++ src/network/access/qhttpmultipart.cpp Fri Sep 27 10:43:09 2013 +@@ -488,7 +488,8 @@ qint64 QHttpMultiPartIODevice::readData(char *data, qi + + // skip the parts we have already read + while (index < multiPart->parts.count() && +- readPointer >= partOffsets.at(index) + multiPart->parts.at(index).d->size()) ++ readPointer >= partOffsets.at(index) + multiPart->parts.at(index).d->size() ++ + multiPart->boundary.count() + 6) // 6 == 2 boundary dashes, \r\n after boundary, \r\n after multipart + index++; + + // read the data diff --git a/x11/qt4/patches/patch-src_network_ssl_qsslsocket_cpp b/x11/qt4/patches/patch-src_network_ssl_qsslsocket_cpp index c4e72008b70..51cf5dd417e 100644 --- a/x11/qt4/patches/patch-src_network_ssl_qsslsocket_cpp +++ b/x11/qt4/patches/patch-src_network_ssl_qsslsocket_cpp @@ -1,10 +1,10 @@ -$OpenBSD: patch-src_network_ssl_qsslsocket_cpp,v 1.1 2013/03/08 18:12:38 zhuk Exp $ ---- src/network/ssl/qsslsocket.cpp.orig Thu Mar 7 22:40:46 2013 -+++ src/network/ssl/qsslsocket.cpp Thu Mar 7 22:42:09 2013 -@@ -2305,7 +2305,8 @@ QList QSslSocketPrivate::unixRootCertDirec - << "/usr/local/ssl/" // Normal OpenSSL Tarball +$OpenBSD: patch-src_network_ssl_qsslsocket_cpp,v 1.2 2013/10/04 13:15:41 dcoppa Exp $ +--- src/network/ssl/qsslsocket.cpp.orig Fri Jun 7 07:17:00 2013 ++++ src/network/ssl/qsslsocket.cpp Fri Sep 27 10:13:05 2013 +@@ -2325,7 +2325,8 @@ QList QSslSocketPrivate::unixRootCertDirec << "/var/ssl/certs/" // AIX << "/usr/local/ssl/certs/" // Solaris + << "/etc/openssl/certs/" // BlackBerry - << "/opt/openssl/certs/"; // HP-UX + << "/opt/openssl/certs/" // HP-UX + << "/etc/ssl/"; // OpenBSD diff --git a/x11/qt4/patches/patch-src_tools_moc_main_cpp b/x11/qt4/patches/patch-src_tools_moc_main_cpp index 2f363b45122..1699b82835c 100644 --- a/x11/qt4/patches/patch-src_tools_moc_main_cpp +++ b/x11/qt4/patches/patch-src_tools_moc_main_cpp @@ -1,4 +1,4 @@ -$OpenBSD: patch-src_tools_moc_main_cpp,v 1.2 2013/03/16 08:44:55 brad Exp $ +$OpenBSD: patch-src_tools_moc_main_cpp,v 1.3 2013/10/04 13:15:41 dcoppa Exp $ Workaround moc's inability to properly parse C++ macros within some of Boost's headers. This issue may come up again with other @@ -7,18 +7,13 @@ C++ parser from Qt5's moc has been fixed. https://bugreports.qt-project.org/browse/QTBUG-22829 ---- src/tools/moc/main.cpp.orig Wed Mar 13 11:20:37 2013 -+++ src/tools/moc/main.cpp Wed Mar 13 11:22:12 2013 -@@ -187,6 +187,12 @@ int runMoc(int _argc, char **_argv) - Moc moc; - pp.macros["Q_MOC_RUN"]; - pp.macros["__cplusplus"]; -+ -+ // http://pkgs.fedoraproject.org/cgit/qt.git/commit/?id=22f92f680b88a10f179eaa121b367446a6c80f7a -+ -+ pp.macros["BOOST_TT_HAS_OPERATOR_HPP_INCLUDED"]; +--- src/tools/moc/main.cpp.orig Fri Jun 7 07:17:00 2013 ++++ src/tools/moc/main.cpp Fri Sep 27 10:15:15 2013 +@@ -190,6 +190,7 @@ int runMoc(int _argc, char **_argv) + + // Workaround a bug while parsing the boost/type_traits/has_operator.hpp header. See QTBUG-22829 + pp.macros["BOOST_TT_HAS_OPERATOR_HPP_INCLUDED"]; + pp.macros["BOOST_LEXICAL_CAST_INCLUDED"]; -+ + QByteArray filename; QByteArray output; - FILE *in = 0; diff --git a/x11/qt4/pkg/PLIST-examples b/x11/qt4/pkg/PLIST-examples index 524b71218fc..fbce50c794c 100644 --- a/x11/qt4/pkg/PLIST-examples +++ b/x11/qt4/pkg/PLIST-examples @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST-examples,v 1.28 2012/06/14 09:38:36 espie Exp $ +@comment $OpenBSD: PLIST-examples,v 1.29 2013/10/04 13:15:41 dcoppa Exp $ @conflict qt4-<=4.2.2 bin/pixeltool bin/qtdemo @@ -2107,6 +2107,10 @@ lib/qt4/examples/declarative/ui-components/spinner/ lib/qt4/examples/declarative/ui-components/spinner/main.cpp lib/qt4/examples/declarative/ui-components/spinner/qml/ lib/qt4/examples/declarative/ui-components/spinner/qml/spinner/ +lib/qt4/examples/declarative/ui-components/spinner/qml/spinner/content/ +lib/qt4/examples/declarative/ui-components/spinner/qml/spinner/content/Spinner.qml +lib/qt4/examples/declarative/ui-components/spinner/qml/spinner/content/spinner-bg.png +lib/qt4/examples/declarative/ui-components/spinner/qml/spinner/content/spinner-select.png lib/qt4/examples/declarative/ui-components/spinner/qml/spinner/main.qml @bin lib/qt4/examples/declarative/ui-components/spinner/spinner lib/qt4/examples/declarative/ui-components/spinner/spinner.pro @@ -3012,6 +3016,18 @@ lib/qt4/examples/mainwindows/application/images/save.png lib/qt4/examples/mainwindows/application/main.cpp lib/qt4/examples/mainwindows/application/mainwindow.cpp lib/qt4/examples/mainwindows/application/mainwindow.h +lib/qt4/examples/mainwindows/dockwidgets/ +@bin lib/qt4/examples/mainwindows/dockwidgets/dockwidgets +lib/qt4/examples/mainwindows/dockwidgets/dockwidgets.pro +lib/qt4/examples/mainwindows/dockwidgets/dockwidgets.qrc +lib/qt4/examples/mainwindows/dockwidgets/images/ +lib/qt4/examples/mainwindows/dockwidgets/images/new.png +lib/qt4/examples/mainwindows/dockwidgets/images/print.png +lib/qt4/examples/mainwindows/dockwidgets/images/save.png +lib/qt4/examples/mainwindows/dockwidgets/images/undo.png +lib/qt4/examples/mainwindows/dockwidgets/main.cpp +lib/qt4/examples/mainwindows/dockwidgets/mainwindow.cpp +lib/qt4/examples/mainwindows/dockwidgets/mainwindow.h lib/qt4/examples/mainwindows/mainwindows.pro lib/qt4/examples/mainwindows/mdi/ lib/qt4/examples/mainwindows/mdi/images/ diff --git a/x11/qt4/pkg/PLIST-html b/x11/qt4/pkg/PLIST-html index 7677075eb75..326a13d11b1 100644 --- a/x11/qt4/pkg/PLIST-html +++ b/x11/qt4/pkg/PLIST-html @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST-html,v 1.28 2012/06/14 09:38:36 espie Exp $ +@comment $OpenBSD: PLIST-html,v 1.29 2013/10/04 13:15:41 dcoppa Exp $ share/doc/qt4/html/ share/doc/qt4/html/3rdparty.html share/doc/qt4/html/abstractwidgets.html @@ -822,6 +822,7 @@ share/doc/qt4/html/declarative-ui-components-slideswitch-slideswitch-qmlproject. share/doc/qt4/html/declarative-ui-components-slideswitch-slideswitch-svg.html share/doc/qt4/html/declarative-ui-components-slideswitch.html share/doc/qt4/html/declarative-ui-components-spinner-main-cpp.html +share/doc/qt4/html/declarative-ui-components-spinner-qml-spinner-content-spinner-qml.html share/doc/qt4/html/declarative-ui-components-spinner-qml-spinner-main-qml.html share/doc/qt4/html/declarative-ui-components-spinner-spinner-pro.html share/doc/qt4/html/declarative-ui-components-spinner-spinner-qmlproject.html @@ -1897,7 +1898,6 @@ share/doc/qt4/html/images/appicon_packagecontents.png share/doc/qt4/html/images/appicon_screenshot.png share/doc/qt4/html/images/application-menus.png share/doc/qt4/html/images/application.png -share/doc/qt4/html/images/arrow_bc.png share/doc/qt4/html/images/arrow_down.png share/doc/qt4/html/images/arthurplugin-demo.png share/doc/qt4/html/images/assistant-address-toolbar.png @@ -1923,12 +1923,16 @@ share/doc/qt4/html/images/basicsortfiltermodel-example.png share/doc/qt4/html/images/bearercloud-example.png share/doc/qt4/html/images/bearermonitor-example.png share/doc/qt4/html/images/bearings.png -share/doc/qt4/html/images/bgrContent.png +share/doc/qt4/html/images/bg_l.png +share/doc/qt4/html/images/bg_l_blank.png +share/doc/qt4/html/images/bg_ll_blank.png +share/doc/qt4/html/images/bg_r.png +share/doc/qt4/html/images/bg_ul_blank.png share/doc/qt4/html/images/blockingfortuneclient-example.png -share/doc/qt4/html/images/blu_dot.png share/doc/qt4/html/images/blurpickereffect-example.png share/doc/qt4/html/images/books-demo.png share/doc/qt4/html/images/borderlayout-example.png +share/doc/qt4/html/images/box_bg.png share/doc/qt4/html/images/boxes-demo.png share/doc/qt4/html/images/branchindicatorimage.png share/doc/qt4/html/images/breadcrumb.png @@ -1937,8 +1941,8 @@ share/doc/qt4/html/images/broadcastsender-example.png share/doc/qt4/html/images/browser-demo.png share/doc/qt4/html/images/brush-outline.png share/doc/qt4/html/images/brush-styles.png -share/doc/qt4/html/images/btn_next.png -share/doc/qt4/html/images/btn_prev.png +share/doc/qt4/html/images/btn_next_green.png +share/doc/qt4/html/images/btn_prev_green.png share/doc/qt4/html/images/bullet_dn.png share/doc/qt4/html/images/bullet_gt.png share/doc/qt4/html/images/bullet_sq.png @@ -2292,6 +2296,7 @@ share/doc/qt4/html/images/factorial-example.png share/doc/qt4/html/images/fademessageeffect-example-faded.png share/doc/qt4/html/images/fademessageeffect-example.png share/doc/qt4/html/images/fancybrowser-example.png +share/doc/qt4/html/images/feedbackground.png share/doc/qt4/html/images/fetchmore-example.png share/doc/qt4/html/images/filedialogurls.png share/doc/qt4/html/images/filetree_1-example.png @@ -2385,19 +2390,16 @@ share/doc/qt4/html/images/gtk-toolbox.png share/doc/qt4/html/images/gtk-toolbutton.png share/doc/qt4/html/images/gtk-treeview.png share/doc/qt4/html/images/header.png +share/doc/qt4/html/images/header_bg.png share/doc/qt4/html/images/headerimage.png share/doc/qt4/html/images/hellogl-es-example.png share/doc/qt4/html/images/hellogl-example.png -share/doc/qt4/html/images/home.png share/doc/qt4/html/images/horBar.png share/doc/qt4/html/images/horizontalpositioner_example.png share/doc/qt4/html/images/hoverevents.png share/doc/qt4/html/images/http-example.png share/doc/qt4/html/images/httpstack.png share/doc/qt4/html/images/i18n-example.png -share/doc/qt4/html/images/ico_note.png -share/doc/qt4/html/images/ico_note_attention.png -share/doc/qt4/html/images/ico_out.png share/doc/qt4/html/images/icon.png share/doc/qt4/html/images/icons-example.png share/doc/qt4/html/images/icons-view-menu.png @@ -2629,6 +2631,8 @@ share/doc/qt4/html/images/orientation-portrait-ui.png share/doc/qt4/html/images/orientation-portrait.png share/doc/qt4/html/images/overpainting-example.png share/doc/qt4/html/images/padnavigator-example.png +share/doc/qt4/html/images/page.png +share/doc/qt4/html/images/page_bg.png share/doc/qt4/html/images/painterpaths-example.png share/doc/qt4/html/images/painting-examples.png share/doc/qt4/html/images/paintsystem-antialiasing.png @@ -3077,7 +3081,6 @@ share/doc/qt4/html/images/qurl-querystring.png share/doc/qt4/html/images/qvbox-m.png share/doc/qt4/html/images/qvboxlayout-with-5-children.png share/doc/qt4/html/images/qwebview-diagram.png -share/doc/qt4/html/images/qwebview-url.png share/doc/qt4/html/images/qwindowsstyle.png share/doc/qt4/html/images/qwindowsxpstyle.png share/doc/qt4/html/images/qwsserver_keyboardfilter.png @@ -3200,6 +3203,7 @@ share/doc/qt4/html/images/spinbox.png share/doc/qt4/html/images/spinboxdelegate-example.png share/doc/qt4/html/images/spinboxes-example.png share/doc/qt4/html/images/spinboximage.png +share/doc/qt4/html/images/spinner.gif share/doc/qt4/html/images/spreadsheet-demo.png share/doc/qt4/html/images/sprites-combined.png share/doc/qt4/html/images/sql-examples.png @@ -7341,6 +7345,10 @@ share/doc/qt4/html/script-qstetrix.html share/doc/qt4/html/script.html share/doc/qt4/html/scripting.html share/doc/qt4/html/scripts/ +share/doc/qt4/html/scripts/functions.js +share/doc/qt4/html/scripts/jquery.js +share/doc/qt4/html/scripts/narrow.js +share/doc/qt4/html/scripts/superfish.js share/doc/qt4/html/session.html share/doc/qt4/html/shadow-builds-wince.html share/doc/qt4/html/shared.html @@ -7431,7 +7439,12 @@ share/doc/qt4/html/statemachine.html share/doc/qt4/html/string-processing.html share/doc/qt4/html/style/ share/doc/qt4/html/style-reference.html -share/doc/qt4/html/style/offline.css +share/doc/qt4/html/style/narrow.css +share/doc/qt4/html/style/style.css +share/doc/qt4/html/style/style_ie6.css +share/doc/qt4/html/style/style_ie7.css +share/doc/qt4/html/style/style_ie8.css +share/doc/qt4/html/style/superfish.css share/doc/qt4/html/stylesheet-customizing.html share/doc/qt4/html/stylesheet-designer.html share/doc/qt4/html/stylesheet-examples.html @@ -7440,7 +7453,6 @@ share/doc/qt4/html/stylesheet-syntax.html share/doc/qt4/html/stylesheet.html share/doc/qt4/html/supported-platforms.html share/doc/qt4/html/symbian-platform-security-requirements.html -share/doc/qt4/html/symbian-support.html share/doc/qt4/html/symbian-with-qt-introduction.html share/doc/qt4/html/symbianexceptionsafety.html share/doc/qt4/html/technology-apis.html @@ -9549,7 +9561,6 @@ share/doc/qt4/src/images/qurl-querystring.png share/doc/qt4/src/images/qvbox-m.png share/doc/qt4/src/images/qvboxlayout-with-5-children.png share/doc/qt4/src/images/qwebview-diagram.png -share/doc/qt4/src/images/qwebview-url.png share/doc/qt4/src/images/qwindowsstyle.png share/doc/qt4/src/images/qwindowsxpstyle.png share/doc/qt4/src/images/qwsserver_keyboardfilter.png diff --git a/x11/qt4/pkg/PLIST-main b/x11/qt4/pkg/PLIST-main index bb7613d0fe6..11eca0331d9 100644 --- a/x11/qt4/pkg/PLIST-main +++ b/x11/qt4/pkg/PLIST-main @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST-main,v 1.31 2012/06/14 09:38:36 espie Exp $ +@comment $OpenBSD: PLIST-main,v 1.32 2013/10/04 13:15:41 dcoppa Exp $ @pkgpath x11/qt4 @pkgpath x11/qt4,-phonon @pkgpath x11/qt4,-sqlite @@ -448,6 +448,7 @@ include/X11/qt4/Qt/qlist.h include/X11/qt4/Qt/qlistview.h include/X11/qt4/Qt/qlistwidget.h include/X11/qt4/Qt/qlocale.h +include/X11/qt4/Qt/qlocale_blackberry.h include/X11/qt4/Qt/qlocalserver.h include/X11/qt4/Qt/qlocalsocket.h include/X11/qt4/Qt/qmaccocoaviewcontainer_mac.h @@ -1132,6 +1133,7 @@ include/X11/qt4/QtCore/QAnimationGroup include/X11/qt4/QtCore/QArgument include/X11/qt4/QtCore/QAtomicInt include/X11/qt4/QtCore/QAtomicPointer +include/X11/qt4/QtCore/QBBSystemLocaleData include/X11/qt4/QtCore/QBasicAtomicInt include/X11/qt4/QtCore/QBasicAtomicPointer include/X11/qt4/QtCore/QBasicTimer @@ -1478,6 +1480,7 @@ include/X11/qt4/QtCore/qline.h include/X11/qt4/QtCore/qlinkedlist.h include/X11/qt4/QtCore/qlist.h include/X11/qt4/QtCore/qlocale.h +include/X11/qt4/QtCore/qlocale_blackberry.h include/X11/qt4/QtCore/qmap.h include/X11/qt4/QtCore/qmargins.h include/X11/qt4/QtCore/qmath.h @@ -3259,6 +3262,18 @@ lib/qt4/mkspecs/aix-xlc-64/qmake.conf lib/qt4/mkspecs/aix-xlc-64/qplatformdefs.h lib/qt4/mkspecs/aix-xlc/qmake.conf lib/qt4/mkspecs/aix-xlc/qplatformdefs.h +lib/qt4/mkspecs/blackberry-armv7le-qcc/ +lib/qt4/mkspecs/blackberry-armv7le-qcc/qmake.conf +lib/qt4/mkspecs/blackberry-armv7le-qcc/qplatformdefs.h +lib/qt4/mkspecs/blackberry-playbook-armv7le-qcc/ +lib/qt4/mkspecs/blackberry-playbook-armv7le-qcc/qmake.conf +lib/qt4/mkspecs/blackberry-playbook-armv7le-qcc/qplatformdefs.h +lib/qt4/mkspecs/blackberry-playbook-x86-qcc/ +lib/qt4/mkspecs/blackberry-playbook-x86-qcc/qmake.conf +lib/qt4/mkspecs/blackberry-playbook-x86-qcc/qplatformdefs.h +lib/qt4/mkspecs/blackberry-x86-qcc/ +lib/qt4/mkspecs/blackberry-x86-qcc/qmake.conf +lib/qt4/mkspecs/blackberry-x86-qcc/qplatformdefs.h lib/qt4/mkspecs/common/ lib/qt4/mkspecs/common/aix/ lib/qt4/mkspecs/common/aix/qplatformdefs.h @@ -3270,12 +3285,26 @@ lib/qt4/mkspecs/common/g++-base.conf lib/qt4/mkspecs/common/g++-macx.conf lib/qt4/mkspecs/common/g++-unix.conf lib/qt4/mkspecs/common/g++.conf +lib/qt4/mkspecs/common/gcc-base-ios.conf lib/qt4/mkspecs/common/gcc-base-macx.conf lib/qt4/mkspecs/common/gcc-base-unix.conf lib/qt4/mkspecs/common/gcc-base.conf lib/qt4/mkspecs/common/ghs-base-integrity.conf lib/qt4/mkspecs/common/integrity/ lib/qt4/mkspecs/common/integrity/qplatformdefs.h +lib/qt4/mkspecs/common/ios/ +lib/qt4/mkspecs/common/ios.conf +lib/qt4/mkspecs/common/ios/GLES/ +lib/qt4/mkspecs/common/ios/GLES/gl.h +lib/qt4/mkspecs/common/ios/GLES2/ +lib/qt4/mkspecs/common/ios/GLES2/gl2.h +lib/qt4/mkspecs/common/ios/arch.conf +lib/qt4/mkspecs/common/ios/clang.conf +lib/qt4/mkspecs/common/ios/g++.conf +lib/qt4/mkspecs/common/ios/llvm.conf +lib/qt4/mkspecs/common/ios/qmake.conf +lib/qt4/mkspecs/common/ios/qplatformdefs.h +lib/qt4/mkspecs/common/ios/versions.conf lib/qt4/mkspecs/common/linux.conf lib/qt4/mkspecs/common/llvm.conf lib/qt4/mkspecs/common/mac/ @@ -3342,6 +3371,7 @@ lib/qt4/mkspecs/features/declarative_debug.prf lib/qt4/mkspecs/features/default_post.prf lib/qt4/mkspecs/features/default_pre.prf lib/qt4/mkspecs/features/designer.prf +lib/qt4/mkspecs/features/device_config.prf lib/qt4/mkspecs/features/dll.prf lib/qt4/mkspecs/features/egl.prf lib/qt4/mkspecs/features/enable_backup.prf @@ -3597,22 +3627,12 @@ lib/qt4/mkspecs/openbsd-g++4/qmake.conf lib/qt4/mkspecs/openbsd-g++4/qplatformdefs.h @comment lib/qt4/mkspecs/openbsd-g++4/qplatformdefs.h.orig lib/qt4/mkspecs/qconfig.pri -lib/qt4/mkspecs/qpa/ -lib/qt4/mkspecs/qpa/common/ -lib/qt4/mkspecs/qpa/common/g++-base-macx-iphone.conf -lib/qt4/mkspecs/qpa/common/g++-base-macx-iphonedevice.conf -lib/qt4/mkspecs/qpa/macx-iphonedevice-g++/ -lib/qt4/mkspecs/qpa/macx-iphonedevice-g++-armv6/ -lib/qt4/mkspecs/qpa/macx-iphonedevice-g++-armv6/qmake.conf -lib/qt4/mkspecs/qpa/macx-iphonedevice-g++-armv6/qplatformdefs.h -lib/qt4/mkspecs/qpa/macx-iphonedevice-g++-armv7-nothumb/ -lib/qt4/mkspecs/qpa/macx-iphonedevice-g++-armv7-nothumb/qmake.conf -lib/qt4/mkspecs/qpa/macx-iphonedevice-g++-armv7-nothumb/qplatformdefs.h -lib/qt4/mkspecs/qpa/macx-iphonedevice-g++/qmake.conf -lib/qt4/mkspecs/qpa/macx-iphonedevice-g++/qplatformdefs.h -lib/qt4/mkspecs/qpa/macx-iphonesimulator-g++/ -lib/qt4/mkspecs/qpa/macx-iphonesimulator-g++/qmake.conf -lib/qt4/mkspecs/qpa/macx-iphonesimulator-g++/qplatformdefs.h +lib/qt4/mkspecs/qnx-armv7le-qcc/ +lib/qt4/mkspecs/qnx-armv7le-qcc/qmake.conf +lib/qt4/mkspecs/qnx-armv7le-qcc/qplatformdefs.h +lib/qt4/mkspecs/qnx-x86-qcc/ +lib/qt4/mkspecs/qnx-x86-qcc/qmake.conf +lib/qt4/mkspecs/qnx-x86-qcc/qplatformdefs.h lib/qt4/mkspecs/qws/ lib/qt4/mkspecs/qws/freebsd-generic-g++/ lib/qt4/mkspecs/qws/freebsd-generic-g++/qmake.conf @@ -3771,12 +3791,6 @@ lib/qt4/mkspecs/unixware-g++/ lib/qt4/mkspecs/unixware-g++/qmake.conf lib/qt4/mkspecs/unixware-g++/qplatformdefs.h lib/qt4/mkspecs/unsupported/ -lib/qt4/mkspecs/unsupported/blackberry-armv7le-qcc/ -lib/qt4/mkspecs/unsupported/blackberry-armv7le-qcc/qmake.conf -lib/qt4/mkspecs/unsupported/blackberry-armv7le-qcc/qplatformdefs.h -lib/qt4/mkspecs/unsupported/blackberry-x86-qcc/ -lib/qt4/mkspecs/unsupported/blackberry-x86-qcc/qmake.conf -lib/qt4/mkspecs/unsupported/blackberry-x86-qcc/qplatformdefs.h lib/qt4/mkspecs/unsupported/linux-armcc/ lib/qt4/mkspecs/unsupported/linux-armcc/qmake.conf lib/qt4/mkspecs/unsupported/linux-armcc/qplatformdefs.h @@ -3794,15 +3808,45 @@ lib/qt4/mkspecs/unsupported/macx-clang/Info.plist.app lib/qt4/mkspecs/unsupported/macx-clang/Info.plist.lib lib/qt4/mkspecs/unsupported/macx-clang/qmake.conf lib/qt4/mkspecs/unsupported/macx-clang/qplatformdefs.h +lib/qt4/mkspecs/unsupported/macx-iosdevice-clang/ +lib/qt4/mkspecs/unsupported/macx-iosdevice-clang-legacy/ +lib/qt4/mkspecs/unsupported/macx-iosdevice-clang-legacy/qmake.conf +lib/qt4/mkspecs/unsupported/macx-iosdevice-clang-legacy/qplatformdefs.h +lib/qt4/mkspecs/unsupported/macx-iosdevice-clang/qmake.conf +lib/qt4/mkspecs/unsupported/macx-iosdevice-clang/qplatformdefs.h +lib/qt4/mkspecs/unsupported/macx-iosdevice-g++/ +lib/qt4/mkspecs/unsupported/macx-iosdevice-g++-legacy/ +lib/qt4/mkspecs/unsupported/macx-iosdevice-g++-legacy/qmake.conf +lib/qt4/mkspecs/unsupported/macx-iosdevice-g++-legacy/qplatformdefs.h +lib/qt4/mkspecs/unsupported/macx-iosdevice-g++/qmake.conf +lib/qt4/mkspecs/unsupported/macx-iosdevice-g++/qplatformdefs.h +lib/qt4/mkspecs/unsupported/macx-iosdevice-llvm/ +lib/qt4/mkspecs/unsupported/macx-iosdevice-llvm-legacy/ +lib/qt4/mkspecs/unsupported/macx-iosdevice-llvm-legacy/qmake.conf +lib/qt4/mkspecs/unsupported/macx-iosdevice-llvm-legacy/qplatformdefs.h +lib/qt4/mkspecs/unsupported/macx-iosdevice-llvm/qmake.conf +lib/qt4/mkspecs/unsupported/macx-iosdevice-llvm/qplatformdefs.h +lib/qt4/mkspecs/unsupported/macx-iossimulator-clang/ +lib/qt4/mkspecs/unsupported/macx-iossimulator-clang-legacy/ +lib/qt4/mkspecs/unsupported/macx-iossimulator-clang-legacy/qmake.conf +lib/qt4/mkspecs/unsupported/macx-iossimulator-clang-legacy/qplatformdefs.h +lib/qt4/mkspecs/unsupported/macx-iossimulator-clang/qmake.conf +lib/qt4/mkspecs/unsupported/macx-iossimulator-clang/qplatformdefs.h +lib/qt4/mkspecs/unsupported/macx-iossimulator-g++/ +lib/qt4/mkspecs/unsupported/macx-iossimulator-g++-legacy/ +lib/qt4/mkspecs/unsupported/macx-iossimulator-g++-legacy/qmake.conf +lib/qt4/mkspecs/unsupported/macx-iossimulator-g++-legacy/qplatformdefs.h +lib/qt4/mkspecs/unsupported/macx-iossimulator-g++/qmake.conf +lib/qt4/mkspecs/unsupported/macx-iossimulator-g++/qplatformdefs.h +lib/qt4/mkspecs/unsupported/macx-iossimulator-llvm/ +lib/qt4/mkspecs/unsupported/macx-iossimulator-llvm-legacy/ +lib/qt4/mkspecs/unsupported/macx-iossimulator-llvm-legacy/qmake.conf +lib/qt4/mkspecs/unsupported/macx-iossimulator-llvm-legacy/qplatformdefs.h +lib/qt4/mkspecs/unsupported/macx-iossimulator-llvm/qmake.conf +lib/qt4/mkspecs/unsupported/macx-iossimulator-llvm/qplatformdefs.h lib/qt4/mkspecs/unsupported/qnx-X11-g++/ lib/qt4/mkspecs/unsupported/qnx-X11-g++/qmake.conf lib/qt4/mkspecs/unsupported/qnx-X11-g++/qplatformdefs.h -lib/qt4/mkspecs/unsupported/qnx-armv7le-qcc/ -lib/qt4/mkspecs/unsupported/qnx-armv7le-qcc/qmake.conf -lib/qt4/mkspecs/unsupported/qnx-armv7le-qcc/qplatformdefs.h -lib/qt4/mkspecs/unsupported/qnx-x86-qcc/ -lib/qt4/mkspecs/unsupported/qnx-x86-qcc/qmake.conf -lib/qt4/mkspecs/unsupported/qnx-x86-qcc/qplatformdefs.h lib/qt4/mkspecs/unsupported/qws/ lib/qt4/mkspecs/unsupported/qws/integrity-x86-cx86/ lib/qt4/mkspecs/unsupported/qws/integrity-x86-cx86/qmake.conf @@ -3855,6 +3899,9 @@ lib/qt4/mkspecs/win32-msvc2008/qplatformdefs.h lib/qt4/mkspecs/win32-msvc2010/ lib/qt4/mkspecs/win32-msvc2010/qmake.conf lib/qt4/mkspecs/win32-msvc2010/qplatformdefs.h +lib/qt4/mkspecs/win32-msvc2012/ +lib/qt4/mkspecs/win32-msvc2012/qmake.conf +lib/qt4/mkspecs/win32-msvc2012/qplatformdefs.h lib/qt4/mkspecs/wince50standard-armv4i-msvc2005/ lib/qt4/mkspecs/wince50standard-armv4i-msvc2005/default_post.prf lib/qt4/mkspecs/wince50standard-armv4i-msvc2005/qmake.conf