2010-07-09 14:45 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)

* contrib/hbqt/generator/hbqtgen.prg
    + Will now generate hbmk2 style makefiles too.

  + contrib/hbqt/qtgui/filelist.hbm
  + contrib/hbqt/qtcore/filelist.hbm
  + contrib/hbqt/qtnetwork/filelist.hbm
    + Added new generated files.

  * contrib/hbqt/hbqtcore.hbp
  * contrib/hbqt/hbqtnetwork.hbp
  * contrib/hbqt/hbqtgui.hbp
  * contrib/hbqt/qtwebkit/hbqtwebkit.hbp
  * contrib/hbqt/qtdesigner/hbqtdesigner.hbp
    + Added explicit file list instead of relying on wildcards.
This commit is contained in:
Viktor Szakats
2010-07-09 12:45:54 +00:00
parent 06a2d8708d
commit 7ebeda7dad
10 changed files with 664 additions and 20 deletions

View File

@@ -16,6 +16,22 @@
The license applies to all entries newer than 2009-04-28.
*/
2010-07-09 14:45 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
* contrib/hbqt/generator/hbqtgen.prg
+ Will now generate hbmk2 style makefiles too.
+ contrib/hbqt/qtgui/filelist.hbm
+ contrib/hbqt/qtcore/filelist.hbm
+ contrib/hbqt/qtnetwork/filelist.hbm
+ Added new generated files.
* contrib/hbqt/hbqtcore.hbp
* contrib/hbqt/hbqtnetwork.hbp
* contrib/hbqt/hbqtgui.hbp
* contrib/hbqt/qtwebkit/hbqtwebkit.hbp
* contrib/hbqt/qtdesigner/hbqtdesigner.hbp
+ Added explicit file list instead of relying on wildcards.
2010-07-09 11:56 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
* src/rtl/console.c
* src/rtl/hbgtcore.c

View File

