From c489c62c1713924c29e560cd2ebd36b006c14a11 Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Tue, 22 Oct 2024 17:30:12 +0900 Subject: [PATCH] Update tqt-mt.pc to export the same parameters previously exported in tqt.pc and tqtqui.pc. Required to drop tqtinterface. Signed-off-by: Michele Calgaro --- include/tqt3.h | 1 - qmake/generators/unix/unixmake2.cpp | 16 +- src/kernel/tqobject.h | 2 - src/kernel/tqt.h | 335 ++++++++++++++++++++++++++-- src/kernel/tqt3.h | 326 --------------------------- 5 files changed, 323 insertions(+), 357 deletions(-) delete mode 120000 include/tqt3.h delete mode 100644 src/kernel/tqt3.h diff --git a/include/tqt3.h b/include/tqt3.h deleted file mode 120000 index 6df0e2da..00000000 --- a/include/tqt3.h +++ /dev/null @@ -1 +0,0 @@ -../src/kernel/tqt3.h \ No newline at end of file diff --git a/qmake/generators/unix/unixmake2.cpp b/qmake/generators/unix/unixmake2.cpp index af070744..e29ca16a 100644 --- a/qmake/generators/unix/unixmake2.cpp +++ b/qmake/generators/unix/unixmake2.cpp @@ -1607,18 +1607,18 @@ UnixMakefileGenerator::writePkgConfigFile() // ### does make sense only for libs << "QMAKE_LIBS"; //obvious one if(project->isActiveConfig("thread")) libs << "QMAKE_LFLAGS_THREAD"; //not sure about this one, but what about things like -pthread? - t << "Libs: -L${libdir} -l" << lname.left(lname.length()-Option::libtool_ext.length()) << " "; - for(TQStringList::ConstIterator it = libs.begin(); it != libs.end(); ++it) - t << project->variables()[(*it)].join(" ") << " "; + t << "Libs: -L${libdir} -l" << lname.left(lname.length()-Option::libtool_ext.length()); + // for(TQStringList::ConstIterator it = libs.begin(); it != libs.end(); ++it) + // t << project->variables()[(*it)].join(" ") << " "; t << endl; // flags // ### too many t << "Cflags: " - // << var("QMAKE_CXXFLAGS") << " " - << varGlue("PRL_EXPORT_DEFINES","-D"," -D"," ") - << project->variables()["PRL_EXPORT_CXXFLAGS"].join(" ") - // << varGlue("DEFINES","-D"," -D"," ") - << " -I${includedir}"; + // << var("QMAKE_CXXFLAGS") << " " + // << varGlue("PRL_EXPORT_DEFINES","-D"," -D"," ") + // << project->variables()["PRL_EXPORT_CXXFLAGS"].join(" ") + // << varGlue("DEFINES","-D"," -D"," ") + << "-DTQT_NO_ASCII_CAST -DTQT_NO_STL -DTQT_NO_COMPAT -DTQT_NO_TRANSLATION -DTQT_THREAD_SUPPORT -D_REENTRANT -I${includedir}"; t << endl; } diff --git a/src/kernel/tqobject.h b/src/kernel/tqobject.h index bb260b19..05ba4dc9 100644 --- a/src/kernel/tqobject.h +++ b/src/kernel/tqobject.h @@ -50,8 +50,6 @@ #include "tqnamespace.h" #endif // QT_H -#include - #define TQT_TR_NOOP(x) (x) #define TQT_TRANSLATE_NOOP(scope,x) (x) diff --git a/src/kernel/tqt.h b/src/kernel/tqt.h index b4aa2c6d..2c4bd80e 100644 --- a/src/kernel/tqt.h +++ b/src/kernel/tqt.h @@ -1,29 +1,324 @@ -/* +/**************************************************************************** +** +** TQt GUI Toolkit +** +** This header file efficiently includes all TQt GUI Toolkit functionality. +** +** Generated : Mon Oct 13 13:07:29 CEST 2003 -Copyright (C) 2010-2011 Timothy Pearson +** +** Copyright (C) 1995-2008 Trolltech ASA. All rights reserved. +** +** This file is part of the TQt GUI Toolkit. +** +*****************************************************************************/ -This library is free software; you can redistribute it and/or -modify it under the terms of the GNU General Public -License as published by the Free Software Foundation; either -version 2 of the License, or (at your option) any later version. +#ifndef QT_H +#define QT_H +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include -This library is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -Library General Public License for more details. +#if defined( QT_MOC_CPP ) || defined( QT_H_CPP ) || defined( Q_OS_MACX ) +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#endif // Private headers -You should have received a copy of the GNU Library General Public License -along with this library; see the file COPYING.LIB. If not, write to -the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -Boston, MA 02110-1301, USA. -*/ +#ifdef TQ_WS_X11 +#include +#endif -#ifndef TQT_H -#define TQT_H +#ifdef TQ_WS_MAC +#include +#include +#endif // TQ_WS_MAC -#include +#ifdef TQ_WS_WIN +#include +#endif -#define Qt TQt +#ifdef TQ_WS_WCE +#include +#endif // TQ_WS_WCE -#endif /* TQT_H */ +#endif // QT_H diff --git a/src/kernel/tqt3.h b/src/kernel/tqt3.h deleted file mode 100644 index 9300c254..00000000 --- a/src/kernel/tqt3.h +++ /dev/null @@ -1,326 +0,0 @@ -/**************************************************************************** -** -** TQt GUI Toolkit -** -** This header file efficiently includes all TQt GUI Toolkit functionality. -** -** Generated : Mon Oct 13 13:07:29 CEST 2003 - -** -** Copyright (C) 1995-2008 Trolltech ASA. All rights reserved. -** -** This file is part of the TQt GUI Toolkit. -** -*****************************************************************************/ - -#ifndef QT_H -#define QT_H -#include "tqglobal.h" -#include "tqfeatures.h" -#include "tqshared.h" -#include "tqptrcollection.h" -#include "tqglist.h" -#include "tqobjectdefs.h" -#include "tqnamespace.h" -#include "tqgarray.h" -#include "tqmemarray.h" -#include "tqcstring.h" -#include "tqstring.h" -#include "tqptrlist.h" -#include "tqiodevice.h" -#include "tqkeysequence.h" -#include "tqwindowdefs.h" -#include "tqgdict.h" -#include "tqfont.h" -#include "tqdatastream.h" -#include "tqpair.h" -#include "tqpoint.h" -#include -#include "tqtextstream.h" -#include "tqfontinfo.h" -#include "tqsizepolicy.h" -#include "tqtl.h" -#include "tqsize.h" -#include "tqrect.h" -#include "tqbitarray.h" -#include "tqregion.h" -#include "tqsql.h" -#include "tqstrlist.h" -#include "tqvaluelist.h" -#include "tqmap.h" -#include "tqdatetime.h" -#include "tqmime.h" -#include "tqasciidict.h" -#include "tqpaintdevice.h" -#include "tqfontmetrics.h" -#include "tqdict.h" -#include "tqevent.h" -#include "tqhostaddress.h" -#include "tqstringlist.h" -#include "tqcolor.h" -#include -#include "tqobject.h" -#include -#include "tqbrush.h" -#include "tqpalette.h" -#include "tqwidget.h" -#include "tqjpunicode.h" -#include "tqtextcodec.h" -#include "tqpixmap.h" -#include -#include "tqiconset.h" -#include "tqbutton.h" -#include -#include "tqstyle.h" -#include "tqframe.h" -#include "tqfile.h" -#include "tqfileinfo.h" -#include "tqurlinfo.h" -#include "tqwidgetlist.h" -#include -#include "tqgroupbox.h" -#include "tqdialog.h" -#include -#include "tqdockwindow.h" -#include "tqcommonstyle.h" -#include "tqnetworkprotocol.h" -#include -#include -#include "tqgcache.h" -#include -#include -#include -#include -#include "tqgplugin.h" -#include -#include "tqrangecontrol.h" -#include "tqbuttongroup.h" -#include -#include "tqgvector.h" -#include "tqhbox.h" -#include -#include -#include "tqsocketnotifier.h" -#include -#include -#include -#include "tqbuffer.h" -#include "tqimage.h" -#include -#include "tqlineedit.h" -#include -#include "tqintdict.h" -#include "tqmotifstyle.h" -#include "tqpicture.h" -#include -#include -#include -#include -#include "tqlabel.h" -#include "tqlayout.h" -#include -#include -#include -#include "tqscrollbar.h" -#include "tqscrollview.h" -#include "tqdir.h" -#include "tqwindowsstyle.h" -#include "tqconnection.h" -#include "tqbitmap.h" -#include "tqvariant.h" -#include "tqsignal.h" -#include -#include "tqmetaobject.h" -#include "tqheader.h" -#include -#include -#include -#include "tqptrvector.h" -#include "tqmutex.h" -#include -#include -#include "tqguardedptr.h" -#include -#include "tqsqlfield.h" -#include -#include -#include -#include -#include "tqpointarray.h" -#include "tqmenudata.h" -#include -#include "tqpen.h" -#include "tqdragobject.h" -#include -#include -#include -#include -#include -#include -#include -#include "tqpopupmenu.h" -#include -#include -#include -#include "tqprogressbar.h" -#include -#include "tqptrdict.h" -#include -#include -#include -#include "tqstylesheet.h" -#include -#include -#include -#include -#include "tqregexp.h" -#include -#include -#include -#include -#include "tqsemaphore.h" -#include -#include "tqsocketdevice.h" -#include -#include -#include -#include -#include "tqtimer.h" -#include -#include -#include -#include "tqwmatrix.h" -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include "tqsqlerror.h" -#include "tqeditorfactory.h" -#include "tqsqlquery.h" -#include "tqsqlrecord.h" -#include -#include "tqsqlindex.h" -#include "tqsqlcursor.h" -#include -#include -#include "tqtable.h" -#include -#include -#include -#include -#include -#include -#include -#include -#include "tqtranslator.h" -#include -#include -#include -#include -#include "tqtextedit.h" -#include -#include -#include "tqsqleditorfactory.h" -#include -#include -#include -#include -#include -#include -#include "tqtoolbar.h" -#include -#include "tqwaitcondition.h" -#include -#include -#include -#include -#include -#include "tqdesktopwidget.h" -#include -#include "tqurl.h" -#include "tqurloperator.h" -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#if defined( QT_MOC_CPP ) || defined( QT_H_CPP ) || defined( Q_OS_MACX ) -#include -#include -#include "private/tqcom_p.h" -#include "private/tqimageformatinterface_p.h" -#include "private/tqisciicodec_p.h" -#include "private/tqlayoutengine_p.h" -#include "private/tqcomlibrary_p.h" -#include "private/tqeffects_p.h" -#include "private/tqgpluginmanager_p.h" -#include "private/tqinternal_p.h" -#include "private/tqsqldriverinterface_p.h" -#include "private/tqsqlmanager_p.h" -#include "private/qlock_p.h" -#include "private/tqcomponentfactory_p.h" -#include "private/tqstyleinterface_p.h" -#include "private/tqrichtext_p.h" -#include "private/tqsvgdevice_p.h" -#include "private/tqfontcodecs_p.h" -#include "private/tqtextcodecinterface_p.h" -#include "private/tqpsprinter_p.h" -#include "private/tqtitlebar_p.h" -#include "private/tqucom_p.h" -#include "private/tqucomextra_p.h" -#include "private/tqpluginmanager_p.h" -#include "private/tqdir_p.h" -#include "private/tqsettings_p.h" -#include "private/tqsqlextension_p.h" -#include "private/tqdialogbuttons_p.h" -#include "private/tqwidgetinterface_p.h" -#include "private/tqwidgetresizehandler_p.h" -#include "private/tqlibrary_p.h" -#endif // Private headers - - -#ifdef TQ_WS_X11 -#include "private/tqttdeintegration_x11_p.h" -#endif - -#ifdef TQ_WS_MAC -#include -#include -#endif // TQ_WS_MAC - -#ifdef TQ_WS_WIN -#include -#endif - -#ifdef TQ_WS_WCE -#include -#endif // TQ_WS_WCE - -#endif // QT_H