TDE
/
tqt3
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/tqt3
0
0
Fork 0
Code Issues Releases Wiki Activity

Automated update from Qt3

Browse Source
pull/1/head
Timothy Pearson 10 years ago
parent 9c2ce91a36
commit b478472598
6 changed files with 67 additions and 16 deletions
Show Stats Download Patch File Download Diff File

2
qmake/generators/unix/unixmake.cpp
Unescape View File

@ -806,7 +806,7 @@ UnixMakefileGenerator::defaultInstall(const TQString &t)
uninst.append("\n\t"); uninst.append("\n\t");
uninst.append("-$(DEL_FILE) \"" + dst_pc + "\""); uninst.append("-$(DEL_FILE) \"" + dst_pc + "\"");
} }
if ( project->isEmpty("QMAKE_CYGWIN_SHLIB") ) { if ( project->isEmpty("QMAKE_CYGWIN_SHLIB") && project->isEmpty("QMAKE_OPENBSD_SHLIBS") ) {
if ( !project->isActiveConfig("staticlib") && !project->isActiveConfig("plugin") ) { if ( !project->isActiveConfig("staticlib") && !project->isActiveConfig("plugin") ) {
if ( project->isEmpty("QMAKE_HPUX_SHLIB") ) { if ( project->isEmpty("QMAKE_HPUX_SHLIB") ) {
links << "$(TARGET0)" << "$(TARGET1)" << "$(TARGET2)"; links << "$(TARGET0)" << "$(TARGET1)" << "$(TARGET2)";

39
qmake/generators/unix/unixmake2.cpp
Unescape View File

@ -132,6 +132,8 @@ UnixMakefileGenerator::writeMakeParts(TQTextStream &t)
src_incremental=FALSE, moc_incremental=FALSE; src_incremental=FALSE, moc_incremental=FALSE;
t << "####### Compiler, tools and options" << endl << endl; t << "####### Compiler, tools and options" << endl << endl;
if (varGlue("INCLUDEPATH", " -I", " -I", "").find("$(LOCALBASE)") != -1)
t << "LOCALBASE?= /usr/local" << endl;
t << "CC = "; t << "CC = ";
if (project->isActiveConfig("thread") && if (project->isActiveConfig("thread") &&
! project->variables()["QMAKE_CC_THREAD"].isEmpty()) ! project->variables()["QMAKE_CC_THREAD"].isEmpty())
@ -298,10 +300,15 @@ UnixMakefileGenerator::writeMakeParts(TQTextStream &t)
} else if (!project->isActiveConfig("staticlib") && project->variables()["QMAKE_APP_FLAG"].isEmpty()) { } else if (!project->isActiveConfig("staticlib") && project->variables()["QMAKE_APP_FLAG"].isEmpty()) {
t << "TARGETA = " << var("TARGETA") << endl; t << "TARGETA = " << var("TARGETA") << endl;
if (project->isEmpty("QMAKE_HPUX_SHLIB")) { if (project->isEmpty("QMAKE_HPUX_SHLIB")) {
t << "TARGETD = " << var("TARGET_x.y.z") << endl; if (!project->isEmpty("QMAKE_OPENBSD_SHLIBS")) {
t << "TARGET0 = " << var("TARGET_") << endl; t << "LIB"+var("OBSD_TARGET_NAME")+"_VERSION = " << var("OBSD_TARGET_VERSION") << endl;
t << "TARGET1 = " << var("TARGET_x") << endl; t << "TARGETD = " << var("TARGET_x.y") << endl;
t << "TARGET2 = " << var("TARGET_x.y") << endl; } else {
t << "TARGETD = " << var("TARGET_x.y.z") << endl;
t << "TARGET0 = " << var("TARGET_") << endl;
t << "TARGET1 = " << var("TARGET_x") << endl;
t << "TARGET2 = " << var("TARGET_x.y") << endl;
}
} else { } else {
t << "TARGETD = " << var("TARGET_x") << endl; t << "TARGETD = " << var("TARGET_x") << endl;
t << "TARGET0 = " << var("TARGET_") << endl; t << "TARGET0 = " << var("TARGET_") << endl;
@ -378,6 +385,7 @@ UnixMakefileGenerator::writeMakeParts(TQTextStream &t)
} }
t << "####### Build rules" << endl << endl; t << "####### Build rules" << endl << endl;
t << "$(OBJECTS): $(UICDECLS)" << endl << endl;
if(!project->variables()["SUBLIBS"].isEmpty()) { if(!project->variables()["SUBLIBS"].isEmpty()) {
TQString libdir = "tmp/"; TQString libdir = "tmp/";
if(!project->isEmpty("SUBLIBS_DIR")) if(!project->isEmpty("SUBLIBS_DIR"))
@ -1296,10 +1304,20 @@ void UnixMakefileGenerator::init2()
project->variables()["TARGET_x"].append("lib" + project->first("TARGET") + "." + project->variables()["TARGET_x"].append("lib" + project->first("TARGET") + "." +
project->first("QMAKE_EXTENSION_SHLIB") + project->first("QMAKE_EXTENSION_SHLIB") +
"." + project->first("VER_MAJ")); "." + project->first("VER_MAJ"));
project->variables()["TARGET_x.y"].append("lib" + project->first("TARGET") + "." + if ( !project->variables()["QMAKE_OPENBSD_SHLIBS"].isEmpty() ) {
project->first("QMAKE_EXTENSION_SHLIB") TQString s;
+ "." + project->first("VER_MAJ") + s.setNum(project->first("VER_MIN").toInt()*10+ project->first("VER_PAT").toInt());
"." + project->first("VER_MIN")); project->variables()["OBSD_TARGET_VERSION"].append(project->first("VER_MAJ") + "." + s);
project->variables()["OBSD_TARGET_NAME"].append(project->first("TARGET"));
project->variables()["TARGET_x.y"].append("lib" + project->first("TARGET") + "." +
project->first("QMAKE_EXTENSION_SHLIB")
+ ".$(LIB"+ project->first("TARGET") + "_VERSION)");
} else {
project->variables()["TARGET_x.y"].append("lib" + project->first("TARGET") + "." +
project->first("QMAKE_EXTENSION_SHLIB")
+ "." + project->first("VER_MAJ") +
"." + project->first("VER_MIN"));
}
project->variables()["TARGET_x.y.z"].append("lib" + project->first("TARGET") + project->variables()["TARGET_x.y.z"].append("lib" + project->first("TARGET") +
"." + "." +
project->variables()[ project->variables()[
@ -1308,7 +1326,10 @@ void UnixMakefileGenerator::init2()
project->first("VER_MIN") + "." + project->first("VER_MIN") + "." +
project->first("VER_PAT")); project->first("VER_PAT"));
} }
project->variables()["TARGET"] = project->variables()["TARGET_x.y.z"]; if ( !project->variables()["QMAKE_OPENBSD_SHLIBS"].isEmpty() )
project->variables()["TARGET"] = project->variables()["TARGET_x.y"];
else
project->variables()["TARGET"] = project->variables()["TARGET_x.y.z"];
} }
if(project->isEmpty("QMAKE_LN_SHLIB")) if(project->isEmpty("QMAKE_LN_SHLIB"))
project->variables()["QMAKE_LN_SHLIB"].append("ln -s"); project->variables()["QMAKE_LN_SHLIB"].append("ln -s");

5
src/tools/ntqtextstream.h
Unescape View File

@ -102,6 +102,8 @@ public:
TQTextStream &operator<<( unsigned int ); TQTextStream &operator<<( unsigned int );
TQTextStream &operator<<( signed long ); TQTextStream &operator<<( signed long );
TQTextStream &operator<<( unsigned long ); TQTextStream &operator<<( unsigned long );
TQTextStream &operator<<( signed long long );
TQTextStream &operator<<( unsigned long long );
TQTextStream &operator<<( float ); TQTextStream &operator<<( float );
TQTextStream &operator<<( double ); TQTextStream &operator<<( double );
TQTextStream &operator<<( const char* ); TQTextStream &operator<<( const char* );
@ -155,7 +157,8 @@ public:
private: private:
long input_int(); long input_int();
void init(); void init();
TQTextStream &output_int( int, ulong, bool ); TQTextStream &output_int( int, unsigned long long, bool );
TQIODevice *dev; TQIODevice *dev;
int fflags; int fflags;

4
src/tools/ntqvaluelist.h
Unescape View File

@ -655,13 +655,11 @@ Q_INLINE_TEMPLATES TQDataStream& operator>>( TQDataStream& s, TQValueList<T>& l
l.clear(); l.clear();
TQ_UINT32 c; TQ_UINT32 c;
s >> c; s >> c;
for( TQ_UINT32 i = 0; i < c; ++i ) for( TQ_UINT32 i = 0; i < c && !s.atEnd(); ++i )
{ {
T t; T t;
s >> t; s >> t;
l.append( t ); l.append( t );
if ( s.atEnd() )
break;
} }
return s; return s;
} }

2
src/tools/qgpluginmanager.cpp
Unescape View File

@ -323,6 +323,8 @@ void TQGPluginManager::addLibraryPath( const TQString& path )
TQString filter = "*.dylib; *.so; *.bundle"; TQString filter = "*.dylib; *.so; *.bundle";
#elif defined(Q_OS_HPUX) #elif defined(Q_OS_HPUX)
TQString filter = "*.sl"; TQString filter = "*.sl";
#elif defined(Q_OS_OPENBSD)
TQString filter = "*.so; *.so.*";
#elif defined(Q_OS_UNIX) #elif defined(Q_OS_UNIX)
TQString filter = "*.so"; TQString filter = "*.so";
#endif #endif

31
src/tools/qtextstream.cpp
Unescape View File

@ -195,6 +195,7 @@
#define I_SHORT 0x0010 #define I_SHORT 0x0010
#define I_INT 0x0020 #define I_INT 0x0020
#define I_LONG 0x0030 #define I_LONG 0x0030
#define I_LONGLONG 0x0040
#define I_TYPE_MASK 0x00f0 #define I_TYPE_MASK 0x00f0
#define I_BASE_2 TQTS::bin #define I_BASE_2 TQTS::bin
@ -1862,7 +1863,7 @@ TQTextStream &TQTextStream::operator<<( char c )
return *this; return *this;
} }
TQTextStream &TQTextStream::output_int( int format, ulong n, bool neg ) TQTextStream &TQTextStream::output_int( int format, unsigned long long n, bool neg )
{ {
static const char hexdigits_lower[] = "0123456789abcdef"; static const char hexdigits_lower[] = "0123456789abcdef";
static const char hexdigits_upper[] = "0123456789ABCDEF"; static const char hexdigits_upper[] = "0123456789ABCDEF";
@ -1879,6 +1880,7 @@ TQTextStream &TQTextStream::output_int( int format, ulong n, bool neg )
case I_SHORT: len=16; break; case I_SHORT: len=16; break;
case I_INT: len=sizeof(int)*8; break; case I_INT: len=sizeof(int)*8; break;
case I_LONG: len=32; break; case I_LONG: len=32; break;
case I_LONGLONG: len=64; break;
default: len = 0; default: len = 0;
} }
p = &buf[74]; // go reverse order p = &buf[74]; // go reverse order
@ -1925,7 +1927,7 @@ TQTextStream &TQTextStream::output_int( int format, ulong n, bool neg )
p = &buf[74]; p = &buf[74];
*p = '\0'; *p = '\0';
if ( neg ) if ( neg )
n = (ulong)(-(long)n); n = (unsigned long long)(-(long long)n);
do { do {
*--p = ((int)(n%10)) + '0'; *--p = ((int)(n%10)) + '0';
n /= 10; n /= 10;
@ -2041,6 +2043,31 @@ TQTextStream &TQTextStream::operator<<( unsigned long i )
return output_int( I_LONG | I_UNSIGNED, i, FALSE ); return output_int( I_LONG | I_UNSIGNED, i, FALSE );
} }
/*!
\overload
Writes a \c long long \c int \a i to the stream and returns a reference
to the stream.
*/
TQTextStream &TQTextStream::operator<<( signed long long i )
{
return output_int( I_LONGLONG | I_SIGNED, i, i < 0 );
}
/*!
\overload
Writes an \c unsigned \c long \c int \a i to the stream and
returns a reference to the stream.
*/
TQTextStream &TQTextStream::operator<<( unsigned long long i )
{
return output_int( I_LONGLONG | I_UNSIGNED, i, FALSE );
}
/*! /*!
\overload \overload

Write Preview
Loading…
Cancel
Save