Added support for Qt 4.2.x

git-svn-id: trunk@11352 -
This commit is contained in:
sekelsenmat 2007-06-21 13:43:20 +00:00
parent e128307175
commit 236bcd8d46
17 changed files with 8942 additions and 15 deletions

1
.gitattributes vendored
View File

@ -2678,6 +2678,7 @@ lcl/interfaces/gtk2/tests/checkbuttononfixed.lpr svneol=native#text/plain
lcl/interfaces/qt/README.txt svneol=native#text/plain
lcl/interfaces/qt/interfaces.pp svneol=native#text/pascal
lcl/interfaces/qt/qt4.pas svneol=native#text/plain
lcl/interfaces/qt/qt42.pas -text
lcl/interfaces/qt/qtcallback.inc svneol=native#text/pascal
lcl/interfaces/qt/qtint.pp svneol=native#text/pascal
lcl/interfaces/qt/qtlclintf.inc svneol=native#text/pascal

8847
lcl/interfaces/qt/qt42.pas Normal file

File diff suppressed because it is too large Load Diff

View File

@ -35,7 +35,11 @@ interface
uses
// Bindings - qt4 must come first to avoid type redefinition problems on Windows
{$ifdef USE_QT_4_2}
qt42,
{$else}
qt4,
{$endif}
// FPC
Classes, SysUtils, Math, Types,
// LCL

View File

@ -27,7 +27,11 @@ interface
uses
// Bindings
{$ifdef USE_QT_4_2}
qt42,
{$else}
qt4,
{$endif}
// Free Pascal
Classes, SysUtils, Types,
// LCL

View File

@ -27,7 +27,11 @@ interface
uses
// Bindings
{$ifdef USE_QT_4_2}
qt42,
{$else}
qt4,
{$endif}
// Free Pascal
Classes, SysUtils, Types,
// LCL

View File

@ -18,7 +18,11 @@ uses
// rtl
Types, Classes, SysUtils,
// qt bindings
{$ifdef USE_QT_4_2}
qt42,
{$else}
qt4,
{$endif}
// lcl
LCLType, LCLProc, LCLIntf, Graphics, Themes, TmSchema,
// widgetset

View File

@ -27,7 +27,12 @@ interface
uses
// Bindings
qt4, qtobjects,
{$ifdef USE_QT_4_2}
qt42,
{$else}
qt4,
{$endif}
qtobjects,
// Free Pascal
Classes, SysUtils, Types,
// LCL
@ -132,7 +137,9 @@ type
protected
function CreateWidget(const AParams: TCreateParams):QWidgetH; override;
public
{$ifndef USE_QT_4_2}
MDIAreaHandle: QMDIAreaH;
{$endif}
Splitter: QSplitterH;
MenuBar: TQtMenuBar;
ToolBar: TQtToolBar;
@ -1848,8 +1855,10 @@ function TQtMainWindow.CreateWidget(const AParams: TCreateParams): QWidgetH;
var
w: QWidgetH;
r: TRect;
{$ifndef USE_QT_4_2}
mdihandle: QMdiAreaH;
toolbar: QToolBarH;
{$endif}
begin
// Creates the widget
{$ifdef VerboseQt}
@ -1859,7 +1868,9 @@ begin
w := QApplication_activeWindow;
// mainform should be TQtMainWindow ...
{$define mdidevel}
{$ifndef USE_QT_4_2}
{$define mdidevel}
{$endif}
if not Assigned(w) and not (Application.MainForm.Visible) then
begin
Result := QMainWindow_create(nil, QtWindow);
@ -1876,8 +1887,10 @@ begin
QMainWindow_setCentralWidget(QMainWindowH(Result), MDIAreaHandle);
{$endif}
QMainWindow_setDockOptions(QMainWindowH(Result) ,QMainWindowAnimatedDocks);
{$ifndef USE_QT_4_2}
QMainWindow_setDockOptions(QMainWindowH(Result), QMainWindowAnimatedDocks);
{$endif}
end else
begin
{$ifdef mdidevel}

View File

