paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-09-30 10:29:29 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merged revision(s) 43062 #cf2ec123c7 from trunk:

Browse Source 
Qt: fix conditional switches. issue #25139
........

git-svn-id: branches/fixes_1_2@43120 -
This commit is contained in:
martin 2013-10-06 12:02:05 +00:00
parent 56c6087153
commit ce01175490
1 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
lcl/interfaces/qt/qt45.pas
View File

@ -59,7 +59,7 @@ const
type
PLong = ^Long;
{$ifdef CPU64 and not WIN64}
{$if defined(CPU64) and not defined(WIN64)}
Long = Int64;
{$else}
Long = LongInt;
@ -1871,7 +1871,7 @@ procedure QCoreApplication_removeTranslator(messageFile: QTranslatorH); cdecl; e
procedure QCoreApplication_translate(retval: PWideString; context: PAnsiChar; key: PAnsiChar; disambiguation: PAnsiChar = nil; encoding: QCoreApplicationEncoding = QCoreApplicationCodecForTr); cdecl; external Qt4PasLib name 'QCoreApplication_translate';
procedure QCoreApplication_translate(retval: PWideString; context: PAnsiChar; key: PAnsiChar; disambiguation: PAnsiChar; encoding: QCoreApplicationEncoding; n: Integer); cdecl; external Qt4PasLib name 'QCoreApplication_translate2';
procedure QCoreApplication_flush(); cdecl; external Qt4PasLib name 'QCoreApplication_flush';
{$ifdef BINUX or DARWIN or QTOPIA }
{$if defined(BINUX) or defined(DARWIN) or defined(QTOPIA)}
procedure QCoreApplication_watchUnixSignal(signal: Integer; watch: Boolean); cdecl; external Qt4PasLib name 'QCoreApplication_watchUnixSignal';
{$endif}
function QCoreApplication_setEventFilter(handle: QCoreApplicationH; filter: QCoreApplicationEventFilter): QCoreApplicationEventFilter; cdecl; external Qt4PasLib name 'QCoreApplication_setEventFilter';
@ -4131,7 +4131,7 @@ function QApplication_x11EventFilter(handle: QApplicationH; AnonParam1: PEvent):
function QApplication_x11ClientMessage(handle: QApplicationH; AnonParam1: QWidgetH; AnonParam2: PEvent; passive_only: Boolean): Integer; cdecl; external Qt4PasLib name 'QApplication_x11ClientMessage';
function QApplication_x11ProcessEvent(handle: QApplicationH; AnonParam1: PEvent): Integer; cdecl; external Qt4PasLib name 'QApplication_x11ProcessEvent';
{$endif}
{$ifdef BINUX or MSWINDOWS or DARWIN }
{$if defined(BINUX) or defined(MSWINDOWS) or defined(DARWIN)}
function QApplication_isSessionRestored(handle: QApplicationH): Boolean; cdecl; external Qt4PasLib name 'QApplication_isSessionRestored';
procedure QApplication_sessionId(handle: QApplicationH; retval: PWideString); cdecl; external Qt4PasLib name 'QApplication_sessionId';
procedure QApplication_sessionKey(handle: QApplicationH; retval: PWideString); cdecl; external Qt4PasLib name 'QApplication_sessionKey';
@ -4171,7 +4171,7 @@ type
QApplication_lastWindowClosed_Event = procedure () of object cdecl;
QApplication_focusChanged_Event = procedure (old: QWidgetH; now: QWidgetH) of object cdecl;
QApplication_fontDatabaseChanged_Event = procedure () of object cdecl;
{$ifdef BINUX or MSWINDOWS or DARWIN }
{$if defined(BINUX) or defined(MSWINDOWS) or defined(DARWIN) }
QApplication_commitDataRequest_Event = procedure (sessionManager: QSessionManagerH) of object cdecl;
QApplication_saveStateRequest_Event = procedure (sessionManager: QSessionManagerH) of object cdecl;
{$endif}
@ -4602,7 +4602,7 @@ function QWidget_childAt(handle: QWidgetH; p: PQtPoint): QWidgetH; cdecl; extern
function QWidget_x11Info(handle: QWidgetH): QX11InfoH; cdecl; external Qt4PasLib name 'QWidget_x11Info';
function QWidget_x11PictureHandle(handle: QWidgetH): QtHANDLE; cdecl; external Qt4PasLib name 'QWidget_x11PictureHandle';
{$endif}
{$ifdef BINUX or DARWIN or QTOPIA }
{$if defined(BINUX) or defined(DARWIN) or defined(QTOPIA)}
function QWidget_handle(handle: QWidgetH): QtHANDLE; cdecl; external Qt4PasLib name 'QWidget_handle';
{$endif}
procedure QWidget_setAttribute(handle: QWidgetH; AnonParam1: QtWidgetAttribute; _on: Boolean = True); cdecl; external Qt4PasLib name 'QWidget_setAttribute';
@ -5139,7 +5139,7 @@ procedure QCursor_hotSpot(handle: QCursorH; retval: PQtPoint); cdecl; external Q
procedure QCursor_pos(retval: PQtPoint); cdecl; external Qt4PasLib name 'QCursor_pos';
procedure QCursor_setPos(x: Integer; y: Integer); cdecl; external Qt4PasLib name 'QCursor_setPos';
procedure QCursor_setPos(p: PQtPoint); cdecl; external Qt4PasLib name 'QCursor_setPos2';
{$ifdef BINUX or DARWIN }
{$if defined(BINUX) or defined(DARWIN)}
function QCursor_handle(handle: QCursorH): QtHANDLE; cdecl; external Qt4PasLib name 'QCursor_handle';
{$endif}
{$ifdef BINUX }
@ -5338,21 +5338,21 @@ type
QShortcut_activatedAmbiguously_Event = procedure () of object cdecl;
{$ifdef BINUX or MSWINDOWS or DARWIN }
{$if defined(BINUX) or defined(MSWINDOWS) or defined(DARWIN)}
type
QSessionManagerRestartHint = ( // QSessionManager::RestartHint (1)
QSessionManagerRestartIfRunning, QSessionManagerRestartAnyway, QSessionManagerRestartImmediately, QSessionManagerRestartNever );
{$endif}
{$ifdef BINUX or MSWINDOWS or DARWIN }
{$if defined(BINUX) or defined(MSWINDOWS) or defined(DARWIN)}
procedure QSessionManager_sessionId(handle: QSessionManagerH; retval: PWideString); cdecl; external Qt4PasLib name 'QSessionManager_sessionId';
procedure QSessionManager_sessionKey(handle: QSessionManagerH; retval: PWideString); cdecl; external Qt4PasLib name 'QSessionManager_sessionKey';
{$endif}
{$ifdef BINUX or DARWIN }
{$if defined(BINUX) or defined(DARWIN)}
function QSessionManager_handle(handle: QSessionManagerH): Pointer; cdecl; external Qt4PasLib name 'QSessionManager_handle';
{$endif}
{$ifdef BINUX or MSWINDOWS or DARWIN }
{$if defined(BINUX) or defined(MSWINDOWS) or defined(DARWIN)}
function QSessionManager_allowsInteraction(handle: QSessionManagerH): Boolean; cdecl; external Qt4PasLib name 'QSessionManager_allowsInteraction';
function QSessionManager_allowsErrorInteraction(handle: QSessionManagerH): Boolean; cdecl; external Qt4PasLib name 'QSessionManager_allowsErrorInteraction';
procedure QSessionManager_release(handle: QSessionManagerH); cdecl; external Qt4PasLib name 'QSessionManager_release';
@ -6177,7 +6177,7 @@ procedure QPrinter_paperRect(handle: QPrinterH; retval: PRect); cdecl; external
procedure QPrinter_pageRect(handle: QPrinterH; retval: PRect); cdecl; external Qt4PasLib name 'QPrinter_pageRect';
procedure QPrinter_paperRect(handle: QPrinterH; retval: QRectFH; AnonParam1: QPrinterUnit); cdecl; external Qt4PasLib name 'QPrinter_paperRect2';
procedure QPrinter_pageRect(handle: QPrinterH; retval: QRectFH; AnonParam1: QPrinterUnit); cdecl; external Qt4PasLib name 'QPrinter_pageRect2';
{$ifdef BINUX or DARWIN or QTOPIA }
{$if defined(BINUX) or defined(DARWIN) or defined(QTOPIA)}
procedure QPrinter_printerSelectionOption(handle: QPrinterH; retval: PWideString); cdecl; external Qt4PasLib name 'QPrinter_printerSelectionOption';
procedure QPrinter_setPrinterSelectionOption(handle: QPrinterH; AnonParam1: PWideString); cdecl; external Qt4PasLib name 'QPrinter_setPrinterSelectionOption';
{$endif}
@ -6487,7 +6487,7 @@ function QFont_rawMode(handle: QFontH): Boolean; cdecl; external Qt4PasLib name
procedure QFont_setRawMode(handle: QFontH; AnonParam1: Boolean); cdecl; external Qt4PasLib name 'QFont_setRawMode';
function QFont_exactMatch(handle: QFontH): Boolean; cdecl; external Qt4PasLib name 'QFont_exactMatch';
function QFont_isCopyOf(handle: QFontH; AnonParam1: QFontH): Boolean; cdecl; external Qt4PasLib name 'QFont_isCopyOf';
{$ifdef BINUX or DARWIN or QTOPIA }
{$if defined(BINUX) or defined(DARWIN) or defined(QTOPIA)}
function QFont_handle(handle: QFontH): QtHANDLE; cdecl; external Qt4PasLib name 'QFont_handle';
{$endif}
procedure QFont_setRawName(handle: QFontH; AnonParam1: PWideString); cdecl; external Qt4PasLib name 'QFont_setRawName';
@ -6503,7 +6503,7 @@ procedure QFont_insertSubstitutions(AnonParam1: PWideString; AnonParam2: QString
procedure QFont_removeSubstitution(AnonParam1: PWideString); cdecl; external Qt4PasLib name 'QFont_removeSubstitution';
procedure QFont_initialize(); cdecl; external Qt4PasLib name 'QFont_initialize';
procedure QFont_cleanup(); cdecl; external Qt4PasLib name 'QFont_cleanup';
{$ifdef BINUX or MSWINDOWS or DARWIN }
{$if defined(BINUX) or defined(MSWINDOWS) or defined(DARWIN)}
procedure QFont_cacheStatistics(); cdecl; external Qt4PasLib name 'QFont_cacheStatistics';
{$endif}
procedure QFont_defaultFamily(handle: QFontH; retval: PWideString); cdecl; external Qt4PasLib name 'QFont_defaultFamily';
@ -7151,7 +7151,7 @@ procedure QPixmap_x11SetScreen(handle: QPixmapH; screen: Integer); cdecl; extern
function QPixmap_x11Info(handle: QPixmapH): QX11InfoH; cdecl; external Qt4PasLib name 'QPixmap_x11Info';
function QPixmap_x11PictureHandle(handle: QPixmapH): QtHANDLE; cdecl; external Qt4PasLib name 'QPixmap_x11PictureHandle';
{$endif}
{$ifdef BINUX or QTOPIA }
{$if defined(BINUX) or defined(QTOPIA)}
function QPixmap_handle(handle: QPixmapH): QtHANDLE; cdecl; external Qt4PasLib name 'QPixmap_handle';
{$endif}
function QPixmap_paintEngine(handle: QPixmapH): QPaintEngineH; cdecl; external Qt4PasLib name 'QPixmap_paintEngine';
@ -10506,7 +10506,7 @@ function QPrintDialog_create(printer: QPrinterH; parent: QWidgetH = nil): QPrint
procedure QPrintDialog_destroy(handle: QPrintDialogH); cdecl; external Qt4PasLib name 'QPrintDialog_destroy';
function QPrintDialog_create(parent: QWidgetH = nil): QPrintDialogH; cdecl; external Qt4PasLib name 'QPrintDialog_create2';
function QPrintDialog_exec(handle: QPrintDialogH): Integer; cdecl; external Qt4PasLib name 'QPrintDialog_exec';
{$ifdef BINUX or QTOPIA }
{$if defined(BINUX) or defined(QTOPIA)}
procedure QPrintDialog_accept(handle: QPrintDialogH); cdecl; external Qt4PasLib name 'QPrintDialog_accept';
{$endif}
procedure QPrintDialog_done(handle: QPrintDialogH; result: Integer); cdecl; external Qt4PasLib name 'QPrintDialog_done';
@ -10514,7 +10514,7 @@ procedure QPrintDialog_setOption(handle: QPrintDialogH; option: QAbstractPrintDi
function QPrintDialog_testOption(handle: QPrintDialogH; option: QAbstractPrintDialogPrintDialogOption): Boolean; cdecl; external Qt4PasLib name 'QPrintDialog_testOption';
procedure QPrintDialog_setOptions(handle: QPrintDialogH; options: QAbstractPrintDialogPrintDialogOptions); cdecl; external Qt4PasLib name 'QPrintDialog_setOptions';
function QPrintDialog_options(handle: QPrintDialogH): QAbstractPrintDialogPrintDialogOptions; cdecl; external Qt4PasLib name 'QPrintDialog_options';
{$ifdef BINUX or DARWIN or QTOPIA }
{$if defined(BINUX) or defined(DARWIN) or defined(QTOPIA)}
procedure QPrintDialog_setVisible(handle: QPrintDialogH; visible: Boolean); cdecl; external Qt4PasLib name 'QPrintDialog_setVisible';
{$endif}
procedure QPrintDialog_open(handle: QPrintDialogH; receiver: QObjectH; member: PAnsiChar); cdecl; external Qt4PasLib name 'QPrintDialog_open';
@ -13360,7 +13360,7 @@ procedure QApplication_hook_destroy(handle: QApplication_hookH); cdecl; external
procedure QApplication_hook_hook_lastWindowClosed(handle: QApplication_hookH; hook: QApplication_lastWindowClosed_Event); cdecl; external Qt4PasLib name 'QApplication_hook_hook_lastWindowClosed';
procedure QApplication_hook_hook_focusChanged(handle: QApplication_hookH; hook: QApplication_focusChanged_Event); cdecl; external Qt4PasLib name 'QApplication_hook_hook_focusChanged';
procedure QApplication_hook_hook_fontDatabaseChanged(handle: QApplication_hookH; hook: QApplication_fontDatabaseChanged_Event); cdecl; external Qt4PasLib name 'QApplication_hook_hook_fontDatabaseChanged';
{$ifdef BINUX or MSWINDOWS or DARWIN }
{$if defined(BINUX) or defined(MSWINDOWS) or defined(DARWIN)}
procedure QApplication_hook_hook_commitDataRequest(handle: QApplication_hookH; hook: QApplication_commitDataRequest_Event); cdecl; external Qt4PasLib name 'QApplication_hook_hook_commitDataRequest';
procedure QApplication_hook_hook_saveStateRequest(handle: QApplication_hookH; hook: QApplication_saveStateRequest_Event); cdecl; external Qt4PasLib name 'QApplication_hook_hook_saveStateRequest';
{$endif}