API tools faq
paste
Advertisement
Guest User

Untitled

a guest
Sep 15th, 2017
414
0
Never
Add comment
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
C++ 9.11 KB | None | 0 0
raw download clone embed print report
  1. commit 80b5b07f69fcb525842503f5f56ddd5892f75d8f
  2. Author: Olli Werwolff <qt-info@nokia.com>
  3. Date:   Wed Jun 8 12:34:29 2011 +0200
  4.  
  5.     Undefine DrawText in qlineedit.cpp
  6.    
  7.     There is a #define DrawText DrawTextW in winuser.h which is included
  8.     in windows.h so that the enum value in line 1981 is seen as DrawTextW
  9.     and thus is not a valid enum value on Windows.
  10.    
  11.     Reviewed-by: pending
  12.  
  13. diff --git a/src/widgets/widgets/qlineedit.cpp b/src/widgets/widgets/qlineedit.cpp
  14. index 8a93c28..96a56e7 100644
  15. --- a/src/widgets/widgets/qlineedit.cpp
  16. +++ b/src/widgets/widgets/qlineedit.cpp
  17. @@ -85,6 +85,7 @@
  18.  #endif
  19.  
  20.  #include <limits.h>
  21. +#undef DrawText
  22.  
  23.  QT_BEGIN_NAMESPACE
  24.  
  25.  
  26. commit def4125a0868035d9cf94711cfa3100277bee889
  27. Author: Olli Werwolff <qt-info@nokia.com>
  28. Date:   Wed Jun 8 11:48:38 2011 +0200
  29.  
  30.     Most checks for windows in widgets have to be ws specific
  31.    
  32.     Reviewed-by: pending
  33.  
  34. diff --git a/src/widgets/kernel/qgesturemanager.cpp b/src/widgets/kernel/qgesturemanager.cpp
  35. index 868387d..d3d34c2 100644
  36. --- a/src/widgets/kernel/qgesturemanager.cpp
  37. +++ b/src/widgets/kernel/qgesturemanager.cpp
  38. @@ -53,7 +53,7 @@
  39.  #ifdef Q_WS_MAC
  40.  #include "qmacgesturerecognizer_mac_p.h"
  41.  #endif
  42. -#if defined(Q_OS_WIN) && !defined(QT_NO_NATIVE_GESTURES)
  43. +#if defined(Q_WS_WIN) && !defined(QT_NO_NATIVE_GESTURES)
  44.  #include "qwinnativepangesturerecognizer_win_p.h"
  45.  #endif
  46.  
  47. @@ -87,7 +87,7 @@ QGestureManager::QGestureManager(QObject *parent)
  48.      registerGestureRecognizer(new QSwipeGestureRecognizer);
  49.      registerGestureRecognizer(new QTapGestureRecognizer);
  50.  #endif
  51. -#if defined(Q_OS_WIN)
  52. +#if defined(Q_WS_WIN)
  53.    #if !defined(QT_NO_NATIVE_GESTURES)
  54.      if (QApplicationPrivate::HasTouchSupport)
  55.          registerGestureRecognizer(new QWinNativePanGestureRecognizer);
  56. diff --git a/src/widgets/styles/qwindowsstyle.cpp b/src/widgets/styles/qwindowsstyle.cpp
  57. index c099273..d1d3865 100644
  58. --- a/src/widgets/styles/qwindowsstyle.cpp
  59. +++ b/src/widgets/styles/qwindowsstyle.cpp
  60. @@ -918,7 +918,7 @@ static const char *const question_xpm[] = {
  61.  
  62.  #endif //QT_NO_IMAGEFORMAT_XPM
  63.  
  64. -#ifdef Q_OS_WIN
  65. +#ifdef Q_WS_WIN
  66.  static QPixmap loadIconFromShell32( int resourceId, int size )
  67.  {
  68.  #ifdef Q_OS_WINCE
  69. @@ -3256,7 +3256,7 @@ QIcon QWindowsStyle::standardIconImplementation(StandardPixmap standardIcon, con
  70.  {
  71.      QIcon icon;
  72.      QPixmap pixmap;
  73. -#ifdef Q_OS_WIN
  74. +#ifdef Q_WS_WIN
  75.      switch (standardIcon) {
  76.      case SP_FileDialogNewFolder:
  77.      {
  78. diff --git a/src/widgets/widgets/qdockwidget.cpp b/src/widgets/widgets/qdockwidget.cpp
  79. index 6e37683..53e007a 100644
  80. --- a/src/widgets/widgets/qdockwidget.cpp
  81. +++ b/src/widgets/widgets/qdockwidget.cpp
  82. @@ -854,7 +854,7 @@ bool QDockWidgetPrivate::mouseMoveEvent(QMouseEvent *event)
  83.              && (event->pos() - state->pressPos).manhattanLength()
  84.                  > QApplication::startDragDistance()) {
  85.              startDrag();
  86. -#ifdef Q_OS_WIN
  87. +#ifdef Q_WS_WIN
  88.              grabMouseWhileInWindow();
  89.  #else
  90.              q->grabMouse();
  91. @@ -925,7 +925,7 @@ void QDockWidgetPrivate::nonClientAreaMouseEvent(QMouseEvent *event)
  92.              initDrag(event->pos(), true);
  93.              if (state == 0)
  94.                  break;
  95. -#ifdef Q_OS_WIN
  96. +#ifdef Q_WS_WIN
  97.              // On Windows, NCA mouse events don't contain modifier info
  98.              state->ctrlDrag = GetKeyState(VK_CONTROL) & 0x8000;
  99.  #else
  100. @@ -1433,7 +1433,7 @@ bool QDockWidget::event(QEvent *event)
  101.          if (d->mouseMoveEvent(static_cast<QMouseEvent *>(event)))
  102.              return true;
  103.          break;
  104. -#ifdef Q_OS_WIN
  105. +#ifdef Q_WS_WIN
  106.      case QEvent::Leave:
  107.          if (d->state != 0 && d->state->dragging && !d->state->nca) {
  108.              // This is a workaround for loosing the mouse on Vista.
  109. diff --git a/src/widgets/widgets/qtoolbar.cpp b/src/widgets/widgets/qtoolbar.cpp
  110. index e0e8ce6..7527baa 100644
  111. --- a/src/widgets/widgets/qtoolbar.cpp
  112. +++ b/src/widgets/widgets/qtoolbar.cpp
  113. @@ -354,7 +354,7 @@ bool QToolBarPrivate::mouseMoveEvent(QMouseEvent *event)
  114.  
  115.              startDrag(moving);
  116.              if (!moving && !wasDragging) {
  117. -#ifdef Q_OS_WIN
  118. +#ifdef Q_WS_WIN
  119.                  grabMouseWhileInWindow();
  120.  #else
  121.                  q->grabMouse();
  122.  
  123. commit d8d72695050d7be37acca522762bcb2dd4e33456
  124. Author: Olli Werwolff <qt-info@nokia.com>
  125. Date:   Wed Jun 8 13:39:21 2011 +0200
  126.  
  127.     use correct includes in qaccessible_win.cpp/qwizard_win_p.h
  128.    
  129.     Reviewed-by: pending
  130.  
  131. diff --git a/src/widgets/accessible/qaccessible_win.cpp b/src/widgets/accessible/qaccessible_win.cpp
  132. index 79ac442..f09f4bb 100644
  133. --- a/src/widgets/accessible/qaccessible_win.cpp
  134. +++ b/src/widgets/accessible/qaccessible_win.cpp
  135. @@ -49,9 +49,9 @@
  136.  #include "qsettings.h"
  137.  #include <QtCore/qmap.h>
  138.  #include <QtCore/qpair.h>
  139. -#include <QtGui/qgraphicsitem.h>
  140. -#include <QtGui/qgraphicsscene.h>
  141. -#include <QtGui/qgraphicsview.h>
  142. +#include <QtWidgets/qgraphicsitem.h>
  143. +#include <QtWidgets/qgraphicsscene.h>
  144. +#include <QtWidgets/qgraphicsview.h>
  145.  
  146.  #include <winuser.h>
  147.  #if !defined(WINABLEAPI)
  148. diff --git a/src/widgets/dialogs/qwizard_win_p.h b/src/widgets/dialogs/qwizard_win_p.h
  149. index 7009fa7..f53a9ba 100644
  150. --- a/src/widgets/dialogs/qwizard_win_p.h
  151. +++ b/src/widgets/dialogs/qwizard_win_p.h
  152. @@ -60,8 +60,8 @@
  153.  #include <qobject.h>
  154.  #include <qwidget.h>
  155.  #include <qabstractbutton.h>
  156. -#include <QtGui/private/qwidget_p.h>
  157. -#include <QtGui/private/qstylehelper_p.h>
  158. +#include <QtWidgets/private/qwidget_p.h>
  159. +#include <QtWidgets/private/qstylehelper_p.h>
  160.  
  161.  QT_BEGIN_NAMESPACE
  162.  
  163.  
  164. commit a279dfe50f1a60060959de116687884207249883
  165. Author: Olli Werwolff <qt-info@nokia.com>
  166. Date:   Wed Jun 8 11:46:12 2011 +0200
  167.  
  168.     Do not compile _win files when -qpa is used
  169.    
  170.     Reviewed-by: pending
  171.  
  172. diff --git a/src/widgets/accessible/accessible.pri b/src/widgets/accessible/accessible.pri
  173. index 66a84bc..ff75563 100644
  174. --- a/src/widgets/accessible/accessible.pri
  175. +++ b/src/widgets/accessible/accessible.pri
  176. @@ -16,7 +16,7 @@ contains(QT_CONFIG, accessibility) {
  177.          HEADERS += accessible/qaccessible_mac_p.h
  178.          OBJECTIVE_SOURCES += accessible/qaccessible_mac.mm \
  179.                               accessible/qaccessible_mac_cocoa.mm
  180. -      } else:win32 {
  181. +      } else:win32:!qpa {
  182.          SOURCES += accessible/qaccessible_win.cpp
  183.        } else {
  184.          HEADERS += accessible/qaccessiblebridge.h
  185. diff --git a/src/widgets/inputmethod/inputmethod.pri b/src/widgets/inputmethod/inputmethod.pri
  186. index 77ca3bd..87eb17c 100644
  187. --- a/src/widgets/inputmethod/inputmethod.pri
  188. +++ b/src/widgets/inputmethod/inputmethod.pri
  189. @@ -11,7 +11,7 @@ x11 {
  190.      HEADERS += inputmethod/qximinputcontext_p.h
  191.      SOURCES += inputmethod/qximinputcontext_x11.cpp
  192.  }
  193. -win32 {
  194. +win32:!qpa {
  195.      HEADERS += inputmethod/qwininputcontext_p.h
  196.      SOURCES += inputmethod/qwininputcontext_win.cpp
  197.  }
  198. diff --git a/src/widgets/kernel/kernel.pri b/src/widgets/kernel/kernel.pri
  199. index d085bff..6be316b 100644
  200. --- a/src/widgets/kernel/kernel.pri
  201. +++ b/src/widgets/kernel/kernel.pri
  202. @@ -71,9 +71,9 @@ SOURCES += \
  203.          kernel/qguiplatformplugin.cpp \
  204.          kernel/qwidgetsvariant.cpp
  205.  
  206. -win32 {
  207. -   DEFINES += QT_NO_DIRECTDRAW
  208. +win32: DEFINES += QT_NO_DIRECTDRAW
  209.  
  210. +win32:!qpa {
  211.      HEADERS += \
  212.          kernel/qwinnativepangesturerecognizer_win_p.h
  213.  
  214. diff --git a/src/widgets/util/util.pri b/src/widgets/util/util.pri
  215. index 854964b..1ba8011 100644
  216. --- a/src/widgets/util/util.pri
  217. +++ b/src/widgets/util/util.pri
  218. @@ -29,7 +29,7 @@ SOURCES += \
  219.  wince* {
  220.         SOURCES += \
  221.                 util/qsystemtrayicon_wince.cpp
  222. -} else:win32 {
  223. +} else:win32:!qpa {
  224.         SOURCES += \
  225.                 util/qsystemtrayicon_win.cpp
  226.  }
  227.  
  228. commit 092ddd1461b6418d38a7c6df5be587b65a74bf2b
  229. Author: Olli Werwolff <qt-info@nokia.com>
  230. Date:   Wed Jun 8 09:36:27 2011 +0200
  231.  
  232.     QTextDocumentLayout has to be exported as it is used in widgets
  233.    
  234.     Reviewed-by: pending
  235.  
  236. diff --git a/src/gui/text/qtextdocumentlayout_p.h b/src/gui/text/qtextdocumentlayout_p.h
  237. index 620b9bd..b103d88 100644
  238. --- a/src/gui/text/qtextdocumentlayout_p.h
  239. +++ b/src/gui/text/qtextdocumentlayout_p.h
  240. @@ -63,7 +63,7 @@ class QTextListFormat;
  241.  
  242.  class QTextDocumentLayoutPrivate;
  243.  
  244. -class Q_AUTOTEST_EXPORT QTextDocumentLayout : public QAbstractTextDocumentLayout
  245. +class Q_GUI_EXPORT QTextDocumentLayout : public QAbstractTextDocumentLayout
  246.  {
  247.      Q_DECLARE_PRIVATE(QTextDocumentLayout)
  248.      Q_OBJECT
  249.  
  250. commit bff0b8b522a4ad1d22f3179527c1096ea4f8ea75
  251. Author: Olli Werwolff <qt-info@nokia.com>
  252. Date:   Wed Jun 8 09:35:38 2011 +0200
  253.  
  254.     Fixed compilation with QT_NO_PRINTER
  255.    
  256.     Reviewed-by: pending
  257.  
  258. diff --git a/src/gui/kernel/qplatformintegration_qpa.cpp b/src/gui/kernel/qplatformintegration_qpa.cpp
  259. index 12b8760..7dadf70 100644
  260. --- a/src/gui/kernel/qplatformintegration_qpa.cpp
  261. +++ b/src/gui/kernel/qplatformintegration_qpa.cpp
  262. @@ -237,8 +237,10 @@ bool QPlatformIntegration::hasCapability(Capability cap) const
  263.  QPlatformPrinterSupport *QPlatformIntegration::printerSupport() const
  264.  {
  265.      static QPlatformPrinterSupport *ps = 0;
  266. +#ifndef QT_NO_PRINTER
  267.      if (!ps)
  268.          ps = new QPlatformPrinterSupport;
  269. +#endif
  270.      return ps;
  271.  }
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement
Public Pastes
Advertisement
We use cookies for various purposes including analytics. By continuing to use Pastebin, you agree to our use of cookies as described in the Cookies Policy.  OK, I Understand
Not a member of Pastebin yet?
Sign Up, it unlocks many cool features!