API tools faq
paste
Advertisement
Guest User

Untitled

a guest
Jun 20th, 2012
65
0
Never
Add comment
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 33.73 KB | None | 0 0
raw download clone embed print report
  1. diff -ur mozilla-release.orig/intl/locale/src/nsLocaleService.cpp mozilla-release/intl/locale/src/nsLocaleService.cpp
  2. --- mozilla-release.orig/intl/locale/src/nsLocaleService.cpp 2012-06-14 11:49:38.000000000 -0700
  3. +++ mozilla-release/intl/locale/src/nsLocaleService.cpp 2012-06-19 12:45:43.268705718 -0700
  4. @@ -36,7 +36,7 @@
  5. * ***** END LICENSE BLOCK ***** */
  6.  
  7. #ifdef MOZ_WIDGET_QT
  8. -#include <QString>
  9. +#include <QtCore/QString>
  10. #include <QtCore/QLocale>
  11. #endif
  12.  
  13. diff -ur mozilla-release.orig/netwerk/system/qt/nsQtNetworkManager.h mozilla-release/netwerk/system/qt/nsQtNetworkManager.h
  14. --- mozilla-release.orig/netwerk/system/qt/nsQtNetworkManager.h 2012-06-14 11:50:01.000000000 -0700
  15. +++ mozilla-release/netwerk/system/qt/nsQtNetworkManager.h 2012-06-19 14:13:24.574853212 -0700
  16. @@ -38,11 +38,11 @@
  17. #ifndef NSQTNETWORKMANAGER_H_
  18. #define NSQTNETWORKMANAGER_H_
  19.  
  20. -#include <QNetworkConfigurationManager>
  21. -#include <QObject>
  22. -#include <QTimer>
  23. -#include <QNetworkConfiguration>
  24. -#include <QNetworkSession>
  25. +#include <QtNetwork/QNetworkConfigurationManager>
  26. +#include <QtCore/QObject>
  27. +#include <QtCore/QTimer>
  28. +#include <QtNetwork/QNetworkConfiguration>
  29. +#include <QtNetwork/QNetworkSession>
  30. #include "nscore.h"
  31.  
  32. class nsQtNetworkManager;
  33.  
  34. diff -ur mozilla-release.orig/netwerk/system/qt/nsQtNetworkManager.cpp mozilla-release/netwerk/system/qt/nsQtNetworkManager.cpp
  35. --- mozilla-release.orig/netwerk/system/qt/nsQtNetworkManager.cpp 2012-06-14 11:50:01.000000000 -0700
  36. +++ mozilla-release/netwerk/system/qt/nsQtNetworkManager.cpp 2012-06-19 14:48:42.839925278 -0700
  37. @@ -44,9 +44,9 @@
  38. #include "nsIObserverService.h"
  39. #include "nsIOService.h"
  40.  
  41. -#include <QHostInfo>
  42. -#include <QHostAddress>
  43. -#include <QTime>
  44. +#include <QtNetwork/QHostInfo>
  45. +#include <QtNetwork/QHostAddress>
  46. +#include <QtCore/QTime>
  47.  
  48. nsQtNetworkManager* nsQtNetworkManager::gQtNetworkManager = nsnull;
  49.  
  50. diff -ur mozilla-release.orig/ipc/chromium/src/base/message_pump_qt.h mozilla-release/ipc/chromium/src/base/message_pump_qt.h
  51. --- mozilla-release.orig/ipc/chromium/src/base/message_pump_qt.h 2012-06-14 11:49:39.000000000 -0700
  52. +++ mozilla-release/ipc/chromium/src/base/message_pump_qt.h 2012-06-19 15:14:15.833946578 -0700
  53. @@ -10,7 +10,7 @@
  54. # include "mozilla/mozalloc_undef_macro_wrappers.h"
  55. #endif
  56.  
  57. -#include <qobject.h>
  58. +#include <QtCore/qobject.h>
  59.  
  60. #include "base/message_pump.h"
  61. #include "base/time.h"
  62. diff -ur mozilla-release.orig/ipc/chromium/src/base/message_pump_qt.cc mozilla-release/ipc/chromium/src/base/message_pump_qt.cc
  63. --- mozilla-release.orig/ipc/chromium/src/base/message_pump_qt.cc 2012-06-14 11:49:39.000000000 -0700
  64. +++ mozilla-release/ipc/chromium/src/base/message_pump_qt.cc 2012-06-19 15:53:43.584712314 -0700
  65. @@ -4,10 +4,10 @@
  66.  
  67. #include "base/message_pump_qt.h"
  68.  
  69. -#include <qabstracteventdispatcher.h>
  70. -#include <qevent.h>
  71. -#include <qapplication.h>
  72. -#include <qtimer.h>
  73. +#include <QtCore/qabstracteventdispatcher.h>
  74. +#include <QtGui/qevent.h>
  75. +#include <QtGui/qapplication.h>
  76. +#include <QtCore/qtimer.h>
  77.  
  78. #include <fcntl.h>
  79. #include <limits>
  80. diff -ur mozilla-release.orig/gfx/src/X11Util.h mozilla-release/gfx/src/X11Util.h
  81. --- mozilla-release.orig/gfx/src/X11Util.h 2012-06-19 16:50:14.784819916 -0700
  82. +++ mozilla-release/gfx/src/X11Util.h 2012-06-19 16:50:27.481437066 -0700
  83. @@ -48,7 +48,7 @@
  84. // X11/X.h has #define CursorShape 0, but Qt's qnamespace.h defines
  85. // enum CursorShape { ... }. Good times!
  86. #undef CursorShape
  87. -# include <QX11Info>
  88. +# include <QtGui/QX11Info>
  89. # include <X11/Xlib.h>
  90. #else
  91. # error Unknown toolkit
  92. diff -ur mozilla-release.orig/uriloader/exthandler/unix/nsMIMEInfoUnix.cpp mozilla-release/uriloader/exthandler/unix/nsMIMEInfoUnix.cpp
  93. --- mozilla-release.orig/uriloader/exthandler/unix/nsMIMEInfoUnix.cpp 2012-06-14 11:50:07.000000000 -0700
  94. +++ mozilla-release/uriloader/exthandler/unix/nsMIMEInfoUnix.cpp 2012-06-19 17:46:00.931769892 -0700
  95. @@ -45,9 +45,9 @@
  96. #include <libosso.h>
  97. #endif
  98. #ifdef MOZ_WIDGET_QT
  99. -#include <QDesktopServices>
  100. -#include <QUrl>
  101. -#include <QString>
  102. +#include <QtGui/QDesktopServices>
  103. +#include <QtCore/QUrl>
  104. +#include <QtCore/QString>
  105. #if (MOZ_ENABLE_CONTENTACTION)
  106. #include <contentaction/contentaction.h>
  107. #include "nsContentHandlerApp.h"
  108. diff -ur mozilla-release.orig/gfx/gl/GLContextProviderGLX.cpp mozilla-release/gfx/gl/GLContextProviderGLX.cpp
  109. --- mozilla-release.orig/gfx/gl/GLContextProviderGLX.cpp 2012-06-19 18:25:26.595877099 -0700
  110. +++ mozilla-release/gfx/gl/GLContextProviderGLX.cpp 2012-06-19 18:25:40.702488750 -0700
  111. @@ -39,8 +39,8 @@
  112. #include <gdk/gdkx.h>
  113. #define GET_NATIVE_WINDOW(aWidget) GDK_WINDOW_XID((GdkWindow *) aWidget->GetNativeData(NS_NATIVE_WINDOW))
  114. #elif defined(MOZ_WIDGET_QT)
  115. -#include <QWidget>
  116. -#include <QX11Info>
  117. +#include <QtGui/QWidget>
  118. +#include <QtGui/QX11Info>
  119. #define GET_NATIVE_WINDOW(aWidget) static_cast<QWidget*>(aWidget->GetNativeData(NS_NATIVE_SHELLWIDGET))->handle()
  120. #endif
  121.  
  122. diff -ur mozilla-release.orig/gfx/thebes/gfxQtPlatform.cpp mozilla-release/gfx/thebes/gfxQtPlatform.cpp
  123.  
  124. --- mozilla-release.orig/gfx/thebes/gfxQtPlatform.cpp 2012-06-14 11:49:37.000000000 -0700
  125. +++ mozilla-release/gfx/thebes/gfxQtPlatform.cpp 2012-06-19 19:09:45.432174263 -0700
  126. @@ -36,11 +36,11 @@
  127. *
  128. * ***** END LICENSE BLOCK ***** */
  129.  
  130. -#include <QPixmap>
  131. -#include <QX11Info>
  132. -#include <QApplication>
  133. -#include <QDesktopWidget>
  134. -#include <QPaintEngine>
  135. +#include <QtGui/QPixmap>
  136. +#include <QtGui/QX11Info>
  137. +#include <QtGui/QApplication>
  138. +#include <QtGui/QDesktopWidget>
  139. +#include <QtGui/QPaintEngine>
  140.  
  141. #include "gfxQtPlatform.h"
  142.  
  143. diff -ur mozilla-release.orig/toolkit/xre/nsNativeAppSupportQt.h mozilla-release/toolkit/xre/nsNativeAppSupportQt.h
  144. --- mozilla-release.orig/toolkit/xre/nsNativeAppSupportQt.h 2012-06-14 11:50:07.000000000 -0700
  145. +++ mozilla-release/toolkit/xre/nsNativeAppSupportQt.h 2012-06-19 21:00:02.506367573 -0700
  146. @@ -37,7 +37,7 @@
  147. * ***** END LICENSE BLOCK ***** */
  148.  
  149. #include <stdlib.h>
  150. -#include <QObject>
  151. +#include <QtCore/QObject>
  152. #ifdef MOZ_ENABLE_QMSYSTEM2
  153. #include "qmdevicemode.h"
  154. #include "qmdisplaystate.h"
  155. diff -ur mozilla-release.orig/widget/qt/nsPrintSettingsQt.h mozilla-release/widget/qt/nsPrintSettingsQt.h
  156. --- mozilla-release.orig/widget/qt/nsPrintSettingsQt.h 2012-06-14 11:50:08.000000000 -0700
  157. +++ mozilla-release/widget/qt/nsPrintSettingsQt.h 2012-06-19 21:01:25.599376843 -0700
  158. @@ -40,7 +40,7 @@
  159. #ifndef nsPrintSettingsQt_h_
  160. #define nsPrintSettingsQt_h_
  161.  
  162. -#include <QSharedPointer>
  163. +#include <QtCore/QSharedPointer>
  164. #include "nsPrintSettingsImpl.h"
  165. #define NS_PRINTSETTINGSQT_IID \
  166. {0x5bc4c746, 0x8970, 0x43a3, {0xbf, 0xb1, 0x5d, 0xe1, 0x74, 0xaf, 0x7c, 0xea}}
  167. diff -ur mozilla-release.orig/widget/qt/faststartupqt/nsFastStartupQt.h mozilla-release/widget/qt/faststartupqt/nsFastStartupQt.h
  168. --- mozilla-release.orig/widget/qt/faststartupqt/nsFastStartupQt.h 2012-06-14 11:50:08.000000000 -0700
  169. +++ mozilla-release/widget/qt/faststartupqt/nsFastStartupQt.h 2012-06-19 21:02:57.575684801 -0700
  170. @@ -39,10 +39,10 @@
  171. #ifndef FAST_STARTUP_H
  172. #define FAST_STARTUP_H
  173.  
  174. -#include <QObject>
  175. +#include <QtCore/QObject>
  176. #include "nscore.h"
  177. -#include <QThread>
  178. -#include <QEventLoop>
  179. +#include <QtCore/QThread>
  180. +#include <QtCore/QEventLoop>
  181. #include <sys/time.h>
  182.  
  183. class QGraphicsView;
  184. diff -ur mozilla-release.orig/widget/qt/mozqorientationsensorfilter.h mozilla-release/widget/qt/mozqorientationsensorfilter.h
  185. --- mozilla-release.orig/widget/qt/mozqorientationsensorfilter.h 2012-06-14 11:50:08.000000000 -0700
  186. +++ mozilla-release/widget/qt/mozqorientationsensorfilter.h 2012-06-19 21:03:52.375471080 -0700
  187. @@ -40,8 +40,8 @@
  188.  
  189. #include <QtSensors/QOrientationReading>
  190. #include <QtSensors/QOrientationFilter>
  191. -#include <QObject>
  192. -#include <QTransform>
  193. +#include <QtCore/QObject>
  194. +#include <QtGui/QTransform>
  195.  
  196. using namespace QtMobility;
  197.  
  198. diff -ur mozilla-release.orig/widget/qt/nsDragService.h mozilla-release/widget/qt/nsDragService.h
  199. --- mozilla-release.orig/widget/qt/nsDragService.h 2012-06-14 11:50:08.000000000 -0700
  200. +++ mozilla-release/widget/qt/nsDragService.h 2012-06-19 21:05:41.335046137 -0700
  201. @@ -39,7 +39,7 @@
  202. #ifndef nsDragService_h__
  203. #define nsDragService_h__
  204.  
  205. -#include <qdrag.h>
  206. +#include <QtGui/qdrag.h>
  207.  
  208. #include "nsBaseDragService.h"
  209.  
  210. diff -ur mozilla-release.orig/widget/qt/nsMFilePicker.h mozilla-release/widget/qt/nsMFilePicker.h
  211. --- mozilla-release.orig/widget/qt/nsMFilePicker.h 2012-06-14 11:50:08.000000000 -0700
  212. +++ mozilla-release/widget/qt/nsMFilePicker.h 2012-06-19 21:06:42.108142453 -0700
  213. @@ -43,9 +43,9 @@
  214. #ifndef NSMFILEDIALOG_H
  215. #define NSMFILEDIALOG_H
  216.  
  217. -#include <QEventLoop>
  218. -#include <QStringList>
  219. -#include <QUrl>
  220. +#include <QtCore/QEventLoop>
  221. +#include <QtCore/QStringList>
  222. +#include <QtCore/QUrl>
  223.  
  224. class MApplicationPage;
  225. class MeegoFileDialog : public QObject
  226. diff -ur mozilla-release.orig/widget/qt/nsFilePicker.h mozilla-release/widget/qt/nsFilePicker.h
  227. --- mozilla-release.orig/widget/qt/nsFilePicker.h 2012-06-14 11:50:08.000000000 -0700
  228. +++ mozilla-release/widget/qt/nsFilePicker.h 2012-06-19 21:07:26.891301132 -0700
  229. @@ -40,7 +40,7 @@
  230. #ifndef NSFILEPICKER_H
  231. #define NSFILEPICKER_H
  232.  
  233. -#include <QPointer>
  234. +#include <QtCore/QPointer>
  235. #include "nsBaseFilePicker.h"
  236. #include "nsCOMArray.h"
  237. #include "nsString.h"
  238. diff -ur mozilla-release.orig/widget/qt/nsNativeThemeQt.h mozilla-release/widget/qt/nsNativeThemeQt.h
  239. --- mozilla-release.orig/widget/qt/nsNativeThemeQt.h 2012-06-14 11:50:08.000000000 -0700
  240. +++ mozilla-release/widget/qt/nsNativeThemeQt.h 2012-06-19 21:08:23.051082110 -0700
  241. @@ -39,8 +39,8 @@
  242. *
  243. * ***** END LICENSE BLOCK ***** */
  244.  
  245. -#include <QStyle>
  246. -#include <QPalette>
  247. +#include <QtGui/QStyle>
  248. +#include <QtGui/QPalette>
  249.  
  250. #include "nsITheme.h"
  251. #include "nsCOMPtr.h"
  252. diff -ur mozilla-release.orig/widget/qt/moziqwidget.h mozilla-release/widget/qt/moziqwidget.h
  253. --- mozilla-release.orig/widget/qt/moziqwidget.h 2012-06-14 11:50:08.000000000 -0700
  254. +++ mozilla-release/widget/qt/moziqwidget.h 2012-06-19 21:09:42.290773074 -0700
  255. @@ -48,7 +48,7 @@
  256. #include <MSceneWindow>
  257. #include <MInputMethodState>
  258. #include <QtGui/QGraphicsSceneResizeEvent>
  259. -#include <QTimer>
  260. +#include <QtCore/QTimer>
  261. #endif
  262.  
  263. class nsWindow;
  264. diff -ur mozilla-release.orig/widget/qt/nsClipboard.h mozilla-release/widget/qt/nsClipboard.h
  265. --- mozilla-release.orig/widget/qt/nsClipboard.h 2012-06-14 11:50:08.000000000 -0700
  266. +++ mozilla-release/widget/qt/nsClipboard.h 2012-06-19 21:11:18.657063909 -0700
  267. @@ -45,7 +45,7 @@
  268. #include "nsAutoPtr.h"
  269. #include "nsCOMPtr.h"
  270.  
  271. -#include <qclipboard.h>
  272. +#include <QtGui/qclipboard.h>
  273.  
  274. /* Native Qt Clipboard wrapper */
  275. class nsClipboard : public nsIClipboard
  276. diff -ur mozilla-release.orig/widget/qt/nsWindow.h mozilla-release/widget/qt/nsWindow.h
  277. --- mozilla-release.orig/widget/qt/nsWindow.h 2012-06-14 11:50:08.000000000 -0700
  278. +++ mozilla-release/widget/qt/nsWindow.h 2012-06-19 21:13:20.699921273 -0700
  279. @@ -41,9 +41,9 @@
  280. #ifndef __nsWindow_h__
  281. #define __nsWindow_h__
  282.  
  283. -#include <QKeyEvent>
  284. -#include <qgraphicswidget.h>
  285. -#include <QTime>
  286. +#include <QtGui/QKeyEvent>
  287. +#include <QtGui/qgraphicswidget.h>
  288. +#include <QtCore/QTime>
  289.  
  290. #include "nsAutoPtr.h"
  291.  
  292. diff -ur mozilla-release.orig/widget/qt/nsAppShell.h mozilla-release/widget/qt/nsAppShell.h
  293. --- mozilla-release.orig/widget/qt/nsAppShell.h 2012-06-14 11:50:08.000000000 -0700
  294. +++ mozilla-release/widget/qt/nsAppShell.h 2012-06-19 21:14:10.189728263 -0700
  295. @@ -39,7 +39,7 @@
  296. #ifndef nsAppShell_h__
  297. #define nsAppShell_h__
  298.  
  299. -#include <qsocketnotifier.h>
  300. +#include <QtCore/qsocketnotifier.h>
  301. #include "nsBaseAppShell.h"
  302. #include "nsCOMPtr.h"
  303.  
  304. diff -ur mozilla-release.orig/widget/qt/mozSwipeGesture.h mozilla-release/widget/qt/mozSwipeGesture.h
  305. --- mozilla-release.orig/widget/qt/mozSwipeGesture.h 2012-06-14 11:50:08.000000000 -0700
  306. +++ mozilla-release/widget/qt/mozSwipeGesture.h 2012-06-19 21:15:47.986013523 -0700
  307. @@ -41,9 +41,9 @@
  308. #ifndef MOZSWIPEGESTURE_H
  309. #define MOZSWIPEGESTURE_H
  310.  
  311. -#include <QGestureRecognizer>
  312. -#include <QGesture>
  313. -#include <QTouchEvent>
  314. +#include <QtGui/QGestureRecognizer>
  315. +#include <QtGui/QGesture>
  316. +#include <QtGui/QTouchEvent>
  317.  
  318. class MozSwipeGestureRecognizer: public QGestureRecognizer
  319. {
  320. diff -ur mozilla-release.orig/dom/system/unix/nsQTMDeviceMotionSystem.h mozilla-release/dom/system/unix/nsQTMDeviceMotionSystem.h
  321. --- mozilla-release.orig/dom/system/unix/nsQTMDeviceMotionSystem.h 2012-06-14 11:49:32.000000000 -0700
  322. +++ mozilla-release/dom/system/unix/nsQTMDeviceMotionSystem.h 2012-06-19 21:18:05.428810827 -0700
  323. @@ -37,7 +37,7 @@
  324. #ifndef nsDeviceMotionSystem_h
  325. #define nsDeviceMotionSystem_h
  326.  
  327. -#include <QObject>
  328. +#include <QtCore/QObject>
  329. #include <QtSensors/QAccelerometer>
  330. #include <QtSensors/QRotationSensor>
  331. #include "nsDeviceMotion.h"
  332. diff -ur mozilla-release.orig/dom/plugins/base/npapi.h mozilla-release/dom/plugins/base/npapi.h
  333. --- mozilla-release.orig/dom/plugins/base/npapi.h 2012-06-14 11:49:32.000000000 -0700
  334. +++ mozilla-release/dom/plugins/base/npapi.h 2012-06-19 21:19:30.611811945 -0700
  335. @@ -92,8 +92,8 @@
  336. #endif
  337.  
  338. #if defined(XP_SYMBIAN)
  339. -#include <QEvent>
  340. -#include <QRegion>
  341. +#include <QtCore/QEvent>
  342. +#include <QtGui/QRegion>
  343. #endif
  344.  
  345. /*----------------------------------------------------------------------*/
  346. diff -ur mozilla-release.orig/toolkit/components/remote/nsQtRemoteService.cpp mozilla-release/toolkit/components/remote/nsQtRemoteService.cpp
  347. --- mozilla-release.orig/toolkit/components/remote/nsQtRemoteService.cpp 2012-06-14 11:50:05.000000000 -0700
  348. +++ mozilla-release/toolkit/components/remote/nsQtRemoteService.cpp 2012-06-19 22:25:32.919692213 -0700
  349. @@ -39,8 +39,8 @@
  350. * the terms of any one of the MPL, the GPL or the LGPL.
  351. *
  352. * ***** END LICENSE BLOCK ***** */
  353. -#include <QWidget>
  354. -#include <QX11Info>
  355. +#include <QtGui/QWidget>
  356. +#include <QtGui/QX11Info>
  357. #include "nsQtRemoteService.h"
  358.  
  359. #include "mozilla/ModuleUtils.h"
  360. diff -ur mozilla-release.orig/toolkit/xre/nsNativeAppSupportQt.cpp mozilla-release/toolkit/xre/nsNativeAppSupportQt.cpp
  361. --- mozilla-release.orig/toolkit/xre/nsNativeAppSupportQt.cpp 2012-06-14 11:50:07.000000000 -0700
  362. +++ mozilla-release/toolkit/xre/nsNativeAppSupportQt.cpp 2012-06-19 22:25:51.639619209 -0700
  363. @@ -37,7 +37,7 @@
  364. * ***** END LICENSE BLOCK ***** */
  365.  
  366. #include <stdlib.h>
  367. -#include <QTimer>
  368. +#include <QtCore/QTimer>
  369. #include "mozilla/ipc/GeckoChildProcessHost.h"
  370. #include "nsNativeAppSupportQt.h"
  371. #include "nsCOMPtr.h"
  372. diff -ur mozilla-release.orig/toolkit/xre/nsQAppInstance.cpp mozilla-release/toolkit/xre/nsQAppInstance.cpp
  373. --- mozilla-release.orig/toolkit/xre/nsQAppInstance.cpp 2012-06-14 11:50:07.000000000 -0700
  374. +++ mozilla-release/toolkit/xre/nsQAppInstance.cpp 2012-06-19 22:26:28.609475008 -0700
  375. @@ -37,7 +37,7 @@
  376. * ***** END LICENSE BLOCK ***** */
  377.  
  378. #include "nsQAppInstance.h"
  379. -#include <QApplication>
  380. +#include <QtGui/QApplication>
  381. #ifdef MOZ_ENABLE_MEEGOTOUCH
  382. #include <MComponentData>
  383. #include <MApplicationService>
  384. diff -ur mozilla-release.orig/widget/shared/nsShmImage.cpp mozilla-release/widget/shared/nsShmImage.cpp
  385. --- mozilla-release.orig/widget/shared/nsShmImage.cpp 2012-06-14 11:50:08.000000000 -0700
  386. +++ mozilla-release/widget/shared/nsShmImage.cpp 2012-06-19 22:26:42.832752892 -0700
  387. @@ -42,7 +42,7 @@
  388. #include <gtk/gtk.h>
  389. #include <gdk/gdkx.h>
  390. #elif defined(MOZ_WIDGET_QT)
  391. -#include <QWidget>
  392. +#include <QtGui/QWidget>
  393. #endif
  394.  
  395. #include "nsShmImage.h"
  396. diff -ur mozilla-release.orig/widget/qt/nsWindow.cpp mozilla-release/widget/qt/nsWindow.cpp
  397. --- mozilla-release.orig/widget/qt/nsWindow.cpp 2012-06-14 11:50:08.000000000 -0700
  398. +++ mozilla-release/widget/qt/nsWindow.cpp 2012-06-19 22:28:57.098895462 -0700
  399. @@ -59,14 +59,14 @@
  400. #include <QtGui/QGraphicsSceneWheelEvent>
  401. #include <QtGui/QGraphicsSceneResizeEvent>
  402. #include <QtGui/QStyleOptionGraphicsItem>
  403. -#include <QPaintEngine>
  404. +#include <QtGui/QPaintEngine>
  405.  
  406. #include <QtCore/QDebug>
  407. #include <QtCore/QEvent>
  408. #include <QtCore/QVariant>
  409. #if (QT_VERSION >= QT_VERSION_CHECK(4, 6, 0))
  410. -#include <QPinchGesture>
  411. -#include <QGestureRecognizer>
  412. +#include <QtGui/QPinchGesture>
  413. +#include <QtGui/QGestureRecognizer>
  414. #include "mozSwipeGesture.h"
  415. static Qt::GestureType gSwipeGestureId = Qt::CustomGesture;
  416.  
  417. @@ -80,7 +80,7 @@
  418. #endif // QT version check 4.6
  419.  
  420. #ifdef MOZ_X11
  421. -#include <QX11Info>
  422. +#include <QtGui/QX11Info>
  423. #include <X11/Xlib.h>
  424. #endif //MOZ_X11
  425.  
  426. @@ -133,7 +133,7 @@
  427. #include <X11/Xatom.h>
  428. static Atom sPluginIMEAtom = nsnull;
  429. #define PLUGIN_VKB_REQUEST_PROP "_NPAPI_PLUGIN_REQUEST_VKB"
  430. -#include <QThread>
  431. +#include <QtCore/QThread>
  432. #endif
  433. #endif //MOZ_X11
  434.  
  435. diff -ur mozilla-release.orig/widget/qt/nsScreenQt.cpp mozilla-release/widget/qt/nsScreenQt.cpp
  436. --- mozilla-release.orig/widget/qt/nsScreenQt.cpp 2012-06-14 11:50:08.000000000 -0700
  437. +++ mozilla-release/widget/qt/nsScreenQt.cpp 2012-06-19 22:30:45.335140256 -0700
  438. @@ -37,12 +37,12 @@
  439. *
  440. * ***** END LICENSE BLOCK ***** */
  441.  
  442. -#include <qcolor.h>
  443. -#include <qcolormap.h>
  444. -#include <qrect.h>
  445. -#include <qdesktopwidget.h>
  446. -#include <qapplication.h>
  447. -#include <QTransform>
  448. +#include <QtGui/qcolor.h>
  449. +#include <QtGui/qcolormap.h>
  450. +#include <QtCore/qrect.h>
  451. +#include <QtGui/qdesktopwidget.h>
  452. +#include <QtGui/qapplication.h>
  453. +#include <QtGui/QTransform>
  454.  
  455. #include "nsScreenQt.h"
  456. #include "nsXULAppAPI.h"
  457. diff -ur mozilla-release.orig/widget/qt/nsNativeThemeQt.cpp mozilla-release/widget/qt/nsNativeThemeQt.cpp
  458. --- mozilla-release.orig/widget/qt/nsNativeThemeQt.cpp 2012-06-14 11:50:08.000000000 -0700
  459. +++ mozilla-release/widget/qt/nsNativeThemeQt.cpp 2012-06-19 22:32:18.608110027 -0700
  460. @@ -38,16 +38,16 @@
  461. *
  462. * ***** END LICENSE BLOCK ***** */
  463.  
  464. -#include <QApplication>
  465. -#include <QStyle>
  466. -#include <QPalette>
  467. -#include <QRect>
  468. -#include <QPainter>
  469. -#include <QStyleOption>
  470. -#include <QStyleOptionFrameV2>
  471. -#include <QStyleOptionButton>
  472. -#include <QFlags>
  473. -#include <QStyleOptionComboBox>
  474. +#include <QtGui/QApplication>
  475. +#include <QtGui/QStyle>
  476. +#include <QtGui/QPalette>
  477. +#include <QtCore/QRect>
  478. +#include <QtGui/QPainter>
  479. +#include <QtGui/QStyleOption>
  480. +#include <QtGui/QStyleOptionFrameV2>
  481. +#include <QtGui/QStyleOptionButton>
  482. +#include <QtCore/QFlags>
  483. +#include <QtGui/QStyleOptionComboBox>
  484.  
  485. #include "nsIFrame.h"
  486.  
  487. diff -ur mozilla-release.orig/widget/qt/faststartupqt/nsFastStartupQt.cpp mozilla-release/widget/qt/faststartupqt/nsFastStartupQt.cpp
  488. --- mozilla-release.orig/widget/qt/faststartupqt/nsFastStartupQt.cpp 2012-06-14 11:50:08.000000000 -0700
  489. +++ mozilla-release/widget/qt/faststartupqt/nsFastStartupQt.cpp 2012-06-19 22:32:33.774717737 -0700
  490. @@ -39,7 +39,7 @@
  491. #include <QtGui/QApplication>
  492. #include "nsQAppInstance.h"
  493. #include <QtOpenGL/QGLWidget>
  494. -#include <QThread>
  495. +#include <QtCore/QThread>
  496. #if defined MOZ_ENABLE_MEEGOTOUCH
  497. #include <MScene>
  498. #endif
  499. diff -ur mozilla-release.orig/widget/qt/nsBidiKeyboard.cpp mozilla-release/widget/qt/nsBidiKeyboard.cpp
  500. --- mozilla-release.orig/widget/qt/nsBidiKeyboard.cpp 2012-06-14 11:50:08.000000000 -0700
  501. +++ mozilla-release/widget/qt/nsBidiKeyboard.cpp 2012-06-19 22:33:04.184598597 -0700
  502. @@ -36,8 +36,8 @@
  503. *
  504. * ***** END LICENSE BLOCK ***** */
  505.  
  506. -#include <Qt>
  507. -#include <QApplication>
  508. +#include <QtCore/Qt>
  509. +#include <QtGui/QApplication>
  510.  
  511. #include "nsBidiKeyboard.h"
  512.  
  513. diff -ur mozilla-release.orig/widget/qt/nsLookAndFeel.cpp mozilla-release/widget/qt/nsLookAndFeel.cpp
  514. --- mozilla-release.orig/widget/qt/nsLookAndFeel.cpp 2012-06-14 11:50:08.000000000 -0700
  515. +++ mozilla-release/widget/qt/nsLookAndFeel.cpp 2012-06-19 22:34:15.637653622 -0700
  516. @@ -40,20 +40,20 @@
  517.  
  518. // Qt headers must be included before anything that might pull in our
  519. // malloc wrappers.
  520. -#include <QApplication>
  521. -#include <QFont>
  522. -#include <QPalette>
  523. -#include <QStyle>
  524. +#include <QtGui/QApplication>
  525. +#include <QtGui/QFont>
  526. +#include <QtGui/QPalette>
  527. +#include <QtGui/QStyle>
  528.  
  529. #undef NS_LOOKANDFEEL_DEBUG
  530. #ifdef NS_LOOKANDFEEL_DEBUG
  531. -#include <QDebug>
  532. +#include <QtCore/QDebug>
  533. #endif
  534.  
  535. #include "nsLookAndFeel.h"
  536. #include "nsStyleConsts.h"
  537.  
  538. -#include <qglobal.h>
  539. +#include <QtCore/qglobal.h>
  540.  
  541. #define QCOLOR_TO_NS_RGB(c) \
  542. ((nscolor)NS_RGB(c.red(),c.green(),c.blue()))
  543. diff -ur mozilla-release.orig/widget/qt/nsIdleServiceQt.cpp mozilla-release/widget/qt/nsIdleServiceQt.cpp
  544. --- mozilla-release.orig/widget/qt/nsIdleServiceQt.cpp 2012-06-14 11:50:08.000000000 -0700
  545. +++ mozilla-release/widget/qt/nsIdleServiceQt.cpp 2012-06-19 22:34:31.357592302 -0700
  546. @@ -38,7 +38,7 @@
  547. * ***** END LICENSE BLOCK ***** */
  548.  
  549. #if !defined(MOZ_PLATFORM_MAEMO) && defined(MOZ_X11)
  550. -#include <QX11Info>
  551. +#include <QtGui/QX11Info>
  552. #endif
  553.  
  554. #include "nsIdleServiceQt.h"
  555. diff -ur mozilla-release.orig/widget/qt/nsAppShell.cpp mozilla-release/widget/qt/nsAppShell.cpp
  556. --- mozilla-release.orig/widget/qt/nsAppShell.cpp 2012-06-14 11:50:08.000000000 -0700
  557. +++ mozilla-release/widget/qt/nsAppShell.cpp 2012-06-19 22:35:03.430800236 -0700
  558. @@ -37,12 +37,12 @@
  559. * ***** END LICENSE BLOCK ***** */
  560.  
  561. #include "nsAppShell.h"
  562. -#include <qapplication.h>
  563. +#include <QtGui/qapplication.h>
  564. #include <unistd.h>
  565. #include <fcntl.h>
  566. #include <errno.h>
  567.  
  568. -#include <qabstracteventdispatcher.h>
  569. +#include <QtCore/qabstracteventdispatcher.h>
  570.  
  571. #include "prenv.h"
  572. #include "nsQAppInstance.h"
  573. diff -ur mozilla-release.orig/widget/qt/nsDeviceContextSpecQt.cpp mozilla-release/widget/qt/nsDeviceContextSpecQt.cpp
  574. --- mozilla-release.orig/widget/qt/nsDeviceContextSpecQt.cpp 2012-06-14 11:50:08.000000000 -0700
  575. +++ mozilla-release/widget/qt/nsDeviceContextSpecQt.cpp 2012-06-19 22:36:02.750569204 -0700
  576. @@ -41,8 +41,8 @@
  577. * ***** END LICENSE BLOCK ***** */
  578.  
  579.  
  580. -#include <QTemporaryFile>
  581. -#include <QPrinterInfo>
  582. +#include <QtCore/QTemporaryFile>
  583. +#include <QtGui/QPrinterInfo>
  584.  
  585. #define SET_PRINTER_FEATURES_VIA_PREFS 1
  586. #define PRINTERFEATURES_PREF "print.tmp.printerfeatures"
  587. diff -ur mozilla-release.orig/widget/qt/mozSwipeGesture.cpp mozilla-release/widget/qt/mozSwipeGesture.cpp
  588. --- mozilla-release.orig/widget/qt/mozSwipeGesture.cpp 2012-06-14 11:50:08.000000000 -0700
  589. +++ mozilla-release/widget/qt/mozSwipeGesture.cpp 2012-06-19 22:36:21.933827719 -0700
  590. @@ -35,8 +35,8 @@
  591. *
  592. * ***** END LICENSE BLOCK ***** */
  593. #include "mozSwipeGesture.h"
  594. -#include <QTouchEvent>
  595. -#include <QGraphicsWidget>
  596. +#include <QtGui/QTouchEvent>
  597. +#include <QtGui/QGraphicsWidget>
  598. #include <prtypes.h>
  599. #include <nsIDOMSimpleGestureEvent.h>
  600. #include <math.h>
  601. diff -ur mozilla-release.orig/widget/qt/nsPrintSettingsQt.cpp mozilla-release/widget/qt/nsPrintSettingsQt.cpp
  602. --- mozilla-release.orig/widget/qt/nsPrintSettingsQt.cpp 2012-06-14 11:50:08.000000000 -0700
  603. +++ mozilla-release/widget/qt/nsPrintSettingsQt.cpp 2012-06-19 22:36:44.173740632 -0700
  604. @@ -37,8 +37,8 @@
  605. *
  606. * ***** END LICENSE BLOCK ***** */
  607.  
  608. -#include <QPrinter>
  609. -#include <QDebug>
  610. +#include <QtGui/QPrinter>
  611. +#include <QtCore/QDebug>
  612. #include "nsPrintSettingsQt.h"
  613. #include "nsILocalFile.h"
  614. #include "nsCRTGlue.h"
  615. diff -ur mozilla-release.orig/widget/qt/mozqwidget.cpp mozilla-release/widget/qt/mozqwidget.cpp
  616. --- mozilla-release.orig/widget/qt/mozqwidget.cpp 2012-06-14 11:50:08.000000000 -0700
  617. +++ mozilla-release/widget/qt/mozqwidget.cpp 2012-06-19 22:37:05.023659509 -0700
  618. @@ -50,7 +50,7 @@
  619. #ifdef MOZ_ENABLE_QTMOBILITY
  620. #include "mozqorientationsensorfilter.h"
  621. #ifdef MOZ_X11
  622. -#include <QX11Info>
  623. +#include <QtGui/QX11Info>
  624. #include <X11/Xlib.h>
  625. #include <X11/Xatom.h>
  626. # undef KeyPress
  627. diff -ur mozilla-release.orig/widget/qt/nsFilePicker.cpp mozilla-release/widget/qt/nsFilePicker.cpp
  628. --- mozilla-release.orig/widget/qt/nsFilePicker.cpp 2012-06-14 11:50:08.000000000 -0700
  629. +++ mozilla-release/widget/qt/nsFilePicker.cpp 2012-06-19 22:37:45.253504487 -0700
  630. @@ -38,17 +38,17 @@
  631. *
  632. * ***** END LICENSE BLOCK ***** */
  633.  
  634. -#include <QStringList>
  635. -#include <QGraphicsWidget>
  636. -#include <QGraphicsScene>
  637. -#include <QGraphicsView>
  638. -#include <QTemporaryFile>
  639. +#include <QtCore/QStringList>
  640. +#include <QtGui/QGraphicsWidget>
  641. +#include <QtGui/QGraphicsScene>
  642. +#include <QtGui/QGraphicsView>
  643. +#include <QtCore/QTemporaryFile>
  644.  
  645. #ifdef MOZ_ENABLE_CONTENTMANAGER
  646. #include "nsMFilePicker.h"
  647. #define MozFileDialog MeegoFileDialog
  648. #else
  649. -#include <QFileDialog>
  650. +#include <QtGui/QFileDialog>
  651. #define MozFileDialog QFileDialog
  652. #endif
  653.  
  654.  
  655. diff -ur mozilla-release.orig/widget/qt/nsMFilePicker.cpp mozilla-release/widget/qt/nsMFilePicker.cpp
  656. --- mozilla-release.orig/widget/qt/nsMFilePicker.cpp 2012-06-14 11:50:08.000000000 -0700
  657. +++ mozilla-release/widget/qt/nsMFilePicker.cpp 2012-06-19 22:38:39.793290063 -0700
  658. @@ -39,7 +39,7 @@
  659. * ***** END LICENSE BLOCK ***** */
  660.  
  661.  
  662. -#include <QWidget>
  663. +#include <QtGui/QWidget>
  664. #include "nsMFilePicker.h"
  665.  
  666.  
  667. @@ -53,8 +53,8 @@
  668. #include <MApplicationWindow>
  669. #include <MSceneManager>
  670.  
  671. -#include <QFileInfo>
  672. -#include <QPointer>
  673. +#include <QtCore/QFileInfo>
  674. +#include <QtCore/QPointer>
  675.  
  676. #include <SelectSingleContentItemPage.h>
  677. #include <SelectMultipleContentItemsPage.h>
  678. diff -ur mozilla-release.orig/widget/qt/nsSound.cpp mozilla-release/widget/qt/nsSound.cpp
  679. --- mozilla-release.orig/widget/qt/nsSound.cpp 2012-06-19 21:29:35.819451627 -0700
  680. +++ mozilla-release/widget/qt/nsSound.cpp 2012-06-19 22:39:10.153172562 -0700
  681. @@ -36,8 +36,8 @@
  682. *
  683. * ***** END LICENSE BLOCK ***** */
  684.  
  685. -#include <QApplication>
  686. -#include <QSound>
  687. +#include <QtGui/QApplication>
  688. +#include <QtGui/QSound>
  689.  
  690. #include <string.h>
  691. #if defined(ANDROID) || defined(OS_POSIX)
  692. diff -ur mozilla-release.orig/widget/qt/nsClipboard.cpp mozilla-release/widget/qt/nsClipboard.cpp
  693. --- mozilla-release.orig/widget/qt/nsClipboard.cpp 2012-06-14 11:50:08.000000000 -0700
  694. +++ mozilla-release/widget/qt/nsClipboard.cpp 2012-06-19 22:41:13.729357011 -0700
  695. @@ -40,14 +40,14 @@
  696. *
  697. * ***** END LICENSE BLOCK ***** */
  698.  
  699. -#include <QApplication>
  700. -#include <QMimeData>
  701. -#include <QString>
  702. -#include <QStringList>
  703. -#include <QByteArray>
  704. -#include <QImage>
  705. -#include <QImageWriter>
  706. -#include <QBuffer>
  707. +#include <QtGui/QApplication>
  708. +#include <QtCore/QMimeData>
  709. +#include <QtCore/QString>
  710. +#include <QtCore/QStringList>
  711. +#include <QtCore/QByteArray>
  712. +#include <QtGui/QImage>
  713. +#include <QtGui/QImageWriter>
  714. +#include <QtCore/QBuffer>
  715.  
  716. #include "mozilla/Util.h"
  717.  
  718. diff -ur mozilla-release.orig/dom/system/unix/nsQTMDeviceMotionSystem.cpp mozilla-release/dom/system/unix/nsQTMDeviceMotionSystem.cpp
  719. --- mozilla-release.orig/dom/system/unix/nsQTMDeviceMotionSystem.cpp 2012-06-14 11:49:32.000000000 -0700
  720. +++ mozilla-release/dom/system/unix/nsQTMDeviceMotionSystem.cpp 2012-06-19 22:41:27.289303302 -0700
  721. @@ -37,7 +37,7 @@
  722.  
  723. #include "mozilla/dom/ContentChild.h"
  724. #include "nsQTMDeviceMotionSystem.h"
  725. -#include <QObject>
  726. +#include <QtCore/QObject>
  727. #include <QtSensors/QAccelerometer>
  728. #include <QtSensors/QRotationSensor>
  729.  
  730. diff -ur mozilla-release.orig/dom/system/unix/nsHapticFeedback.cpp mozilla-release/dom/system/unix/nsHapticFeedback.cpp
  731. diff -ur mozilla-release.orig/dom/plugins/base/nsNPAPIPlugin.cpp mozilla-release/dom/plugins/base/nsNPAPIPlugin.cpp
  732. --- mozilla-release.orig/dom/plugins/base/nsNPAPIPlugin.cpp 2012-06-14 11:49:32.000000000 -0700
  733. +++ mozilla-release/dom/plugins/base/nsNPAPIPlugin.cpp 2012-06-19 22:42:53.402300984 -0700
  734. @@ -37,7 +37,7 @@
  735. * ***** END LICENSE BLOCK ***** */
  736.  
  737. #ifdef MOZ_WIDGET_QT
  738. -#include <QX11Info>
  739. +#include <QtGui/QX11Info>
  740. #endif
  741.  
  742. #include "base/basictypes.h"
  743. diff -ur mozilla-release.orig/dom/plugins/base/nsPluginInstanceOwner.cpp mozilla-release/dom/plugins/base/nsPluginInstanceOwner.cpp
  744. --- mozilla-release.orig/dom/plugins/base/nsPluginInstanceOwner.cpp 2012-06-14 11:49:32.000000000 -0700
  745. +++ mozilla-release/dom/plugins/base/nsPluginInstanceOwner.cpp 2012-06-19 22:43:47.698755931 -0700
  746. @@ -45,10 +45,10 @@
  747. * ***** END LICENSE BLOCK ***** */
  748.  
  749. #ifdef MOZ_WIDGET_QT
  750. -#include <QWidget>
  751. -#include <QKeyEvent>
  752. +#include <QtGui/QWidget>
  753. +#include <QtGui/QKeyEvent>
  754. #ifdef MOZ_X11
  755. -#include <QX11Info>
  756. +#include <QtGui/QX11Info>
  757. #endif
  758. #undef slots
  759. #endif
  760. diff -ur mozilla-release.orig/dom/plugins/ipc/PluginInstanceChild.cpp mozilla-release/dom/plugins/ipc/PluginInstanceChild.cpp
  761. --- mozilla-release.orig/dom/plugins/ipc/PluginInstanceChild.cpp 2012-06-14 11:49:32.000000000 -0700
  762. +++ mozilla-release/dom/plugins/ipc/PluginInstanceChild.cpp 2012-06-19 22:45:08.681773624 -0700
  763. @@ -38,10 +38,10 @@
  764. * ***** END LICENSE BLOCK ***** */
  765.  
  766. #if defined(MOZ_WIDGET_QT) && (MOZ_PLATFORM_MAEMO == 6)
  767. -#include <QEvent>
  768. -#include <QKeyEvent>
  769. -#include <QApplication>
  770. -#include <QInputMethodEvent>
  771. +#include <QtCore/QEvent>
  772. +#include <QtGui/QKeyEvent>
  773. +#include <QtGui/QApplication>
  774. +#include <QtGui/QInputMethodEvent>
  775. #include "nsQtKeyUtils.h"
  776. #endif
  777.  
  778. @@ -85,7 +85,7 @@
  779. #include "gtk2xtbin.h"
  780.  
  781. #elif defined(MOZ_WIDGET_QT)
  782. -#include <QX11Info>
  783. +#include <QtGui/QX11Info>
  784. #undef KeyPress
  785. #undef KeyRelease
  786. #elif defined(OS_WIN)
  787. diff -ur mozilla-release.orig/dom/plugins/test/testplugin/nptest_qt.cpp mozilla-release/dom/plugins/test/testplugin/nptest_qt.cpp
  788. --- mozilla-release.orig/dom/plugins/test/testplugin/nptest_qt.cpp 2012-06-14 11:49:32.000000000 -0700
  789. +++ mozilla-release/dom/plugins/test/testplugin/nptest_qt.cpp 2012-06-19 22:45:27.448366875 -0700
  790. @@ -30,8 +30,8 @@
  791. * Josh Aas <josh@mozilla.com>
  792. *
  793. * ***** END LICENSE BLOCK ***** */
  794. -#include <QWidget>
  795. -#include <QPainter>
  796. +#include <QtGui/QWidget>
  797. +#include <QtGui/QPainter>
  798.  
  799. #include "nptest_platform.h"
  800. #include "npapi.h"
  801. diff -ur mozilla-release.orig/gfx/thebes/gfxFT2FontList.cpp mozilla-release/gfx/thebes/gfxFT2FontList.cpp
  802. --- mozilla-release.orig/gfx/thebes/gfxFT2FontList.cpp 2012-06-14 11:49:37.000000000 -0700
  803. +++ mozilla-release/gfx/thebes/gfxFT2FontList.cpp 2012-06-19 22:46:20.361494301 -0700
  804. @@ -45,7 +45,7 @@
  805. #include "gfxPlatformGtk.h"
  806. #define gfxToolkitPlatform gfxPlatformGtk
  807. #elif defined(MOZ_WIDGET_QT)
  808. -#include <qfontinfo.h>
  809. +#include <QtGui/qfontinfo.h>
  810. #include "gfxQtPlatform.h"
  811. #define gfxToolkitPlatform gfxQtPlatform
  812. #elif defined(XP_WIN)
  813. diff -ur mozilla-release.orig/gfx/thebes/gfxFT2Fonts.cpp mozilla-release/gfx/thebes/gfxFT2Fonts.cpp
  814. --- mozilla-release.orig/gfx/thebes/gfxFT2Fonts.cpp 2012-06-14 11:49:37.000000000 -0700
  815. +++ mozilla-release/gfx/thebes/gfxFT2Fonts.cpp 2012-06-19 22:46:37.718092819 -0700
  816. @@ -38,7 +38,7 @@
  817. #include "gfxPlatformGtk.h"
  818. #define gfxToolkitPlatform gfxPlatformGtk
  819. #elif defined(MOZ_WIDGET_QT)
  820. -#include <qfontinfo.h>
  821. +#include <QtGui/qfontinfo.h>
  822. #include "gfxQtPlatform.h"
  823. #define gfxToolkitPlatform gfxQtPlatform
  824. #elif defined(XP_WIN)
  825. diff -ur mozilla-release.orig/image/decoders/icon/qt/nsIconChannel.cpp mozilla-release/image/decoders/icon/qt/nsIconChannel.cpp
  826. --- mozilla-release.orig/image/decoders/icon/qt/nsIconChannel.cpp 2012-06-14 11:49:37.000000000 -0700
  827. +++ mozilla-release/image/decoders/icon/qt/nsIconChannel.cpp 2012-06-19 22:47:14.887947855 -0700
  828. @@ -35,9 +35,9 @@
  829. *
  830. * ***** END LICENSE BLOCK ***** */
  831.  
  832. -#include <QIcon>
  833. -#include <QStyle>
  834. -#include <QApplication>
  835. +#include <QtGui/QIcon>
  836. +#include <QtGui/QStyle>
  837. +#include <QtGui/QApplication>
  838.  
  839. #include <stdlib.h>
  840. #include <unistd.h>
  841. diff -ur mozilla-release.orig/uriloader/exthandler/unix/nsOSHelperAppService.cpp mozilla-release/uriloader/exthandler/unix/nsOSHelperAppService.cpp
  842. --- mozilla-release.orig/uriloader/exthandler/unix/nsOSHelperAppService.cpp 2012-06-14 11:50:07.000000000 -0700
  843. +++ mozilla-release/uriloader/exthandler/unix/nsOSHelperAppService.cpp 2012-06-19 22:47:30.334554277 -0700
  844. @@ -43,7 +43,7 @@
  845.  
  846. #if defined(MOZ_ENABLE_CONTENTACTION)
  847. #include <contentaction/contentaction.h>
  848. -#include <QString>
  849. +#include <QtCore/QString>
  850. #endif
  851.  
  852. #include "nsOSHelperAppService.h"
  853. diff -ur mozilla-release.orig/xpcom/io/nsLocalFileUnix.cpp mozilla-release/xpcom/io/nsLocalFileUnix.cpp
  854. --- mozilla-release.orig/xpcom/io/nsLocalFileUnix.cpp 2012-06-14 11:50:08.000000000 -0700
  855. +++ mozilla-release/xpcom/io/nsLocalFileUnix.cpp 2012-06-19 22:48:12.887721482 -0700
  856. @@ -70,8 +70,8 @@
  857. #endif
  858.  
  859. #if (MOZ_PLATFORM_MAEMO == 6)
  860. -#include <QUrl>
  861. -#include <QString>
  862. +#include <QtCore/QUrl>
  863. +#include <QtCore/QString>
  864. #if (MOZ_ENABLE_CONTENTACTION)
  865. #include <contentaction/contentaction.h>
  866. #endif
  867. diff -ur mozilla-release.orig/widget/shared/nsShmImage.h mozilla-release/widget/shared/nsShmImage.h
  868. --- mozilla-release.orig/widget/shared/nsShmImage.h 2012-06-14 11:50:08.000000000 -0700
  869. +++ mozilla-release/widget/shared/nsShmImage.h 2012-06-20 01:56:43.810275551 -0700
  870. @@ -59,7 +59,7 @@
  871. #if defined(MOZ_WIDGET_GTK2) || defined(MOZ_WIDGET_GTK3)
  872. #define DISPLAY gdk_x11_get_default_xdisplay
  873. #elif defined(MOZ_WIDGET_QT)
  874. -#include "QX11Info"
  875. +#include <QtGui/QX11Info>
  876. #define DISPLAY QX11Info().display
  877. #endif
  878.  
  879. diff -ur mozilla-release.orig/widget/qt/nsScreenManagerQt.cpp mozilla-release/widget/qt/nsScreenManagerQt.cpp
  880. --- mozilla-release.orig/widget/qt/nsScreenManagerQt.cpp 2012-06-14 11:50:08.000000000 -0700
  881. +++ mozilla-release/widget/qt/nsScreenManagerQt.cpp 2012-06-20 09:36:07.522776653 -0700
  882. @@ -37,8 +37,8 @@
  883. *
  884. * ***** END LICENSE BLOCK ***** */
  885.  
  886. -#include "qdesktopwidget.h"
  887. -#include "qapplication.h"
  888. +#include <QtGui/qdesktopwidget.h>
  889. +#include <QtGui/qapplication.h>
  890.  
  891. #include "nsScreenManagerQt.h"
  892. #include "nsScreenQt.h"
  893. diff -ur mozilla-release.orig/widget/qt/nsDragService.cpp mozilla-release/widget/qt/nsDragService.cpp
  894. --- mozilla-release.orig/widget/qt/nsDragService.cpp 2012-06-14 11:50:08.000000000 -0700
  895. +++ mozilla-release/widget/qt/nsDragService.cpp 2012-06-20 11:35:39.651471909 -0700
  896. @@ -36,8 +36,8 @@
  897. *
  898. * ***** END LICENSE BLOCK ***** */
  899.  
  900. -#include "qmimedata.h"
  901. -#include "qwidget.h"
  902. +#include <QtCore/qmimedata.h>
  903. +#include <QtGui/qwidget.h>
  904.  
  905. #include "nsDragService.h"
  906. #include "nsISupportsPrimitives.h"
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!