@@ -1500,7 +1500,7 @@ STATIC FUNCTION ParseVariables( cProto, cWidget, txt_, doc_, aEnum, func_ )
STATIC FUNCTION BuildHeader( txt_, nMode )
aadd( txt_, "/*" )
aadd( txt_, " * $Id$" )
aadd( txt_, " * $" + "Id" + "$" )
aadd( txt_, " */" )
aadd( txt_, "" )
aadd( txt_, "/* -------------------------------------------------------------------- */" )
@@ -1864,7 +1864,7 @@ STATIC FUNCTION Build_GarbageFile( cpp_, cPathOut )
LOCAL s
aadd( txt_, "/*" )
aadd( txt_, " * $Id$" )
aadd( txt_, " * $" + "Id" + "$" )
aadd( txt_, " */" )
aadd( txt_, "" )
aadd( txt_, "/* -------------------------------------------------------------------- */" )
@@ -1893,12 +1893,13 @@ STATIC FUNCTION Build_GarbageFile( cpp_, cPathOut )
STATIC FUNCTION Build_MakeFile( cpp_, prg_, cPathOut )
LOCAL cFile, s, i
LOCAL txt_ := {}, hdr_:= {}, aSubs := {}
LOCAL hbm_ := {}
HB_SYMBOL_UNUSED( cpp_ )
HB_SYMBOL_UNUSED( prg_ )
aadd( hdr_, "#" )
aadd( hdr_, "# $Id$" )
aadd( hdr_, "# $" + "Id" + "$" )
aadd( hdr_, "#" )
aadd( hdr_, "" )
aadd( hdr_, "# --------------------------------------------------------------------" )
@@ -1925,24 +1926,30 @@ STATIC FUNCTION Build_MakeFile( cpp_, prg_, cPathOut )
FOR i := 1 TO len( aSubs )
txt_:= {}
aeval( hdr_, {|e| aadd( txt_, e ) } )
hbm_ := {}
aeval( hdr_, {|e| aadd( hbm_, e ) } )
aadd( txt_, "CPP_SOURCES := \" )
//
FOR EACH s IN aSubs[ i, 2 ]
aadd( txt_, " " + s + ".cpp \" )
aadd( hbm_, + s + ".cpp" )
NEXT
aadd( hbm_, "" )
aadd( txt_, "" )
aadd( txt_, "" )
aadd( txt_, "" )
aadd( txt_, "PRG_SOURCES := \" )
FOR EACH s IN aSubs[ i, 2 ]
aadd( txt_, " " + "T" + s + ".prg \" )
aadd( hbm_, + "T" + s + ".prg" )
NEXT
aadd( txt_, "" )
aadd( txt_, "# Don't delete this comment, it's here to ensure empty" )
aadd( txt_, "# line above is kept intact." )
//
cFile := iif( empty( cPathOut ), "", cPathOut + s_PathSep + aSubs[ i, 1 ] + s_PathSep ) + "filelist.mk"
CreateTarget( cFile, txt_ )
cFile := iif( empty( cPathOut ), "", cPathOut + s_PathSep + aSubs[ i, 1 ] + s_PathSep )
CreateTarget( cFile + "filelist.mk", txt_ )
CreateTarget( cFile + "filelist.hbm", hbm_ )
NEXT
RETURN NIL

View File

@@ -7,6 +7,4 @@ hbqt_common.hbm
-o${hb_name}
-workdir=${hb_work}/${hb_plat}/${hb_comp}/${hb_name}
qtcore/*.cpp
qtcore/*.prg
qtcore/*.h
qtcore/filelist.hbm

View File

@@ -7,6 +7,4 @@ hbqt_common.hbm
-o${hb_name}
-workdir=${hb_work}/${hb_plat}/${hb_comp}/${hb_name}
qtgui/*.cpp
qtgui/*.prg
qtgui/*.h
qtgui/filelist.hbm

View File

@@ -7,6 +7,4 @@ hbqt_common.hbm
-o${hb_name}
-workdir=${hb_work}/${hb_plat}/${hb_comp}/${hb_name}
qtnetwork/*.cpp
qtnetwork/*.prg
qtnetwork/*.h
qtnetwork/filelist.hbm

View File

@@ -0,0 +1,117 @@
#
# $Id$
#
# --------------------------------------------------------------------
# WARNING: Automatically generated source file. DO NOT EDIT!
# Instead, edit corresponding .qth file,
# or the generator tool itself, and run regenarate.
# --------------------------------------------------------------------
HBDbfModel.cpp
HBEvents.cpp
HBSlots.cpp
QAbstractItemModel.cpp
QAbstractListModel.cpp
QAbstractTableModel.cpp
QBitArray.cpp
QBuffer.cpp
QByteArray.cpp
QChar.cpp
QCoreApplication.cpp
QDataStream.cpp
QDate.cpp
QDateTime.cpp
QDir.cpp
QEvent.cpp
QEventLoop.cpp
QFile.cpp
QFileInfo.cpp
QIODevice.cpp
QLatin1Char.cpp
QLatin1String.cpp
QLine.cpp
QLineF.cpp
QList.cpp
QLocale.cpp
QMimeData.cpp
QModelIndex.cpp
QObject.cpp
QPoint.cpp
QPointF.cpp
QProcess.cpp
QRect.cpp
QRectF.cpp
QRegExp.cpp
QResource.cpp
QSettings.cpp
QSignalMapper.cpp
QSize.cpp
QSizeF.cpp
QStringList.cpp
QTextBoundaryFinder.cpp
QTextCodec.cpp
QTextDecoder.cpp
QTextEncoder.cpp
QTextStream.cpp
QThread.cpp
QTime.cpp
QTimer.cpp
QTranslator.cpp
QUiLoader.cpp
QUrl.cpp
QVariant.cpp
THBDbfModel.prg
THBEvents.prg
THBSlots.prg
TQAbstractItemModel.prg
TQAbstractListModel.prg
TQAbstractTableModel.prg
TQBitArray.prg
TQBuffer.prg
TQByteArray.prg
TQChar.prg
TQCoreApplication.prg
TQDataStream.prg
TQDate.prg
TQDateTime.prg
TQDir.prg
TQEvent.prg
TQEventLoop.prg
TQFile.prg
TQFileInfo.prg
TQIODevice.prg
TQLatin1Char.prg
TQLatin1String.prg
TQLine.prg
TQLineF.prg
TQList.prg
TQLocale.prg
TQMimeData.prg
TQModelIndex.prg
TQObject.prg
TQPoint.prg
TQPointF.prg
TQProcess.prg
TQRect.prg
TQRectF.prg
TQRegExp.prg
TQResource.prg
TQSettings.prg
TQSignalMapper.prg
TQSize.prg
TQSizeF.prg
TQStringList.prg
TQTextBoundaryFinder.prg
TQTextCodec.prg
TQTextDecoder.prg
TQTextEncoder.prg
TQTextStream.prg
TQThread.prg
TQTime.prg
TQTimer.prg
TQTranslator.prg
TQUiLoader.prg
TQUrl.prg
TQVariant.prg

View File

@@ -7,6 +7,20 @@
-o${hb_name}
-workdir=${hb_work}/${hb_plat}/${hb_comp}/${hb_name}
*.cpp
*.prg
*.hpp
QDesignerActionEditorInterface.cpp
QDesignerFormEditorInterface.cpp
QDesignerFormWindowCursorInterface.cpp
QDesignerFormWindowInterface.cpp
QDesignerFormWindowManagerInterface.cpp
QDesignerObjectInspectorInterface.cpp
QDesignerPropertyEditorInterface.cpp
QDesignerWidgetBoxInterface.cpp
TQDesignerActionEditorInterface.prg
TQDesignerFormEditorInterface.prg
TQDesignerFormWindowCursorInterface.prg
TQDesignerFormWindowInterface.prg
TQDesignerFormWindowManagerInterface.prg
TQDesignerObjectInspectorInterface.prg
TQDesignerPropertyEditorInterface.prg
TQDesignerWidgetBoxInterface.prg

View File

@@ -0,0 +1,455 @@
#
# $Id$
#
# --------------------------------------------------------------------
# WARNING: Automatically generated source file. DO NOT EDIT!
# Instead, edit corresponding .qth file,
# or the generator tool itself, and run regenarate.
# --------------------------------------------------------------------
HBQMainWindow.cpp
HBQPlainTextEdit.cpp
HBQSyntaxHighlighter.cpp
HBQTableView.cpp
HBQTextBlockUserData.cpp
QAbstractButton.cpp
QAbstractItemDelegate.cpp
QAbstractItemView.cpp
QAbstractProxyModel.cpp
QAbstractPrintDialog.cpp
QAbstractScrollArea.cpp
QAbstractSlider.cpp
QAbstractSpinBox.cpp
QAbstractTextDocumentLayout.cpp
QAction.cpp
QActionGroup.cpp
QApplication.cpp
QBitmap.cpp
QBoxLayout.cpp
QBrush.cpp
QButtonGroup.cpp
QCalendarWidget.cpp
QCheckBox.cpp
QClipboard.cpp
QColor.cpp
QColorDialog.cpp
QComboBox.cpp
QCommandLinkButton.cpp
QCommonStyle.cpp
QCompleter.cpp
QConicalGradient.cpp
QContextMenuEvent.cpp
QCursor.cpp
QDateEdit.cpp
QDateTimeEdit.cpp
QDesktopWidget.cpp
QDial.cpp
QDialog.cpp
QDirModel.cpp
QDockWidget.cpp
QDoubleSpinBox.cpp
QDropEvent.cpp
QDragMoveEvent.cpp
QDragEnterEvent.cpp
QDragLeaveEvent.cpp
QErrorMessage.cpp
QFileDialog.cpp
QFileIconProvider.cpp
QFileSystemModel.cpp
QFocusEvent.cpp
QFocusFrame.cpp
QFont.cpp
QFontComboBox.cpp
QFontDatabase.cpp
QFontDialog.cpp
QFontInfo.cpp
QFontMetrics.cpp
QFontMetricsF.cpp
QFormLayout.cpp
QFrame.cpp
QGradient.cpp
QGridLayout.cpp
QGroupBox.cpp
QHBoxLayout.cpp
QHeaderView.cpp
QHelpEvent.cpp
QHideEvent.cpp
QIcon.cpp
QInputMethodEvent.cpp
QImage.cpp
QImageReader.cpp
QImageWriter.cpp
QInputDialog.cpp
QInputEvent.cpp
QItemDelegate.cpp
QItemEditorCreatorBase.cpp
QItemEditorFactory.cpp
QItemSelection.cpp
QItemSelectionModel.cpp
QKeyEvent.cpp
QKeySequence.cpp
QLabel.cpp
QLayout.cpp
QLayoutItem.cpp
QLCDNumber.cpp
QLinearGradient.cpp
QLineEdit.cpp
QListView.cpp
QListWidget.cpp
QListWidgetItem.cpp
QMainWindow.cpp
QMatrix.cpp
QMdiArea.cpp
QMdiSubWindow.cpp
QMenu.cpp
QMenuBar.cpp
QMessageBox.cpp
QMouseEvent.cpp
QMoveEvent.cpp
QMovie.cpp
QPageSetupDialog.cpp
QPaintDevice.cpp
QPaintEngine.cpp
QPainter.cpp
QPainterPath.cpp
QPaintEvent.cpp
QPalette.cpp
QPen.cpp
QPicture.cpp
QPixmap.cpp
QPlainTextDocumentLayout.cpp
QPlainTextEdit.cpp
QPolygon.cpp
QPolygonF.cpp
QPrintDialog.cpp
QPrintEngine.cpp
QPrinter.cpp
QPrintPreviewDialog.cpp
QProgressBar.cpp
QProgressDialog.cpp
QPushButton.cpp
QRadialGradient.cpp
QRadioButton.cpp
QRegion.cpp
QResizeEvent.cpp
QScrollArea.cpp
QScrollBar.cpp
QSessionManager.cpp
QShowEvent.cpp
QSizeGrip.cpp
QSizePolicy.cpp
QSlider.cpp
QSound.cpp
QSpacerItem.cpp
QSpinBox.cpp
QSplashScreen.cpp
QSplitter.cpp
QStackedWidget.cpp
QStandardItem.cpp
QStandardItemModel.cpp
QStatusBar.cpp
QStringListModel.cpp
QStyle.cpp
QStyledItemDelegate.cpp
QStyleFactory.cpp
QStyleHintReturn.cpp
QStyleHintReturnMask.cpp
QStyleHintReturnVariant.cpp
QStyleOption.cpp
QStyleOptionButton.cpp
QStyleOptionComboBox.cpp
QStyleOptionComplex.cpp
QStyleOptionDockWidget.cpp
QStyleOptionFocusRect.cpp
QStyleOptionFrame.cpp
QStyleOptionGroupBox.cpp
QStyleOptionHeader.cpp
QStyleOptionMenuItem.cpp
QStyleOptionProgressBar.cpp
QStyleOptionSizeGrip.cpp
QStyleOptionSlider.cpp
QStyleOptionSpinBox.cpp
QStyleOptionTab.cpp
QStyleOptionTabBarBase.cpp
QStyleOptionTabWidgetFrame.cpp
QStyleOptionTitleBar.cpp
QStyleOptionToolBar.cpp
QStyleOptionToolBox.cpp
QStyleOptionToolButton.cpp
QStyleOptionViewItem.cpp
QStylePainter.cpp
QSyntaxHighlighter.cpp
QSystemTrayIcon.cpp
QTabBar.cpp
QTableView.cpp
QTableWidget.cpp
QTableWidgetItem.cpp
QTabWidget.cpp
QTableWidgetSelectionRange.cpp
QTextBlock.cpp
QTextBlockFormat.cpp
QTextBlockGroup.cpp
QTextBrowser.cpp
QTextCharFormat.cpp
QTextCursor.cpp
QTextDocument.cpp
QTextDocumentFragment.cpp
QTextDocumentWriter.cpp
QTextEdit.cpp
QTextFormat.cpp
QTextFragment.cpp
QTextFrame.cpp
QTextFrameFormat.cpp
QTextImageFormat.cpp
QTextInlineObject.cpp
QTextItem.cpp
QTextLayout.cpp
QTextLength.cpp
QTextLine.cpp
QTextList.cpp
QTextListFormat.cpp
QTextObject.cpp
QTextOption.cpp
QTextTableFormat.cpp
QTimeEdit.cpp
QToolBar.cpp
QToolBox.cpp
QToolButton.cpp
QTransform.cpp
QTreeView.cpp
QTreeWidget.cpp
QTreeWidgetItem.cpp
QValidator.cpp
QVBoxLayout.cpp
QWheelEvent.cpp
QWidget.cpp
QWidgetAction.cpp
QWidgetItem.cpp
QWindowsStyle.cpp
QWindowStateChangeEvent.cpp
QWizard.cpp
QWizardPage.cpp
THBQMainWindow.prg
THBQPlainTextEdit.prg
THBQSyntaxHighlighter.prg
THBQTableView.prg
THBQTextBlockUserData.prg
TQAbstractButton.prg
TQAbstractItemDelegate.prg
TQAbstractItemView.prg
TQAbstractProxyModel.prg
TQAbstractPrintDialog.prg
TQAbstractScrollArea.prg
TQAbstractSlider.prg
TQAbstractSpinBox.prg
TQAbstractTextDocumentLayout.prg
TQAction.prg
TQActionGroup.prg
TQApplication.prg
TQBitmap.prg
TQBoxLayout.prg
TQBrush.prg
TQButtonGroup.prg
TQCalendarWidget.prg
TQCheckBox.prg
TQClipboard.prg
TQColor.prg
TQColorDialog.prg
TQComboBox.prg
TQCommandLinkButton.prg
TQCommonStyle.prg
TQCompleter.prg
TQConicalGradient.prg
TQContextMenuEvent.prg
TQCursor.prg
TQDateEdit.prg
TQDateTimeEdit.prg
TQDesktopWidget.prg
TQDial.prg
TQDialog.prg
TQDirModel.prg
TQDockWidget.prg
TQDoubleSpinBox.prg
TQDropEvent.prg
TQDragMoveEvent.prg
TQDragEnterEvent.prg
TQDragLeaveEvent.prg
TQErrorMessage.prg
TQFileDialog.prg
TQFileIconProvider.prg
TQFileSystemModel.prg
TQFocusEvent.prg
TQFocusFrame.prg
TQFont.prg
TQFontComboBox.prg
TQFontDatabase.prg
TQFontDialog.prg
TQFontInfo.prg
TQFontMetrics.prg
TQFontMetricsF.prg
TQFormLayout.prg
TQFrame.prg
TQGradient.prg
TQGridLayout.prg
TQGroupBox.prg
TQHBoxLayout.prg
TQHeaderView.prg
TQHelpEvent.prg
TQHideEvent.prg
TQIcon.prg
TQInputMethodEvent.prg
TQImage.prg
TQImageReader.prg
TQImageWriter.prg
TQInputDialog.prg
TQInputEvent.prg
TQItemDelegate.prg
TQItemEditorCreatorBase.prg
TQItemEditorFactory.prg
TQItemSelection.prg
TQItemSelectionModel.prg
TQKeyEvent.prg
TQKeySequence.prg
TQLabel.prg
TQLayout.prg
TQLayoutItem.prg
TQLCDNumber.prg
TQLinearGradient.prg
TQLineEdit.prg
TQListView.prg
TQListWidget.prg
TQListWidgetItem.prg
TQMainWindow.prg
TQMatrix.prg
TQMdiArea.prg
TQMdiSubWindow.prg
TQMenu.prg
TQMenuBar.prg
TQMessageBox.prg
TQMouseEvent.prg
TQMoveEvent.prg
TQMovie.prg
TQPageSetupDialog.prg
TQPaintDevice.prg
TQPaintEngine.prg
TQPainter.prg
TQPainterPath.prg
TQPaintEvent.prg
TQPalette.prg
TQPen.prg
TQPicture.prg
TQPixmap.prg
TQPlainTextDocumentLayout.prg
TQPlainTextEdit.prg
TQPolygon.prg
TQPolygonF.prg
TQPrintDialog.prg
TQPrintEngine.prg
TQPrinter.prg
TQPrintPreviewDialog.prg
TQProgressBar.prg
TQProgressDialog.prg
TQPushButton.prg
TQRadialGradient.prg
TQRadioButton.prg
TQRegion.prg
TQResizeEvent.prg
TQScrollArea.prg
TQScrollBar.prg
TQSessionManager.prg
TQShowEvent.prg
TQSizeGrip.prg
TQSizePolicy.prg
TQSlider.prg
TQSound.prg
TQSpacerItem.prg
TQSpinBox.prg
TQSplashScreen.prg
TQSplitter.prg
TQStackedWidget.prg
TQStandardItem.prg
TQStandardItemModel.prg
TQStatusBar.prg
TQStringListModel.prg
TQStyle.prg
TQStyledItemDelegate.prg
TQStyleFactory.prg
TQStyleHintReturn.prg
TQStyleHintReturnMask.prg
TQStyleHintReturnVariant.prg
TQStyleOption.prg
TQStyleOptionButton.prg
TQStyleOptionComboBox.prg
TQStyleOptionComplex.prg
TQStyleOptionDockWidget.prg
TQStyleOptionFocusRect.prg
TQStyleOptionFrame.prg
TQStyleOptionGroupBox.prg
TQStyleOptionHeader.prg
TQStyleOptionMenuItem.prg
TQStyleOptionProgressBar.prg
TQStyleOptionSizeGrip.prg
TQStyleOptionSlider.prg
TQStyleOptionSpinBox.prg
TQStyleOptionTab.prg
TQStyleOptionTabBarBase.prg
TQStyleOptionTabWidgetFrame.prg
TQStyleOptionTitleBar.prg
TQStyleOptionToolBar.prg
TQStyleOptionToolBox.prg
TQStyleOptionToolButton.prg
TQStyleOptionViewItem.prg
TQStylePainter.prg
TQSyntaxHighlighter.prg
TQSystemTrayIcon.prg
TQTabBar.prg
TQTableView.prg
TQTableWidget.prg
TQTableWidgetItem.prg
TQTabWidget.prg
TQTableWidgetSelectionRange.prg
TQTextBlock.prg
TQTextBlockFormat.prg
TQTextBlockGroup.prg
TQTextBrowser.prg
TQTextCharFormat.prg
TQTextCursor.prg
TQTextDocument.prg
TQTextDocumentFragment.prg
TQTextDocumentWriter.prg
TQTextEdit.prg
TQTextFormat.prg
TQTextFragment.prg
TQTextFrame.prg
TQTextFrameFormat.prg
TQTextImageFormat.prg
TQTextInlineObject.prg
TQTextItem.prg
TQTextLayout.prg
TQTextLength.prg
TQTextLine.prg
TQTextList.prg
TQTextListFormat.prg
TQTextObject.prg
TQTextOption.prg
TQTextTableFormat.prg
TQTimeEdit.prg
TQToolBar.prg
TQToolBox.prg
TQToolButton.prg
TQTransform.prg
TQTreeView.prg
TQTreeWidget.prg
TQTreeWidgetItem.prg
TQValidator.prg
TQVBoxLayout.prg
TQWheelEvent.prg
TQWidget.prg
TQWidgetAction.prg
TQWidgetItem.prg
TQWindowsStyle.prg
TQWindowStateChangeEvent.prg
TQWizard.prg
TQWizardPage.prg

View File

@@ -0,0 +1,23 @@
#
# $Id$
#
# --------------------------------------------------------------------
# WARNING: Automatically generated source file. DO NOT EDIT!
# Instead, edit corresponding .qth file,
# or the generator tool itself, and run regenarate.
# --------------------------------------------------------------------
QFtp.cpp
QHttp.cpp
QHttpHeader.cpp
QHttpRequestHeader.cpp
QHttpResponseHeader.cpp
QNetworkRequest.cpp
TQFtp.prg
TQHttp.prg
TQHttpHeader.prg
TQHttpRequestHeader.prg
TQHttpResponseHeader.prg
TQNetworkRequest.prg

View File

@@ -7,6 +7,24 @@
-o${hb_name}
-workdir=${hb_work}/${hb_plat}/${hb_comp}/${hb_name}
*.cpp
*.prg
*.hpp
QWebFrame.cpp
QWebHistory.cpp
QWebHistoryInterface.cpp
QWebHistoryItem.cpp
QWebHitTestResult.cpp
QWebPage.cpp
QWebPluginFactory.cpp
QWebSecurityOrigin.cpp
QWebSettings.cpp
QWebView.cpp
TQWebFrame.prg
TQWebHistory.prg
TQWebHistoryInterface.prg
TQWebHistoryItem.prg
TQWebHitTestResult.prg
TQWebPage.prg
TQWebPluginFactory.prg
TQWebSecurityOrigin.prg
TQWebSettings.prg
TQWebView.prg