diff options
| author | Michele Calgaro <michele.calgaro@yahoo.it> | 2018-09-27 16:03:57 +0900 |
|---|---|---|
| committer | Michele Calgaro <michele.calgaro@yahoo.it> | 2018-09-27 16:03:57 +0900 |
| commit | 430aedbbce33fd98ce26df658842f94f333cc8ef (patch) | |
| tree | 6a8894ba14f996bb1e74648d9be377603c5dfb46 | |
| parent | 255de04fbbb4597e46fb25017879a6afeaf4cebd (diff) | |
| download | tdevelop-430aedbbce33fd98ce26df658842f94f333cc8ef.tar.gz tdevelop-430aedbbce33fd98ce26df658842f94f333cc8ef.zip | |
qt -> tqt conversion:
QTDIR -> TQTDIR
QTDOC -> TQTDOC
INCDIR_QT -> INCDIR_TQT
LIBDIR_QT -> LIBDIR_TQT
QT_INC -> TQT_INC
QT_LIB -> TQT_LIB
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
30 files changed, 58 insertions, 58 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 4d8c462c..718f1a78 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -112,8 +112,8 @@ include( ConfigureChecks.cmake ) if( NOT DEFINED QT_DOCDIR ) find_path( QT_DOCDIR index.html - ${QTDIR}/doc/html - $ENV{QTDIR}/doc/html ) + ${TQTDIR}/doc/html + $ENV{TQTDIR}/doc/html ) if( NOT QT_DOCDIR ) set( QT_DOCDIR "QT_DOCDIR is not set" ) endif( ) @@ -112,7 +112,7 @@ 2005-05-26 Tobias Erbsland <te@profzone.ch> * Added new class QtBuildConfig. This class stores the configuration about the used Qt library. Is Qt used, which major version and - where the Qt library path (QTDIR) for this project is. + where the Qt library path (TQTDIR) for this project is. In a later step, it's possible to use different qt installations for each project. E.g. you develop on a KDE4.x programm under KDE3.x. * Added a new tab in the C++ options dialog (CCConfigWidget). @@ -241,7 +241,7 @@ TAGFILES = $(TDEDIR)/share/doc/tde/HTML/en/tdelibs-apidocs/dcop/dc $(TDEDIR)/share/doc/tde/HTML/en/tdelibs-apidocs/tdeparts/tdeparts.tag=$(TDEDIR)/share/doc/tde/HTML/en/tdelibs-apidocs/tdeparts/html/ \ $(TDEDIR)/share/doc/tde/HTML/en/tdelibs-apidocs/tdemdi/tdemdi.tag=$(TDEDIR)/share/doc/tde/HTML/en/tdelibs-apidocs/tdemdi/html/ \ $(TDEDIR)/share/doc/tde/HTML/en/tdelibs-apidocs/tdeutils/tdeutils.tag=$(TDEDIR)/share/doc/tde/HTML/en/tdelibs-apidocs/tdeutils/html/ \ - $(TDEDIR)/share/doc/tde/HTML/en/tdelibs-apidocs/qt/qt.tag=$(QTDIR)/doc/html + $(TDEDIR)/share/doc/tde/HTML/en/tdelibs-apidocs/qt/qt.tag=$(TQTDIR)/doc/html GENERATE_TAGFILE = ALLEXTERNALS = NO EXTERNAL_GROUPS = NO diff --git a/Doxyfile.am b/Doxyfile.am index e35e931a..a82309d2 100644 --- a/Doxyfile.am +++ b/Doxyfile.am @@ -55,7 +55,7 @@ apidox-am-yes: fi ;\ fi ;\ if test "$$tag" = qt; then \ - echo $$tagpath=$(QTDOCDIR) >> Doxyfile ;\ + echo $$tagpath=$(TQTDOCDIR) >> Doxyfile ;\ else if test -n "$$tagpath"; then \ echo "$$tagpath=$$path/html \\" >> Doxyfile ;\ fi ;\ diff --git a/Doxyfile_full.am b/Doxyfile_full.am index aa723d17..95cac873 100644 --- a/Doxyfile_full.am +++ b/Doxyfile_full.am @@ -107,7 +107,7 @@ apidox-am-yes: fi ;\ fi ;\ if test "$$tag" = qt; then \ - echo $$tagpath=$(QTDOCDIR) >> Doxyfile ;\ + echo $$tagpath=$(TQTDOCDIR) >> Doxyfile ;\ else if test -n "$$tagpath"; then \ echo "$$tagpath=$$path/html \\" >> Doxyfile ;\ fi ;\ diff --git a/buildtools/qmake/trollprojectpart.cpp b/buildtools/qmake/trollprojectpart.cpp index eeccf445..6d92d03b 100644 --- a/buildtools/qmake/trollprojectpart.cpp +++ b/buildtools/qmake/trollprojectpart.cpp @@ -246,7 +246,7 @@ TQString TrollProjectPart::makeEnvironment() DomUtil::PairList::ConstIterator it; bool hasTQtDir = false; for (it = envvars.begin(); it != envvars.end(); ++it) { - if( (*it).first == "QTDIR" ) + if( (*it).first == "TQTDIR" ) hasTQtDir = true; environstr += (*it).first; @@ -257,7 +257,7 @@ TQString TrollProjectPart::makeEnvironment() if( !hasTQtDir && !isTQt4Project() && !DomUtil::readEntry(*projectDom(), "/kdevcppsupport/qt/root", "").isEmpty() ) { - environstr += TQString( "QTDIR=" ) + EnvVarTools::quote( DomUtil::readEntry(*projectDom(), "/kdevcppsupport/qt/root", "") ) + TQString( " PATH=$TQTDIR/bin:$PATH " ); + environstr += TQString( "TQTDIR=" ) + EnvVarTools::quote( DomUtil::readEntry(*projectDom(), "/kdevcppsupport/qt/root", "") ) + TQString( " PATH=$TQTDIR/bin:$PATH " ); } TDEConfigGroup grp( kapp->config(), "MakeOutputView" ); @@ -808,7 +808,7 @@ void TrollProjectPart::buildBinDirs( TQStringList & dirs ) const TQString m_defaultTQtDir = DomUtil::readEntry(*projectDom(), "/kdevcppsupport/qt/root", ""); if( !m_defaultTQtDir.isEmpty() ) dirs << (m_defaultTQtDir + TQString( TQChar( TQDir::separator() ) ) + "bin" ); - dirs << ( ::getenv("QTDIR") + TQString( TQChar( TQDir::separator() ) ) + "bin" ); + dirs << ( ::getenv("TQTDIR") + TQString( TQChar( TQDir::separator() ) ) + "bin" ); } TQStringList paths = TQStringList::split(":",::getenv("PATH")); dirs += paths; @@ -851,7 +851,7 @@ TQString TrollProjectPart::findTQtDir() { TQStringList qtdirs; if( !isTQt4Project() ) - qtdirs.push_back( ::getenv("QTDIR") ); + qtdirs.push_back( ::getenv("TQTDIR") ); qtdirs.push_back( TQDir::rootDirPath()+"usr"+TQString( TQChar( TQDir::separator() ) )+"lib"+TQString( TQChar( TQDir::separator() ) )+"qt"+TQString("%1").arg( DomUtil::readEntry( *projectDom(), "/kdevcppsupport/qt/version", "3") ) ); qtdirs.push_back( TQDir::rootDirPath()+"usr"+TQString( TQChar( TQDir::separator() ) )+"lib"+TQString( TQChar( TQDir::separator() ) )+"qt"+TQString( TQChar( TQDir::separator() ) )+TQString("%1").arg( DomUtil::readEntry( *projectDom(), "/kdevcppsupport/qt/version", "3") ) ); qtdirs.push_back( TQDir::rootDirPath()+"usr"+TQString( TQChar( TQDir::separator() ) )+"share"+TQString( TQChar( TQDir::separator() ) )+"qt"+TQString("%1").arg( DomUtil::readEntry( *projectDom(), "/kdevcppsupport/qt/version", "3") ) ); diff --git a/buildtools/qmake/trollprojectwidget.cpp b/buildtools/qmake/trollprojectwidget.cpp index 8a5fd12b..79077bac 100644 --- a/buildtools/qmake/trollprojectwidget.cpp +++ b/buildtools/qmake/trollprojectwidget.cpp @@ -2527,7 +2527,7 @@ TQMap<TQString,TQString> TrollProjectWidget::qmakeEnvironment() const DomUtil::PairList::ConstIterator it; bool hasTQtDir = false; for (it = envvars.begin(); it != envvars.end(); ++it) { - if( (*it).first == "QTDIR" ) + if( (*it).first == "TQTDIR" ) hasTQtDir = true; map[(*it).first] = (*it).second; @@ -2535,7 +2535,7 @@ TQMap<TQString,TQString> TrollProjectWidget::qmakeEnvironment() const if( !hasTQtDir && !m_part->isTQt4Project() && !DomUtil::readEntry(*m_part->projectDom(), "/kdevcppsupport/qt/root", "").isEmpty() ) { - map["QTDIR="] = DomUtil::readEntry(*m_part->projectDom(), "/kdevcppsupport/qt/root", ""); + map["TQTDIR="] = DomUtil::readEntry(*m_part->projectDom(), "/kdevcppsupport/qt/root", ""); map["PATH"] = map["PATH"].prepend( DomUtil::readEntry(*m_part->projectDom(), "/kdevcppsupport/qt/root", "") +"/bin" ); } return map; diff --git a/configure.in.in b/configure.in.in index 07b3515e..58e8ad45 100644 --- a/configure.in.in +++ b/configure.in.in @@ -15,7 +15,7 @@ KDEV_CHECK_BDB #KDEV_PATH_PHPDOCDIR #KDEV_PATH_GNUSTEPDOCDIR #KDEV_PATH_GTKDOCDIR -KDEV_PATH_QTDOC +KDEV_PATH_TQTDOC KDEV_PATH_KDELIBSDOXY KDEV_PATH_KDELIBSDOC diff --git a/doc/api/Mainpage.dox b/doc/api/Mainpage.dox index 5540c72b..6a96626b 100644 --- a/doc/api/Mainpage.dox +++ b/doc/api/Mainpage.dox @@ -72,7 +72,7 @@ To build your local copy of this documentation you have two choices, depending o . - If you have an older system then - setenv TDEDIR=/location_of_your_kde_instalation - - setenv QTDIR=/location_of_your_qt_instalation + - setenv TQTDIR=/location_of_your_qt_instalation - doxygen Doxyfile - make install-apidox (as root) . diff --git a/doc/tdevelop/tdevelop-install.docbook b/doc/tdevelop/tdevelop-install.docbook index 14f7236b..9b8f9ac1 100644 --- a/doc/tdevelop/tdevelop-install.docbook +++ b/doc/tdevelop/tdevelop-install.docbook @@ -371,7 +371,7 @@ Once all requirements are met, you are ready to compile and install &tdevelop;. <indexterm zone="compile-and-install-preliminaries"> <primary>TDEDIR</primary></indexterm> <indexterm zone="compile-and-install-preliminaries"> - <primary>QTDIR</primary></indexterm> + <primary>TQTDIR</primary></indexterm> <indexterm zone="compile-and-install-preliminaries"> <primary>LD_LIBRARY_PATH</primary></indexterm> <indexterm zone="compile-and-install-preliminaries"> @@ -396,10 +396,10 @@ If you use the bash shell add the following lines: <informalexample><simplelist> <member><userinput>export TDEDIR=</userinput>(path to your KDE installation)</member> - <member><userinput>export QTDIR=</userinput>(path to your Qt library)</member> - <member><userinput>export LD_LIBRARY_PATH=$QTDIR/lib:$TDEDIR/lib:$LD_LIBRARY_PATH</userinput></member> - <member><userinput>export LIBRARY_PATH=$QTDIR/lib:$TDEDIR/lib:$LIBRARY_PATH</userinput></member> - <member><userinput>export PATH=$QTDIR/bin:$TDEDIR/bin:$PATH</userinput></member> + <member><userinput>export TQTDIR=</userinput>(path to your Qt library)</member> + <member><userinput>export LD_LIBRARY_PATH=$TQTDIR/lib:$TDEDIR/lib:$LD_LIBRARY_PATH</userinput></member> + <member><userinput>export LIBRARY_PATH=$TQTDIR/lib:$TDEDIR/lib:$LIBRARY_PATH</userinput></member> + <member><userinput>export PATH=$TQTDIR/bin:$TDEDIR/bin:$PATH</userinput></member> </simplelist></informalexample> <para></para> @@ -414,10 +414,10 @@ If you use the tcsh shell add the following lines: <para> <informalexample><simplelist> <member><userinput>setenv TDEDIR </userinput>(path to your KDE installation)</member> - <member><userinput>setenv QTDIR </userinput>(path to your Qt library)</member> - <member><userinput>setenv LD_LIBRARY_PATH=$QTDIR/lib:$TDEDIR/lib:$LD_LIBRARY_PATH</userinput></member> - <member><userinput>setenv LIBRARY_PATH $QTDIR/lib:$TDEDIR/lib:$LIBRARY_PATH</userinput></member> - <member><userinput>setenv PATH $QTDIR/bin:$TDEDIR/bin:$PATH</userinput></member> + <member><userinput>setenv TQTDIR </userinput>(path to your Qt library)</member> + <member><userinput>setenv LD_LIBRARY_PATH=$TQTDIR/lib:$TDEDIR/lib:$LD_LIBRARY_PATH</userinput></member> + <member><userinput>setenv LIBRARY_PATH $TQTDIR/lib:$TDEDIR/lib:$LIBRARY_PATH</userinput></member> + <member><userinput>setenv PATH $TQTDIR/bin:$TDEDIR/bin:$PATH</userinput></member> </simplelist></informalexample> </para> diff --git a/kdevdesigner/designer/customwidgeteditor.ui b/kdevdesigner/designer/customwidgeteditor.ui index 057015be..99f98961 100644 --- a/kdevdesigner/designer/customwidgeteditor.ui +++ b/kdevdesigner/designer/customwidgeteditor.ui @@ -179,7 +179,7 @@ </property> <property name="whatsThis" stdset="0"> <string><b>Load Descriptions</b><p>Loads a file which contains descriptions of custom widgets, so that these custom widgets can be used in the Qt Designer.</p> -<p>Since it is a lot of work to type in all the information for custom widgets, you should consider using the tqtcreatecw tool which is in $QTDIR/tools/designer/tools/tqtcreatecw. Using tqtcreatecw you can create custom widget description files for your custom widgets without the need to type in all the information manually. For more information about the README file in the tqtcreatecw directory</p></string> +<p>Since it is a lot of work to type in all the information for custom widgets, you should consider using the tqtcreatecw tool which is in $TQTDIR/tools/designer/tools/tqtcreatecw. Using tqtcreatecw you can create custom widget description files for your custom widgets without the need to type in all the information manually. For more information about the README file in the tqtcreatecw directory</p></string> </property> </widget> <widget class="TQPushButton" row="4" column="1"> diff --git a/kdevdesigner/designer/mainwindowactions.cpp b/kdevdesigner/designer/mainwindowactions.cpp index c937236b..7917de8b 100644 --- a/kdevdesigner/designer/mainwindowactions.cpp +++ b/kdevdesigner/designer/mainwindowactions.cpp @@ -1453,7 +1453,7 @@ void MainWindow::createNewTemplate() } TQStringList templRoots; - const char *qtdir = getenv( "QTDIR" ); + const char *qtdir = getenv( "TQTDIR" ); if(qtdir) templRoots << qtdir; templRoots << tqInstallPathData(); diff --git a/kdevdesigner/designer/newformimpl.cpp b/kdevdesigner/designer/newformimpl.cpp index 0cdc738b..17dfc1b7 100644 --- a/kdevdesigner/designer/newformimpl.cpp +++ b/kdevdesigner/designer/newformimpl.cpp @@ -282,7 +282,7 @@ void NewForm::insertTemplates( TQIconView *tView, TQString templPath = templatePath; TQStringList templRoots; - const char *qtdir = getenv( "QTDIR" ); + const char *qtdir = getenv( "TQTDIR" ); if(qtdir) templRoots << qtdir; templRoots << tqInstallPathData(); diff --git a/languages/cpp/app_templates/cmakeqt3app/CMakeLists.txt.src b/languages/cpp/app_templates/cmakeqt3app/CMakeLists.txt.src index c4ce3e70..6122c34f 100644 --- a/languages/cpp/app_templates/cmakeqt3app/CMakeLists.txt.src +++ b/languages/cpp/app_templates/cmakeqt3app/CMakeLists.txt.src @@ -5,7 +5,7 @@ ADD_DEFINITIONS(${QT_DEFINITIONS} -Wall -O2 -g) # add the Qt include dir to the include path -INCLUDE_DIRECTORIES(${QT_INCLUDE_DIR}) +INCLUDE_DIRECTORIES(${TQT_INCLUDE_DIR}) # list all source files in a variable SET(%{APPNAMELC}_SRCS main.cpp %{APPNAMELC}.cpp) @@ -18,7 +18,7 @@ QT_WRAP_CPP (%{APPNAMELC} %{APPNAMELC}_SRCS %{APPNAMELC}.h) ADD_EXECUTABLE(%{APPNAMELC} ${%{APPNAMELC}_SRCS}) # link the application to the Qt libs -TARGET_LINK_LIBRARIES(%{APPNAMELC} ${QT_LIBRARIES} ) +TARGET_LINK_LIBRARIES(%{APPNAMELC} ${TQT_LIBRARIES} ) # create an install rule for the executable INSTALL(TARGETS %{APPNAMELC} DESTINATION bin ) diff --git a/languages/cpp/app_templates/kscons_kxt/INSTALL b/languages/cpp/app_templates/kscons_kxt/INSTALL index e61a3acc..49c761f1 100644 --- a/languages/cpp/app_templates/kscons_kxt/INSTALL +++ b/languages/cpp/app_templates/kscons_kxt/INSTALL @@ -48,7 +48,7 @@ The installation scripts are relying on the tde-config program. The programs tde-config, qmake, uic and moc must be accesssible through your PATH. -Qt and kde may not be installed as expected (in QTDIR and TDEDIR) +Qt and kde may not be installed as expected (in TQTDIR and TDEDIR) So until tde-config is able to give that information, you may have to give those paths. You may also want to tune the build. diff --git a/languages/cpp/app_templates/kscons_tdemdi/INSTALL b/languages/cpp/app_templates/kscons_tdemdi/INSTALL index e61a3acc..49c761f1 100644 --- a/languages/cpp/app_templates/kscons_tdemdi/INSTALL +++ b/languages/cpp/app_templates/kscons_tdemdi/INSTALL @@ -48,7 +48,7 @@ The installation scripts are relying on the tde-config program. The programs tde-config, qmake, uic and moc must be accesssible through your PATH. -Qt and kde may not be installed as expected (in QTDIR and TDEDIR) +Qt and kde may not be installed as expected (in TQTDIR and TDEDIR) So until tde-config is able to give that information, you may have to give those paths. You may also want to tune the build. diff --git a/languages/cpp/app_templates/qmakeapp/qmakeapp.kdevelop b/languages/cpp/app_templates/qmakeapp/qmakeapp.kdevelop index 2fa79421..93c6aafc 100644 --- a/languages/cpp/app_templates/qmakeapp/qmakeapp.kdevelop +++ b/languages/cpp/app_templates/qmakeapp/qmakeapp.kdevelop @@ -28,7 +28,7 @@ <version>3</version> <includestyle>3</includestyle> <designerintegration>EmbeddedKDevDesigner</designerintegration> - <root>%{QTDIR}</root> + <root>%{TQTDIR}</root> <qmake>%{QMAKE}</qmake> </qt> </kdevcppsupport> diff --git a/languages/cpp/app_templates/qmakeapp/qmakeapp.kdevtemplate b/languages/cpp/app_templates/qmakeapp/qmakeapp.kdevtemplate index 8ac87635..62467596 100644 --- a/languages/cpp/app_templates/qmakeapp/qmakeapp.kdevtemplate +++ b/languages/cpp/app_templates/qmakeapp/qmakeapp.kdevtemplate @@ -126,10 +126,10 @@ Comment[sr@Latn]=Program na osnovi Qt3/Qmake napravljen je u %{dest} Comment[sv]=Ett Qmake/Qt3-baserat program skapades i %{dest} Comment[zh_TW]=一個 QMake/Qt3 為基礎的應用程式已建立於 %{dest} -[QTDIR] +[TQTDIR] Type=value ValueType=QString -Value=QTDIR +Value=TQTDIR Comment=Directory where Qt3 is installed. Comment[ca]=Directori a on està instal·lat Qt3. Comment[da]=Katalog hvor Qt3 er installeret. diff --git a/languages/cpp/app_templates/qmakesimple/app.kdevelop b/languages/cpp/app_templates/qmakesimple/app.kdevelop index 31180af7..38b35bfa 100644 --- a/languages/cpp/app_templates/qmakesimple/app.kdevelop +++ b/languages/cpp/app_templates/qmakesimple/app.kdevelop @@ -24,7 +24,7 @@ <used>true</used> <includestyle>3</includestyle> <designerintegration>EmbeddedKDevDesigner</designerintegration> - <root>%{QTDIR}</root> + <root>%{TQTDIR}</root> <qmake>%{QMAKE}</qmake> </qt> </kdevcppsupport> diff --git a/languages/cpp/app_templates/qmakesimple/qmakesimple.kdevtemplate b/languages/cpp/app_templates/qmakesimple/qmakesimple.kdevtemplate index d9d03936..41b855bd 100644 --- a/languages/cpp/app_templates/qmakesimple/qmakesimple.kdevtemplate +++ b/languages/cpp/app_templates/qmakesimple/qmakesimple.kdevtemplate @@ -102,10 +102,10 @@ Comment[sv]=Ett Qmake/Qt3-baserat Hello world-program skapades i %{dest} Comment[zh_TW]=一個 Qmake/Qt3 為基礎的 hello world 程式已建立於 %{dest} -[QTDIR] +[TQTDIR] Type=value ValueType=QString -Value=QTDIR +Value=TQTDIR Comment=Directory where Qt3 is installed. Comment[ca]=Directori a on està instal·lat Qt3. Comment[da]=Katalog hvor Qt3 er installeret. diff --git a/languages/cpp/app_templates/qtopia4app/app.kdevelop b/languages/cpp/app_templates/qtopia4app/app.kdevelop index e6dd32b1..f7e4a952 100644 --- a/languages/cpp/app_templates/qtopia4app/app.kdevelop +++ b/languages/cpp/app_templates/qtopia4app/app.kdevelop @@ -85,7 +85,7 @@ <programargs>-qws</programargs> <envvars> <envvar value="/opt/Qtopia/SDK/4.2.4/x86" name="QPEDIR" /> - <envvar value="$QPEDIR/qtopiacore/target" name="QTDIR" /> + <envvar value="$QPEDIR/qtopiacore/target" name="TQTDIR" /> <envvar value="/opt/Qtopia/SDK/4.2.4/x86/lib:/opt/Qtopia/SDK/4.2.4/x86/qtopiacore/target/lib:$LD_LIBRARY_PATH" name="LD_LIBRARY_PATH" /> <envvar value="$PATH:/opt/Qtopia/SDK/scripts:/opt/Qtopia/SDK/4.2.4/x86/bin:/opt/Qtopia/SDK/4.2.4/x86/scripts" name="PATH" /> @@ -101,7 +101,7 @@ <prio>0</prio> <envvars> <envvar value="/opt/Qtopia/SDK/4.2.4/x86" name="QPEDIR" /> - <envvar value="/opt/Qtopia/SDK/4.2.4/x86/qtopiacore/target" name="QTDIR" /> + <envvar value="/opt/Qtopia/SDK/4.2.4/x86/qtopiacore/target" name="TQTDIR" /> <envvar value="$PATH:/opt/Qtopia/SDK/scripts:/opt/Qtopia/SDK/4.2.4/x86/bin:/opt/Qtopia/SDK/4.2.4/x86/scripts" name="PATH" /> </envvars> </make> diff --git a/languages/cpp/kdevdriver.cpp b/languages/cpp/kdevdriver.cpp index 4a6c45ec..5dbc5c64 100644 --- a/languages/cpp/kdevdriver.cpp +++ b/languages/cpp/kdevdriver.cpp @@ -109,7 +109,7 @@ void KDevDriver::setup() if ( qmakespec.isNull() ) qmakespec = "linux-g++"; - TQString qtdir = getenv( "QTDIR" ); + TQString qtdir = getenv( "TQTDIR" ); if( !qtdir.isNull() ) { addIncludePath( qtdir + "/include" ); diff --git a/languages/cpp/main.cpp b/languages/cpp/main.cpp index 845cc382..6352e211 100644 --- a/languages/cpp/main.cpp +++ b/languages/cpp/main.cpp @@ -86,7 +86,7 @@ public: if ( !tdedir.isNull() ) addIncludePath( tdedir + "/include" ); - TQString qtdir = getenv( "QTDIR" ); + TQString qtdir = getenv( "TQTDIR" ); if ( !qtdir.isNull() ) addIncludePath( qtdir + "/include" ); diff --git a/languages/cpp/pcsimporter/qt4importer/settingsdialog.cpp b/languages/cpp/pcsimporter/qt4importer/settingsdialog.cpp index bede0b3e..8cb9a1d8 100644 --- a/languages/cpp/pcsimporter/qt4importer/settingsdialog.cpp +++ b/languages/cpp/pcsimporter/qt4importer/settingsdialog.cpp @@ -40,7 +40,7 @@ SettingsDialog::SettingsDialog(TQWidget* parent, const char* name, WFlags fl) : SettingsDialogBase(parent,name,fl) { TQStringList qtdirs; - qtdirs.push_back( ::getenv("QTDIR") + TQString("/include") ); + qtdirs.push_back( ::getenv("TQTDIR") + TQString("/include") ); qtdirs.push_back( TQString::fromLocal8Bit(::getenv("HOME")) + "/dev/qt/include" ); qtdirs.push_back( TQString::fromLocal8Bit(::getenv("HOME")) + "/dev/qt-main/include" ); qtdirs.push_back( "/usr/qt/4/include" ); diff --git a/languages/cpp/pcsimporter/qtimporter/settingsdialog.cpp b/languages/cpp/pcsimporter/qtimporter/settingsdialog.cpp index 405b7c93..39c2faa3 100644 --- a/languages/cpp/pcsimporter/qtimporter/settingsdialog.cpp +++ b/languages/cpp/pcsimporter/qtimporter/settingsdialog.cpp @@ -40,7 +40,7 @@ SettingsDialog::SettingsDialog( TQWidget* parent, const char* name, WFlags fl ) : SettingsDialogBase( parent, name, fl ) { TQStringList qtdirs; - qtdirs.push_back( ::getenv( "QTDIR" ) + TQString("/include") ); + qtdirs.push_back( ::getenv( "TQTDIR" ) + TQString("/include") ); qtdirs.push_back( "/usr/lib/qt3/include" ); qtdirs.push_back( "/usr/lib/qt/include" ); qtdirs.push_back( "/usr/share/qt3/include" ); diff --git a/languages/cpp/qtbuildconfig.cpp b/languages/cpp/qtbuildconfig.cpp index c5c87b1c..e846b99c 100644 --- a/languages/cpp/qtbuildconfig.cpp +++ b/languages/cpp/qtbuildconfig.cpp @@ -97,7 +97,7 @@ void QtBuildConfig::buildBinDirs( TQStringList & dirs ) const { if( !m_root.isEmpty() ) dirs << (m_root + TQString( TQChar( TQDir::separator() ) ) + "bin"); - dirs << (::getenv("QTDIR") + TQString( TQChar( TQDir::separator() ) ) + "bin"); + dirs << (::getenv("TQTDIR") + TQString( TQChar( TQDir::separator() ) ) + "bin"); } TQStringList paths = TQStringList::split(":",::getenv("PATH")); dirs += paths; @@ -140,7 +140,7 @@ void QtBuildConfig::findTQtDir() { TQStringList qtdirs; if( m_version == 3 ) - qtdirs.push_back( ::getenv("QTDIR") ); + qtdirs.push_back( ::getenv("TQTDIR") ); qtdirs.push_back( TQDir::rootDirPath()+"usr"+TQString( TQChar( TQDir::separator() ) )+"lib"+TQString( TQChar( TQDir::separator() ) )+"qt"+TQString("%1").arg( m_version ) ); qtdirs.push_back( TQDir::rootDirPath()+"usr"+TQString( TQChar( TQDir::separator() ) )+"lib"+TQString( TQChar( TQDir::separator() ) )+"qt"+TQString( TQChar( TQDir::separator() ) )+TQString("%1").arg( m_version ) ); qtdirs.push_back( TQDir::rootDirPath()+"usr"+TQString( TQChar( TQDir::separator() ) )+"share"+TQString( TQChar( TQDir::separator() ) )+"qt"+TQString("%1").arg( m_version ) ); diff --git a/parts/appwizard/common/scons/admin/kde.py b/parts/appwizard/common/scons/admin/kde.py index aa275dab..717579f4 100644 --- a/parts/appwizard/common/scons/admin/kde.py +++ b/parts/appwizard/common/scons/admin/kde.py @@ -65,7 +65,7 @@ def detect_kde(env): ## Detect the qt library print "Checking for the qt library : ", - qtdir = os.getenv("QTDIR") + qtdir = os.getenv("TQTDIR") if qtdir: print GREEN+"qt is in "+qtdir+NORMAL else: @@ -77,9 +77,9 @@ def detect_kde(env): print YELLOW+"qt was found as "+m.group(1)+NORMAL else: print RED+"qt was not found"+NORMAL - print RED+"Please set QTDIR first (/usr/lib/qt3?)"+NORMAL + print RED+"Please set TQTDIR first (/usr/lib/qt3?)"+NORMAL env.Exit(1) - env['QTDIR'] = qtdir.strip() + env['TQTDIR'] = qtdir.strip() ## Find the necessary programs uic and moc print "Checking for uic : ", @@ -95,7 +95,7 @@ def detect_kde(env): if len(uic): print YELLOW+"uic was found as "+uic+NORMAL else: - print RED+"uic was not found - set QTDIR put it in your PATH ?"+NORMAL + print RED+"uic was not found - set TQTDIR put it in your PATH ?"+NORMAL env.Exit(1) env['QT_UIC'] = uic @@ -111,7 +111,7 @@ def detect_kde(env): moc = "/usr/share/qt3/bin/moc" print YELLOW + "moc was found as " + moc + NORMAL else: - print RED + "moc was not found - set QTDIR or put it in your PATH ?" + NORMAL + print RED + "moc was not found - set TQTDIR or put it in your PATH ?" + NORMAL env.Exit(1) env['QT_MOC'] = moc @@ -365,7 +365,7 @@ ie: """+BOLD+"""scons configure libdir=/usr/local/lib qtincludes=/usr/include/qt opts.AddOptions( ('PREFIX', 'root of the program installation'), - ('QTDIR', 'root of qt directory'), + ('TQTDIR', 'root of qt directory'), ('TQTLIBPATH', 'path to the qt libraries'), ('QTINCLUDEPATH', 'path to the qt includes'), ('QT_UIC', 'moc directory'), @@ -392,7 +392,7 @@ ie: """+BOLD+"""scons configure libdir=/usr/local/lib qtincludes=/usr/include/qt opts.Update(env) # reconfigure when things are missing - if not env['HELP'] and (env['_CONFIGURE'] or not env.has_key('QTDIR') or not env.has_key('TDEDIR')): + if not env['HELP'] and (env['_CONFIGURE'] or not env.has_key('TQTDIR') or not env.has_key('TDEDIR')): detect_kde(env) # finally save the configuration to the cache file @@ -408,7 +408,7 @@ ie: """+BOLD+"""scons configure libdir=/usr/local/lib qtincludes=/usr/include/qt env['QT_DEBUG'] = 0 env['QT_UIC_HFLAGS'] = '-L $QTPLUGINS -nounload' env['QT_UIC_CFLAGS'] = '$QT_UIC_HFLAGS -tr tr2i18n' - env['QT_LIBS'] = 'qt-mt' + env['TQT_LIBS'] = 'qt-mt' env['QT_UICIMPLPREFIX'] = '' env['QT_UICIMPLSUFFIX'] = '.cpp' diff --git a/parts/classview/Makefile.am b/parts/classview/Makefile.am index 3041259e..da07fcb6 100644 --- a/parts/classview/Makefile.am +++ b/parts/classview/Makefile.am @@ -19,9 +19,9 @@ rcdir = $(kde_datadir)/kdevclassview rc_DATA = kdevclassview.rc -QTDIR = /home/bernd/kdesrc/qt-copy +TQTDIR = /home/bernd/kdesrc/qt-copy foo: digraphview.cpp digraphview.h - $(QTDIR)/bin/moc digraphview.h > digraphview.moc ; \ - g++ digraphview.cpp -I$(QTDIR)/include -L$(QTDIR)/lib -L/usr/X11R6/lib -lqt -lX11 -lXext -o foo + $(TQTDIR)/bin/moc digraphview.h > digraphview.moc ; \ + g++ digraphview.cpp -I$(TQTDIR)/include -L$(TQTDIR)/lib -L/usr/X11R6/lib -lqt -lX11 -lXext -o foo noinst_HEADERS = viewcombos.h navigator.h diff --git a/parts/documentation/plugins/qt/docqtplugin.cpp b/parts/documentation/plugins/qt/docqtplugin.cpp index 47d0baff..8ce7ee06 100644 --- a/parts/documentation/plugins/qt/docqtplugin.cpp +++ b/parts/documentation/plugins/qt/docqtplugin.cpp @@ -149,7 +149,7 @@ void DocQtPlugin::autoSetupPlugin() qtDocDir = URLUtil::envExpand(qtDocDir); if (qtDocDir.isEmpty()) { - qtDocDir = getenv("QTDIR"); + qtDocDir = getenv("TQTDIR"); } if (!qtDocDir.isEmpty()) { diff --git a/tdevelop.m4.in b/tdevelop.m4.in index 36e584da..b5b4fc23 100644 --- a/tdevelop.m4.in +++ b/tdevelop.m4.in @@ -1,7 +1,7 @@ dnl dnl Check location of Qt documentation dnl -AC_DEFUN([KDEV_PATH_QTDOC], +AC_DEFUN([KDEV_PATH_TQTDOC], [ AC_MSG_CHECKING([for Qt documentation]) @@ -19,7 +19,7 @@ dnl dnl not currently used dnl qt_docdirs="/usr/doc/qt-doc/html /usr/local/qt/html /usr/local/lib/qt/html /usr/lib/qt/doc/html /usr/X11/lib/qt/html /usr/X11/lib/qt/doc/html /usr/X11R6/share/doc/qt/html /usr/share/doc/packages/qt/html" -test -n "$QTDIR" && qt_docdirs="$QTDIR/html $QTDIR/doc/html $QTDIR/doc $qt_docdirs" +test -n "$TQTDIR" && qt_docdirs="$TQTDIR/html $TQTDIR/doc/html $TQTDIR/doc $qt_docdirs" qt_docdirs="$ac_qt_docdirs $qt_docdirs" AC_FIND_FILE(classes.html, $qt_docdirs, qt_docdir) AC_MSG_RESULT($qt_docdir) |