fivedev/harbour-core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

2009-12-03 14:56 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)

Browse Source 
* bin/hb-mkimp.bat
    - Deleted creation of QT implibs for mingw. Enough to use what's
      provided by QT SDK.

  * contrib/hbqt/qtgui/QLabel.cpp
  * contrib/hbqt/hbqt_garbage.h
  * contrib/hbqt/qtcore/filelist.mk
    * Rerun generator. This caused that QTUILoader references
      got removed, plus a few other changes.

  * contrib/hbqt/qtcore/QUiLoader.cpp
    - Deleted header telling this file is automatically generated.
    ! Manually fixed debug lines to be in sync with rest of hbqt.

  * contrib/hbqt/qtcore/Makefile
    ! Fixed to add QTUILoaded stuff manually, since it's missing
      from generated filelist.mk.

  * config/win/msvc.mk
    * Minor in comment.
This commit is contained in:
Viktor Szakats
2009-12-03 13:57:38 +00:00
parent feee8ccc87
commit d409d69959
8 changed files with 47 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
harbour/ChangeLog
View File

@@ -17,6 +17,28 @@
past entries belonging to author(s): Viktor Szakats.
*/
2009-12-03 14:56 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
* bin/hb-mkimp.bat
- Deleted creation of QT implibs for mingw. Enough to use what's
provided by QT SDK.
* contrib/hbqt/qtgui/QLabel.cpp
* contrib/hbqt/hbqt_garbage.h
* contrib/hbqt/qtcore/filelist.mk
* Rerun generator. This caused that QTUILoader references
got removed, plus a few other changes.
* contrib/hbqt/qtcore/QUiLoader.cpp
- Deleted header telling this file is automatically generated.
! Manually fixed debug lines to be in sync with rest of hbqt.
* contrib/hbqt/qtcore/Makefile
! Fixed to add QTUILoaded stuff manually, since it's missing
from generated filelist.mk.
* config/win/msvc.mk
* Minor in comment.
2009-12-03 13:53 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
* contrib/xhb/freadlin.c
* contrib/hbide/freadlin.c

4
harbour/bin/hb-mkimp.bat
View File

@@ -119,10 +119,6 @@ if not "%HB_LIB_INSTALL%" == "" (
if exist "%HB_WITH_OPENSSL%\..\libeay32.lib" copy /b /y "%HB_WITH_OPENSSL%\..\libeay32.lib" "%HB_LIB_INSTALL%\liblibeay32.a"
if exist "%HB_WITH_OPENSSL%\..\ssleay32.lib" copy /b /y "%HB_WITH_OPENSSL%\..\ssleay32.lib" "%HB_LIB_INSTALL%\libssleay32.a"
if exist "%HB_WITH_PGSQL%\..\lib\libpq.lib" copy /b /y "%HB_WITH_PGSQL%\..\lib\libpq.lib" "%HB_LIB_INSTALL%\liblibpq.a"
if exist "%HB_WITH_QT%\..\lib\libQtCore4.a" copy /b /y "%HB_WITH_QT%\..\lib\libQtCore4.a" "%HB_LIB_INSTALL%\libQtCore4.a"
if exist "%HB_WITH_QT%\..\lib\libQtGui4.a" copy /b /y "%HB_WITH_QT%\..\lib\libQtGui4.a" "%HB_LIB_INSTALL%\libQtGui4.a"
if exist "%HB_WITH_QT%\..\lib\libQtNetwork4.a" copy /b /y "%HB_WITH_QT%\..\lib\libQtNetwork4.a" "%HB_LIB_INSTALL%\libQtNetwork4.a"
if exist "%HB_WITH_QT%\..\lib\libQtWebKit4.a" copy /b /y "%HB_WITH_QT%\..\lib\libQtWebKit4.a" "%HB_LIB_INSTALL%\libQtWebKit4.a"
goto END
)

2
harbour/config/win/msvc.mk
View File

@@ -8,7 +8,7 @@ LIB_EXT := .lib
ifeq ($(HB_CPU),x86)
# Always compile in -UNICODE mode for MSVC 9.0 and upper
# This version doesn't support Win9x anyway. [vszakats]
# These versions don't support Win9x anymore, so it's safe. [vszakats]
ifeq ($(filter $(HB_COMPILER_VER),600 700 710 800),)
HB_CFLAGS += -DUNICODE
endif

4
harbour/contrib/hbqt/hbqt_garbage.h
View File

@@ -255,7 +255,6 @@ extern QT_G_FUNC( release_QTranslator );
extern QT_G_FUNC( release_QTreeView );
extern QT_G_FUNC( release_QTreeWidget );
extern QT_G_FUNC( release_QTreeWidgetItem );
extern QT_G_FUNC( release_QUiLoader );
extern QT_G_FUNC( release_QUrl );
extern QT_G_FUNC( release_QValidator );
extern QT_G_FUNC( release_QVariant );
@@ -275,7 +274,6 @@ extern QT_G_FUNC( release_QWidget );
extern QT_G_FUNC( release_QWidgetAction );
extern QT_G_FUNC( release_QWidgetItem );
extern QT_G_FUNC( release_QWindowsStyle );
extern QT_G_FUNC( release_QWindowsXPStyle );
extern QT_G_FUNC( release_QWizard );
extern QT_G_FUNC( release_QWizardPage );
@@ -525,7 +523,6 @@ extern void * gcAllocate_QTranslator( void * pObj );
extern void * gcAllocate_QTreeView( void * pObj );
extern void * gcAllocate_QTreeWidget( void * pObj );
extern void * gcAllocate_QTreeWidgetItem( void * pObj );
extern void * gcAllocate_QUiLoader( void * pObj );
extern void * gcAllocate_QUrl( void * pObj );
extern void * gcAllocate_QValidator( void * pObj );
extern void * gcAllocate_QVariant( void * pObj );
@@ -545,7 +542,6 @@ extern void * gcAllocate_QWidget( void * pObj );
extern void * gcAllocate_QWidgetAction( void * pObj );
extern void * gcAllocate_QWidgetItem( void * pObj );
extern void * gcAllocate_QWindowsStyle( void * pObj );
extern void * gcAllocate_QWindowsXPStyle( void * pObj );
extern void * gcAllocate_QWizard( void * pObj );
extern void * gcAllocate_QWizardPage( void * pObj );

