[Qt] Qt 4.4.1

[Den Jean]

On Sunday 21 September 2008 10:13:07 zeljko wrote:
> Anyway when we start with 4.4 inside qtlcl, there must be IFDEF USE_QT44

look carefully at
http://users.telenet.be/Jan.Van.hijfte/qtforfpc/fpcqt4.html
http://users.telenet.be/Jan.Van.hijfte/qtforfpc/Lazarus_OsX.png

-> Qt 4.4.3 :-)

can someone please create a qt44.pas(V1.66) and qt43.pas(V.162) 
and change qt4.pas into

 {$IFDEF USE_QT_44}
  {$i qt44.pas}
{$ELSE }
  {$i qt43.pas}
{$ENDIF}


patch for the rest in attachment

please review patch for:
 - deprecated QEventLoopDeferredDeletion
   http://lists.trolltech.com/qt-interest/2008-03/thread00406-0.html
 - QImageFormatToDepth

kind regards,

Den Jean






-------------- next part --------------
Index: lcl/interfaces/qt/qtobject.inc
===================================================================
--- lcl/interfaces/qt/qtobject.inc      (revision 16992)
+++ lcl/interfaces/qt/qtobject.inc      (working copy)
@@ -179,7 +179,11 @@
 procedure TQtWidgetSet.AppProcessMessages;
 begin
   if QCoreApplication_hasPendingEvents then
+{$IFDEF USE_QT_44}
+    QCoreApplication_processEvents(QEventLoopAllEvents);
+{$ELSE}
     QCoreApplication_processEvents(QEventLoopAllEvents or QEventLoopDeferredDeletion);
+{$ENDIF}
 end;
 
 {------------------------------------------------------------------------------
Index: lcl/interfaces/qt/qtwidgets.pas
===================================================================
--- lcl/interfaces/qt/qtwidgets.pas     (revision 16992)
+++ lcl/interfaces/qt/qtwidgets.pas     (working copy)
@@ -9042,7 +9042,11 @@
 
 procedure TQtFileDialog.setFilter(const AFilter: WideString);
 begin
+{$IFDEF USE_QT_44}
+  QFileDialog_setNameFilter(QFileDialogH(Widget), @AFilter);
+{$ELSE}
   QFileDialog_setFilter(QFileDialogH(Widget), @AFilter);
+{$ENDIF}
 end;
 
 procedure TQtFileDialog.setLabelText(const ALabel: QFileDialogDialogLabel; const AText: WideString);
@@ -9093,7 +9097,12 @@
 
 procedure TQtFileDialog.getFilters(const retval: QStringListH);
 begin
+{$IFDEF USE_QT_44}
+  QFileDialog_nameFilters(QFileDialogH(Widget), retval);
+{$ELSE}
   QFileDialog_filters(QFileDialogH(Widget), retval);
+{$ENDIF}
+
 end;
 
 { TQtGraphicView }
Index: lcl/interfaces/qt/qtlclintf.inc
===================================================================
--- lcl/interfaces/qt/qtlclintf.inc     (revision 16992)
+++ lcl/interfaces/qt/qtlclintf.inc     (working copy)
@@ -367,15 +367,25 @@
 const
   QImageFormatToDepth: array[QImageFormat] of integer =
   (
- { QImageFormat_Invalid              } 0,
- { QImageFormat_Mono                 } 1,
- { QImageFormat_MonoLSB              } 1,
- { QImageFormat_Indexed8             } 8,
- { QImageFormat_RGB32                } 24,
- { QImageFormat_ARGB32               } 32,
- { QImageFormat_ARGB32_Premultiplied } 32,
- { QImageFormat_RGB16                } 16,
- { QImageNImageFormats               } 0
+  { QImageFormat_Invalid                        } 0,
+  { QImageFormat_Mono                           } 1,
+  { QImageFormat_MonoLSB                        } 1,     
+  { QImageFormat_Indexed8                       } 8,
+  { QImageFormat_RGB32                          } 24,
+  { QImageFormat_ARGB32                         } 32,
+  { QImageFormat_ARGB32_Premultiplied           } 32,
+  { QImageFormat_RGB16                          } 16,
+{$IFDEF USE_QT_44}
+  { QImageFormat_ARGB8565_Premultiplied         } 24, 
+  { QImageFormat_RGB666                         } 24, 
+  { QImageFormat_ARGB6666_Premultiplied         } 24, 
+  { QImageFormat_RGB555                         } 16, 
+  { QImageFormat_ARGB8555_Premultiplied         } 24, 
+  { QImageFormat_RGB888                         } 24,
+  { QImageFormat_RGB444                         } 16, 
+  { QImageFormat_ARGB4444_Premultiplied         } 16, 
+{$ENDIF}
+  { QImageNImageFormats                         } 0
   );
 var
   Image: TQtImage absolute ABitmap;