Skip to content

Commit

Permalink
2023-11-11 13:43 UTC+0100 Przemyslaw Czerpak (druzus/at/poczta.onet.pl)
Browse files Browse the repository at this point in the history
  * contrib/gtqtc/gtqtc.h
    * use QT_VERSION >= 0x050000 instead of QT_VERSION <= 0x040900
    * indenting
  • Loading branch information
druzus committed Nov 11, 2023
1 parent d12558f commit 41bf0e1
Show file tree
Hide file tree
Showing 2 changed files with 24 additions and 19 deletions.
5 changes: 5 additions & 0 deletions ChangeLog.txt
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,11 @@
Entries may not always be in chronological/commit order.
See license at the end of file. */

2023-11-11 13:43 UTC+0100 Przemyslaw Czerpak (druzus/at/poczta.onet.pl)
* contrib/gtqtc/gtqtc.h
* use QT_VERSION >= 0x050000 instead of QT_VERSION <= 0x040900
* indenting

2023-11-11 13:33 UTC+0100 Przemyslaw Czerpak (druzus/at/poczta.onet.pl)
* src/common/hbdate.c
* accept timestamp values with trailing "Z" indicating UTC time
Expand Down
38 changes: 19 additions & 19 deletions contrib/gtqtc/gtqtc.h
Original file line number Diff line number Diff line change
Expand Up @@ -65,18 +65,7 @@
#include <QtGui/QMouseEvent>
#include <QtCore/QTimer>

#if QT_VERSION <= 0x040900
#include <QtGui/QApplication>
#include <QtGui/QMainWindow>
#include <QtGui/QDesktopWidget>
#include <QtGui/QWidget>
#include <QtGui/QMessageBox>
#include <QtGui/QAbstractButton>
#include <QtGui/QAction>
#ifdef HB_QT_SOUND
#include <QtGui/QSound>
#endif
#else
#if QT_VERSION >= 0x050000
#include <QtGui/QScreen>
#include <QtWidgets/QApplication>
#include <QtWidgets/QMainWindow>
Expand All @@ -88,6 +77,17 @@
#ifdef HB_QT_SOUND
#include <QtMultimedia/QSound>
#endif
#else
#include <QtGui/QApplication>
#include <QtGui/QMainWindow>
#include <QtGui/QDesktopWidget>
#include <QtGui/QWidget>
#include <QtGui/QMessageBox>
#include <QtGui/QAbstractButton>
#include <QtGui/QAction>
#ifdef HB_QT_SOUND
#include <QtGui/QSound>
#endif
#endif

#include "hbapi.h"
Expand Down Expand Up @@ -394,18 +394,18 @@ class QTConsole : public QWidget

class QTCWindow : public QMainWindow
{
Q_OBJECT
Q_OBJECT

public:
QTCWindow( PHB_GTQTC pQTC );
virtual ~QTCWindow( void );
QTCWindow( PHB_GTQTC pQTC );
virtual ~QTCWindow( void );

QTConsole * qConsole;
void setWindowSize( void );
void setResizing( void );
QTConsole * qConsole;
void setWindowSize( void );
void setResizing( void );

protected:
void closeEvent( QCloseEvent * evt );
void closeEvent( QCloseEvent * evt );
};

#endif /* HB_QTC_H_ */

0 comments on commit 41bf0e1

Please sign in to comment.