3
harbour/contrib/hbqt/qtcore/Makefile
View File

@@ -14,6 +14,9 @@ ifneq ($(HB_HAS_QT),)
include $(TOP)$(ROOT)contrib/hbqt/qtcore/filelist.mk
CPP_SOURCES += QUiLoader.cpp
PRG_SOURCES += TQUiLoader.prg
include $(TOP)$(ROOT)config/header.mk
include $(TOP)$(ROOT)config/lib.mk

22
harbour/contrib/hbqt/qtcore/QUiLoader.cpp
View File

@@ -2,12 +2,6 @@
* $Id$
*/
/* -------------------------------------------------------------------- */
/* WARNING: Automatically generated source file. DO NOT EDIT! */
/* Instead, edit corresponding .qth file, */
/* or the generator tool itself, and run regenarate. */
/* -------------------------------------------------------------------- */
/*
* Harbour Project source code:
* QT wrapper main header
@@ -99,23 +93,23 @@ QT_G_FUNC( release_QUiLoader )
( ( QUiLoader * ) p->ph )->~QUiLoader();
p->ph = NULL;
HB_TRACE( HB_TR_DEBUG, ( "release_QUiLoader Object deleted!" ) );
#if defined(__debug__)
just_debug( " YES release_QUiLoader %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() );
#if defined( __HB_DEBUG__ )
hbqt_debug( " YES release_QUiLoader %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() );
#endif
}
else
{
HB_TRACE( HB_TR_DEBUG, ( "release_QUiLoader Object Name Missing!" ) );
#if defined(__debug__)
just_debug( " NO release_QUiLoader" );
#if defined( __HB_DEBUG__ )
hbqt_debug( " NO release_QUiLoader" );
#endif
}
}
else
{
HB_TRACE( HB_TR_DEBUG, ( "release_QUiLoader Object Allready deleted!" ) );
#if defined(__debug__)
just_debug( " DEL release_QUiLoader" );
#if defined( __HB_DEBUG__ )
hbqt_debug( " DEL release_QUiLoader" );
#endif
}
}
@@ -127,8 +121,8 @@ void * gcAllocate_QUiLoader( void * pObj )
p->ph = pObj;
p->func = release_QUiLoader;
new( & p->pq ) QPointer< QUiLoader >( ( QUiLoader * ) pObj );
#if defined(__debug__)
just_debug( " new_QUiLoader %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() );
#if defined( __HB_DEBUG__ )
hbqt_debug( " new_QUiLoader %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() );
#endif
return( p );
}

2
harbour/contrib/hbqt/qtcore/filelist.mk
View File

@@ -54,7 +54,6 @@ CPP_SOURCES := \
QTimer.cpp \
QTranslator.cpp \
QUrl.cpp \
QUiLoader.cpp \
QVariant.cpp \
@@ -104,7 +103,6 @@ PRG_SOURCES := \
TQTime.prg \
TQTimer.prg \
TQTranslator.prg \
TQUiLoader.prg \
TQUrl.prg \
TQVariant.prg \

15
harbour/contrib/hbqt/qtgui/QLabel.cpp
View File

@@ -96,7 +96,18 @@ QT_G_FUNC( release_QLabel )
const QMetaObject * m = ( ( QObject * ) p->ph )->metaObject();
if( ( QString ) m->className() != ( QString ) "QObject" )
{
( ( QLabel * ) p->ph )->~QLabel();
switch( hbqt_get_object_release_method() )
{
case HBQT_RELEASE_WITH_DELETE:
delete ( ( QLabel * ) p->ph );
break;
case HBQT_RELEASE_WITH_DESTRUTOR:
( ( QLabel * ) p->ph )->~QLabel();
break;
case HBQT_RELEASE_WITH_DELETE_LATER:
( ( QLabel * ) p->ph )->deleteLater();
break;
}
p->ph = NULL;
HB_TRACE( HB_TR_DEBUG, ( "release_QLabel Object deleted!" ) );
#if defined( __HB_DEBUG__ )
@@ -139,7 +150,7 @@ HB_FUNC( QT_QLABEL )
if( hb_pcount() == 1 && HB_ISCHAR( 1 ) )
{
pObj = ( QLabel* ) new QLabel( hbqt_par_QString( 1 ), 0, 0 ) ;
pObj = ( QLabel* ) new QLabel( hbqt_par_QString( 1 ) ) ;
}
else if( hb_pcount() == 1 && HB_ISPOINTER( 1 ) )
{