@ -28,7 +28,12 @@ interface
uses
// Libs
qt4, qtwidgets,
{$ifdef USE_QT_4_2}
qt42,
{$else}
qt4,
{$endif}
qtwidgets,
// LCL
SysUtils, Controls, LCLType, Forms, InterfaceBase, Buttons, LMessages, Graphics,
// Widgetset

View File

@ -28,7 +28,12 @@ interface
uses
// Bindings
qt4, qtwidgets, qtprivate, qtobjects,
{$ifdef USE_QT_4_2}
qt42,
{$else}
qt4,
{$endif}
qtwidgets, qtprivate, qtobjects,
// LCL
Classes, ComCtrls, Controls, LCLType, Graphics, LCLProc, LCLIntf,
// Widgetset
@ -1262,7 +1267,7 @@ var
begin
TW := QTreeWidgetH(TQtTreeWidget(ALV.Handle).Widget);
TWI := QTreeWidget_topLevelItem(TW, AIndex);
if Qt4.QTreeWidgetItem_childCount(TWI) > 0 then
if QTreeWidgetItem_childCount(TWI) > 0 then
QTreeWidget_visualItemRect(TW, @Result, QTreeWidgetItem_child(TWI, ASubItem))
else
QTreeWidget_visualItemRect(TW, @Result, TWI);

View File

@ -28,7 +28,12 @@ interface
uses
// Bindings
qt4, qtwidgets,
{$ifdef USE_QT_4_2}
qt42,
{$else}
qt4,
{$endif}
qtwidgets,
// LCL
SysUtils, Controls, LCLType, LCLProc, Forms, Graphics,
// Widgetset

View File

@ -28,7 +28,12 @@ interface
uses
// Libs
qt4, qtobjects, qtwidgets,
{$ifdef USE_QT_4_2}
qt42,
{$else}
qt4,
{$endif}
qtobjects, qtwidgets,
// RTL + LCL
SysUtils, Classes, LCLType, Dialogs, Controls, Forms,
// Widgetset

View File

@ -28,7 +28,12 @@ interface
uses
// Bindings
qt4, qtwidgets,
{$ifdef USE_QT_4_2}
qt42,
{$else}
qt4,
{$endif}
qtwidgets,
// LCL
SysUtils, Controls, Forms, ExtCtrls, LCLType,
// Widgetset

View File

@ -28,7 +28,12 @@ interface
uses
// Bindings
qt4, qtwidgets,
{$ifdef USE_QT_4_2}
qt42,
{$else}
qt4,
{$endif}
qtwidgets,
// LCL
SysUtils, Controls, LCLType, Forms,
// Widgetset

View File

@ -28,7 +28,12 @@ interface
uses
// Bindings
qt4, qtwidgets,
{$ifdef USE_QT_4_2}
qt42,
{$else}
qt4,
{$endif}
qtwidgets,
// LCL
LCLType, LCLProc, Controls, Grids,
// Widgetset

View File

@ -28,7 +28,12 @@ interface
uses
// Bindings
qt4, qtwidgets, qtobjects,
{$ifdef USE_QT_4_2}
qt42,
{$else}
qt4,
{$endif}
qtwidgets, qtobjects,
// LCL
SysUtils, Classes, Menus, Forms, LCLType, LCLProc,
// Widgetset

View File

@ -28,7 +28,12 @@ interface
uses
// Bindings
qt4, qtwidgets,
{$ifdef USE_QT_4_2}
qt42,
{$else}
qt4,
{$endif}
qtwidgets,
// LCL
Spin, SysUtils, Controls, Classes, LCLType, LCLProc, LCLIntf, Forms,
// Widgetset

View File

@ -28,7 +28,12 @@ interface
uses
// Bindings
qt4, qtprivate, qtwidgets,
{$ifdef USE_QT_4_2}
qt42,
{$else}
qt4,
{$endif}
qtprivate, qtwidgets,
// LCL
Classes, StdCtrls, Controls, Graphics, Forms, SysUtils, InterfaceBase, LCLType, LCLIntf, LCLProc,
// Widgetset