Re: [Kdiff3-user] Solaris compile error using Qt 3.3.3

[Robert O. <phi...@ya...>]

 
Changing as below fixed the compile errors with gcc
2.95.   I also modified the kdiff3.pro slightly to do
a static compile (see below)

Thank you.
Phil

// 2. If the files don't have the same name then show
all names
if ( caption.isEmpty() && (!f1.isEmpty() ||
!f2.isEmpty() || !f3.isEmpty()) )
{
caption = ( f1.isEmpty()? QString("") :
QString(".../")+f1 );
caption += QString(caption.isEmpty() || f2.isEmpty() ?
QString("") : QString(" <-> ")) + ( f2.isEmpty()?
QString("") : QString(".../")+f2 );
caption += QString(caption.isEmpty() || f3.isEmpty() ?
QString("") : QString(" <-> ")) + ( f3.isEmpty()?
QString("") : QString(".../")+f3 ) ;
}

m_pKDiff3Shell->setCaption( caption.isEmpty() ?
QString("KDiff3") : caption+QString(" - KDiff3"));
}

-------------kdiff3.pro---------------

TEMPLATE = app
LINK += Bstatic
LIBS += -lICE -lSM -lstdc++ -L/usr/openwin/lib
-L/usr/local/lib
CONFIG  += qt warn_on thread release create_prl
link_prl
HEADERS  = version.h diff.h kdiff3.h merger.h
optiondialog.h kreplacements/kreplacements.h \
directorymergewindow.h fileaccess.h kdiff3_shell.h
kdiff3_part.h
SOURCES  = diff.cpp difftextwindow.cpp kdiff3.cpp
main.cpp merger.cpp mergeresultwindow.cpp \
optiondialog.cpp pdiff.cpp directorymergewindow.cpp
fileaccess.cpp \
kdiff3_shell.cpp kdiff3_part.cpp
kreplacements/kreplacements.cpp \
gnudiff_analyze.cpp gnudiff_io.cpp gnudiff_xmalloc.cpp
TARGET   = kdiff3
INCLUDEPATH += . ./kreplacements

unix {
documentation.path = /usr/local/share/doc/kdiff3
documentation.files = ../doc/*

INSTALLS += documentation

target.path = /usr/local/bin
INSTALLS += target
}


__________________________________________________
Do You Yahoo!?
Tired of spam?  Yahoo! Mail has the best spam protection around 
http://mail.yahoo.com