From 496e0eea013ace6a9484c84767dd112c592aeabd Mon Sep 17 00:00:00 2001 From: Debian Qt/KDE Maintainers Date: Tue, 5 Feb 2013 21:52:29 +0000 Subject: [PATCH] _debian_append_qt4_suffix Gbp-Pq: Name 01_debian_append_qt4_suffix.diff --- config.tests/unix/compile.test | 2 +- config.tests/unix/doubleformat.test | 2 +- config.tests/unix/endian.test | 2 +- config.tests/unix/ptrsize.test | 2 +- config.tests/x11/notype.test | 2 +- configure | 12 ++++++------ demos/qtdemo/menumanager.cpp | 2 +- mkspecs/common/linux.conf | 4 ++-- mkspecs/features/moc.prf | 2 +- mkspecs/features/uic.prf | 2 +- mkspecs/hurd-g++/qmake.conf | 4 ++-- projects.pro | 2 +- qmake/Makefile.unix | 8 ++++---- src/tools/moc/moc.pro | 2 +- src/tools/uic/uic.pro | 2 +- tools/assistant/tools/assistant/assistant.pro | 2 +- tools/designer/src/designer/assistantclient.cpp | 2 +- tools/designer/src/designer/designer.pro | 2 +- tools/designer/src/lib/shared/qdesigner_utils.cpp | 2 +- tools/linguist/linguist/linguist.pro | 2 +- tools/linguist/lrelease/lrelease.pro | 2 +- tools/linguist/lupdate/lupdate.pro | 2 +- tools/qdbus/qdbuscpp2xml/qdbuscpp2xml.cpp | 2 +- tools/qtconfig/qtconfig.pro | 2 +- translations/translations.pro | 6 +++--- 25 files changed, 37 insertions(+), 37 deletions(-) diff --git a/config.tests/unix/compile.test b/config.tests/unix/compile.test index f4a7f29b1..836c39cbc 100755 --- a/config.tests/unix/compile.test +++ b/config.tests/unix/compile.test @@ -68,7 +68,7 @@ test -r Makefile && $MAKE distclean >/dev/null 2>&1 # Make sure output from possible previous tests is gone rm -f "$EXE" "${EXE}.exe" -"$OUTDIR/bin/qmake" -nocache -spec "$QMKSPEC" "CONFIG+=$QMAKE_CONFIG" "CONFIG-=debug_and_release" "LIBS*=$LFLAGS" "LIBS+=$MAC_ARCH_LFLAGS" "INCLUDEPATH*=$INCLUDEPATH" "QMAKE_CXXFLAGS*=$CXXFLAGS" "QMAKE_CXXFLAGS+=$MAC_ARCH_CXXFLAGS" "QT_BUILD_TREE=$OUTDIR" "$SRCDIR/$TEST/$EXE.pro" -o "$OUTDIR/$TEST/Makefile" +"$OUTDIR/bin/qmake-qt4" -nocache -spec "$QMKSPEC" "CONFIG+=$QMAKE_CONFIG" "CONFIG-=debug_and_release" "LIBS*=$LFLAGS" "LIBS+=$MAC_ARCH_LFLAGS" "INCLUDEPATH*=$INCLUDEPATH" "QMAKE_CXXFLAGS*=$CXXFLAGS" "QMAKE_CXXFLAGS+=$MAC_ARCH_CXXFLAGS" "QT_BUILD_TREE=$OUTDIR" "$SRCDIR/$TEST/$EXE.pro" -o "$OUTDIR/$TEST/Makefile" if [ "$VERBOSE" = "yes" ]; then $MAKE diff --git a/config.tests/unix/doubleformat.test b/config.tests/unix/doubleformat.test index 996855372..7b144ae87 100755 --- a/config.tests/unix/doubleformat.test +++ b/config.tests/unix/doubleformat.test @@ -10,7 +10,7 @@ OUTDIR=$4 # build and run a test program test -d "$OUTDIR/config.tests/unix/doubleformat" || mkdir -p "$OUTDIR/config.tests/unix/doubleformat" -"$OUTDIR/bin/qmake" -nocache -spec "$QMKSPEC" "QT_BUILD_TREE=$OUTDIR" "$SRCDIR/config.tests/unix/doubleformat/doubleformattest.pro" -o "$OUTDIR/config.tests/unix/doubleformat/Makefile" >/dev/null 2>&1 +"$OUTDIR/bin/qmake-qt4" -nocache -spec "$QMKSPEC" "QT_BUILD_TREE=$OUTDIR" "$SRCDIR/config.tests/unix/doubleformat/doubleformattest.pro" -o "$OUTDIR/config.tests/unix/doubleformat/Makefile" >/dev/null 2>&1 cd "$OUTDIR/config.tests/unix/doubleformat" DOUBLEFORMAT="UNKNOWN" diff --git a/config.tests/unix/endian.test b/config.tests/unix/endian.test index d0fb6ce78..87a22032d 100755 --- a/config.tests/unix/endian.test +++ b/config.tests/unix/endian.test @@ -10,7 +10,7 @@ OUTDIR=$4 # build and run a test program test -d "$OUTDIR/config.tests/unix/endian" || mkdir -p "$OUTDIR/config.tests/unix/endian" -"$OUTDIR/bin/qmake" -nocache -spec "$QMKSPEC" "QT_BUILD_TREE=$OUTDIR" "$SRCDIR/config.tests/unix/endian/endiantest.pro" -o "$OUTDIR/config.tests/unix/endian/Makefile" >/dev/null 2>&1 +"$OUTDIR/bin/qmake-qt4" -nocache -spec "$QMKSPEC" "QT_BUILD_TREE=$OUTDIR" "$SRCDIR/config.tests/unix/endian/endiantest.pro" -o "$OUTDIR/config.tests/unix/endian/Makefile" >/dev/null 2>&1 cd "$OUTDIR/config.tests/unix/endian" diff --git a/config.tests/unix/ptrsize.test b/config.tests/unix/ptrsize.test index c78c73f7a..e4cb38eff 100755 --- a/config.tests/unix/ptrsize.test +++ b/config.tests/unix/ptrsize.test @@ -10,7 +10,7 @@ OUTDIR=$4 # build and run a test program test -d "$OUTDIR/config.tests/unix/ptrsize" || mkdir -p "$OUTDIR/config.tests/unix/ptrsize" -"$OUTDIR/bin/qmake" -nocache -spec "$QMKSPEC" "QT_BUILD_TREE=$OUTDIR" "$SRCDIR/config.tests/unix/ptrsize/ptrsizetest.pro" -o "$OUTDIR/config.tests/unix/ptrsize/Makefile" >/dev/null 2>&1 +"$OUTDIR/bin/qmake-qt4" -nocache -spec "$QMKSPEC" "QT_BUILD_TREE=$OUTDIR" "$SRCDIR/config.tests/unix/ptrsize/ptrsizetest.pro" -o "$OUTDIR/config.tests/unix/ptrsize/Makefile" >/dev/null 2>&1 cd "$OUTDIR/config.tests/unix/ptrsize" if [ "$VERBOSE" = "yes" ]; then diff --git a/config.tests/x11/notype.test b/config.tests/x11/notype.test index 1b534c8cb..e716b80dc 100755 --- a/config.tests/x11/notype.test +++ b/config.tests/x11/notype.test @@ -27,7 +27,7 @@ if [ $XPLATFORM = "solaris-g++" -o $XPLATFORM = "hpux-g++" -o $XPLATFORM = "aix- NOTYPE=yes test -d "$OUTDIR/config.tests/x11/notype" || mkdir -p "$OUTDIR/config.tests/x11/notype" - "$OUTDIR/bin/qmake" -nocache -spec "$QMKSPEC" "QT_BUILD_TREE=$OUTDIR" "$SRCDIR/config.tests/x11/notype/notypetest.pro" -o "$OUTDIR/config.tests/x11/notype/Makefile" >/dev/null 2>&1 + "$OUTDIR/bin/qmake-qt4" -nocache -spec "$QMKSPEC" "QT_BUILD_TREE=$OUTDIR" "$SRCDIR/config.tests/x11/notype/notypetest.pro" -o "$OUTDIR/config.tests/x11/notype/Makefile" >/dev/null 2>&1 cd "$OUTDIR/config.tests/x11/notype" if [ "$VERBOSE" = "yes" ]; then diff --git a/configure b/configure index c1667b6d6..dbd9c2244 100755 --- a/configure +++ b/configure @@ -4847,7 +4847,7 @@ setBootstrapVariable() } # build qmake -if true; then ###[ '!' -f "$outpath/bin/qmake" ]; +if true; then ###[ '!' -f "$outpath/bin/qmake-qt4" ]; echo "Creating qmake. Please wait..." OLD_QCONFIG_H= @@ -8544,8 +8544,8 @@ QMAKE_ABSOLUTE_SOURCE_ROOT = \$\$QT_SOURCE_TREE QMAKE_MOC_SRC = \$\$QT_BUILD_TREE/src/moc #local paths that cannot be queried from the QT_INSTALL_* properties while building QTDIR -QMAKE_MOC = \$\$QT_BUILD_TREE/bin/moc -QMAKE_UIC = \$\$QT_BUILD_TREE/bin/uic +QMAKE_MOC = \$\$QT_BUILD_TREE/bin/moc-qt4 +QMAKE_UIC = \$\$QT_BUILD_TREE/bin/uic-qt4 QMAKE_UIC3 = \$\$QT_BUILD_TREE/bin/uic3 QMAKE_RCC = \$\$QT_BUILD_TREE/bin/rcc QMAKE_QDBUSXML2CPP = \$\$QT_BUILD_TREE/bin/qdbusxml2cpp @@ -8948,11 +8948,11 @@ EXEC="" echo "Finding project files. Please wait..." if [ "$CFG_NOPROCESS" != "yes" ]; then - "$outpath/bin/qmake" -prl -r "${relpath}/projects.pro" + "$outpath/bin/qmake-qt4" -prl -r "${relpath}/projects.pro" if [ -f "${relpath}/projects.pro" ]; then mkfile="${outpath}/Makefile" [ -f "$mkfile" ] && chmod +w "$mkfile" - QTDIR="$outpath" "$outpath/bin/qmake" -spec "$XQMAKESPEC" "${relpath}/projects.pro" -o "$mkfile" + QTDIR="$outpath" "$outpath/bin/qmake-qt4" -spec "$XQMAKESPEC" "${relpath}/projects.pro" -o "$mkfile" fi fi @@ -9139,7 +9139,7 @@ for file in .projects .projects.3; do QMAKE_SPEC_ARGS="-spec $SPEC" echo $ECHO_N " for $a$ECHO_C" - QMAKE="$outpath/bin/qmake" + QMAKE="$outpath/bin/qmake-qt4" QMAKE_ARGS="$QMAKE_SWITCHES $QMAKE_SPEC_ARGS" if [ "$file" = ".projects.3" ]; then echo " (fast)" diff --git a/demos/qtdemo/menumanager.cpp b/demos/qtdemo/menumanager.cpp index 4c4440b06..c94d45115 100644 --- a/demos/qtdemo/menumanager.cpp +++ b/demos/qtdemo/menumanager.cpp @@ -297,7 +297,7 @@ void MenuManager::showDocInAssistant(const QString &name) if (this->assistantProcess.state() != QProcess::Running){ QString app = QLibraryInfo::location(QLibraryInfo::BinariesPath) + QDir::separator(); #if !defined(Q_OS_MAC) - app += QLatin1String("assistant"); + app += QLatin1String("assistant-qt4"); #else app += QLatin1String("Assistant.app/Contents/MacOS/Assistant"); #endif diff --git a/mkspecs/common/linux.conf b/mkspecs/common/linux.conf index d60533e92..f2a2f60e3 100644 --- a/mkspecs/common/linux.conf +++ b/mkspecs/common/linux.conf @@ -41,8 +41,8 @@ QMAKE_LIBS_WAYLAND = QMAKE_LIBDIR_WAYLAND = QMAKE_DEFINES_WAYLAND = -QMAKE_MOC = $$[QT_INSTALL_BINS]/moc -QMAKE_UIC = $$[QT_INSTALL_BINS]/uic +QMAKE_MOC = $$[QT_INSTALL_BINS]/moc-qt4 +QMAKE_UIC = $$[QT_INSTALL_BINS]/uic-qt4 QMAKE_AR = ar cqs QMAKE_OBJCOPY = objcopy diff --git a/mkspecs/features/moc.prf b/mkspecs/features/moc.prf index d0b36e41b..dab3067f1 100644 --- a/mkspecs/features/moc.prf +++ b/mkspecs/features/moc.prf @@ -1,6 +1,6 @@ #global defaults -qtPrepareTool(QMAKE_MOC, moc) +qtPrepareTool(QMAKE_MOC, moc-qt4) isEmpty(MOC_DIR):MOC_DIR = . isEmpty(QMAKE_H_MOD_MOC):QMAKE_H_MOD_MOC = moc_ isEmpty(QMAKE_EXT_CPP_MOC):QMAKE_EXT_CPP_MOC = .moc diff --git a/mkspecs/features/uic.prf b/mkspecs/features/uic.prf index 74a26833a..21f16ad73 100644 --- a/mkspecs/features/uic.prf +++ b/mkspecs/features/uic.prf @@ -1,6 +1,6 @@ defined(qtPrepareTool)|load(qt_functions) ### Qt 5: see default_pre.prf qtPrepareTool(QMAKE_UIC3, uic3) -qtPrepareTool(QMAKE_UIC, uic) +qtPrepareTool(QMAKE_UIC, uic-qt4) isEmpty(UI_DIR):UI_DIR = . isEmpty(UI_SOURCES_DIR):UI_SOURCES_DIR = $$UI_DIR diff --git a/mkspecs/hurd-g++/qmake.conf b/mkspecs/hurd-g++/qmake.conf index 09a72fa0d..fb9215d83 100644 --- a/mkspecs/hurd-g++/qmake.conf +++ b/mkspecs/hurd-g++/qmake.conf @@ -42,8 +42,8 @@ QMAKE_LIBS_OPENGL_ES2 = -lGLESv2 QMAKE_LIBS_OPENVG = -lOpenVG QMAKE_LIBS_THREAD = -lpthread -QMAKE_MOC = $$[QT_INSTALL_BINS]/moc -QMAKE_UIC = $$[QT_INSTALL_BINS]/uic +QMAKE_MOC = $$[QT_INSTALL_BINS]/moc-qt4 +QMAKE_UIC = $$[QT_INSTALL_BINS]/uic-qt4 QMAKE_AR = ar cqs QMAKE_OBJCOPY = objcopy diff --git a/projects.pro b/projects.pro index 0b498f867..cb11a39ae 100644 --- a/projects.pro +++ b/projects.pro @@ -144,7 +144,7 @@ qmake.path=$$[QT_INSTALL_BINS] win32 { qmake.files=$$QT_BUILD_TREE/bin/qmake.exe } else { - qmake.files=$$QT_BUILD_TREE/bin/qmake + qmake.files=$$QT_BUILD_TREE/bin/qmake-qt4 } INSTALLS += qmake diff --git a/qmake/Makefile.unix b/qmake/Makefile.unix index 9dbe035fc..ce54d561e 100644 --- a/qmake/Makefile.unix +++ b/qmake/Makefile.unix @@ -86,17 +86,17 @@ CPPFLAGS = -g -I. -Igenerators -Igenerators/unix -Igenerators/win32 \ CXXFLAGS = @QMAKE_CXXFLAGS@ $(CPPFLAGS) -first all: $(BUILD_PATH)/bin/qmake -qmake: $(BUILD_PATH)/bin/qmake +first all: $(BUILD_PATH)/bin/qmake-qt4 +qmake: $(BUILD_PATH)/bin/qmake-qt4 -$(BUILD_PATH)/bin/qmake: $(OBJS) $(QOBJS) +$(BUILD_PATH)/bin/qmake-qt4: $(OBJS) $(QOBJS) $(CXX) -o "$@" $(OBJS) $(QOBJS) $(LFLAGS) clean:: rm -f $(OBJS) $(QOBJS) distclean:: clean - rm -rf $(BUILD_PATH)/bin/qmake .deps + rm -rf $(BUILD_PATH)/bin/qmake-qt4 .deps depend: makedepend -D__MAKEDEPEND__ $(CPPFLAGS) $(DEPEND_SRC) diff --git a/src/tools/moc/moc.pro b/src/tools/moc/moc.pro index 0b8ddbe31..595f425ca 100644 --- a/src/tools/moc/moc.pro +++ b/src/tools/moc/moc.pro @@ -1,5 +1,5 @@ TEMPLATE = app -TARGET = moc +TARGET = moc-qt4 DEFINES += QT_MOC DESTDIR = ../../../bin diff --git a/src/tools/uic/uic.pro b/src/tools/uic/uic.pro index 9b63d42c2..759f9bc20 100644 --- a/src/tools/uic/uic.pro +++ b/src/tools/uic/uic.pro @@ -1,5 +1,5 @@ TEMPLATE = app -TARGET = uic +TARGET = uic-qt4 DESTDIR = ../../../bin DEFINES += QT_UIC diff --git a/tools/assistant/tools/assistant/assistant.pro b/tools/assistant/tools/assistant/assistant.pro index 7f0fdd158..cbe941aef 100644 --- a/tools/assistant/tools/assistant/assistant.pro +++ b/tools/assistant/tools/assistant/assistant.pro @@ -1,7 +1,7 @@ include(../../../shared/fontpanel/fontpanel.pri) TEMPLATE = app LANGUAGE = C++ -TARGET = assistant +TARGET = assistant-qt4 contains(QT_CONFIG, webkit):QT += webkit CONFIG += qt \ warn_on \ diff --git a/tools/designer/src/designer/assistantclient.cpp b/tools/designer/src/designer/assistantclient.cpp index b3ba21143..60a15be62 100644 --- a/tools/designer/src/designer/assistantclient.cpp +++ b/tools/designer/src/designer/assistantclient.cpp @@ -114,7 +114,7 @@ QString AssistantClient::binary() { QString app = QLibraryInfo::location(QLibraryInfo::BinariesPath) + QDir::separator(); #if !defined(Q_OS_MAC) - app += QLatin1String("assistant"); + app += QLatin1String("assistant-qt4"); #else app += QLatin1String("Assistant.app/Contents/MacOS/Assistant"); #endif diff --git a/tools/designer/src/designer/designer.pro b/tools/designer/src/designer/designer.pro index 8564e96cb..99efc804b 100644 --- a/tools/designer/src/designer/designer.pro +++ b/tools/designer/src/designer/designer.pro @@ -23,7 +23,7 @@ contains(CONFIG, static) { DEFINES += QT_DESIGNER_STATIC } -TARGET = designer +TARGET = designer-qt4 include(../../../shared/fontpanel/fontpanel.pri) include(../../../shared/qttoolbardialog/qttoolbardialog.pri) diff --git a/tools/designer/src/lib/shared/qdesigner_utils.cpp b/tools/designer/src/lib/shared/qdesigner_utils.cpp index e06b057f8..e214b8fd4 100644 --- a/tools/designer/src/lib/shared/qdesigner_utils.cpp +++ b/tools/designer/src/lib/shared/qdesigner_utils.cpp @@ -782,7 +782,7 @@ namespace qdesigner_internal binary += QDir::separator(); switch (mode) { case UIC_GenerateCode: - binary += QLatin1String("uic"); + binary += QLatin1String("uic-qt4"); break; case UIC_ConvertV3: binary += QLatin1String("uic3"); diff --git a/tools/linguist/linguist/linguist.pro b/tools/linguist/linguist/linguist.pro index ce8d5854f..b26123745 100644 --- a/tools/linguist/linguist/linguist.pro +++ b/tools/linguist/linguist/linguist.pro @@ -69,7 +69,7 @@ HEADERS += \ contains(QT_PRODUCT, OpenSource.*):DEFINES *= QT_OPENSOURCE DEFINES += QT_KEYWORDS -TARGET = linguist +TARGET = linguist-qt4 win32:RC_FILE = linguist.rc mac { static:CONFIG -= global_init_link_order diff --git a/tools/linguist/lrelease/lrelease.pro b/tools/linguist/lrelease/lrelease.pro index 28a741dd6..960d513ba 100644 --- a/tools/linguist/lrelease/lrelease.pro +++ b/tools/linguist/lrelease/lrelease.pro @@ -1,5 +1,5 @@ TEMPLATE = app -TARGET = lrelease +TARGET = lrelease-qt4 DESTDIR = ../../../bin DEFINES += QT_NO_CAST_FROM_ASCII QT_NO_CAST_TO_ASCII diff --git a/tools/linguist/lupdate/lupdate.pro b/tools/linguist/lupdate/lupdate.pro index 3ed909ae5..7345e7a25 100644 --- a/tools/linguist/lupdate/lupdate.pro +++ b/tools/linguist/lupdate/lupdate.pro @@ -1,5 +1,5 @@ TEMPLATE = app -TARGET = lupdate +TARGET = lupdate-qt4 DESTDIR = ../../../bin QT -= gui diff --git a/tools/qdbus/qdbuscpp2xml/qdbuscpp2xml.cpp b/tools/qdbus/qdbuscpp2xml/qdbuscpp2xml.cpp index 1be6c27ec..babb7d4cd 100644 --- a/tools/qdbus/qdbuscpp2xml/qdbuscpp2xml.cpp +++ b/tools/qdbus/qdbuscpp2xml/qdbuscpp2xml.cpp @@ -396,7 +396,7 @@ int main(int argc, char **argv) else { // run moc on this file QProcess proc; - proc.start(QLibraryInfo::location(QLibraryInfo::BinariesPath) + QLatin1String("/moc"), QStringList() << QFile::decodeName(argv[i]), QIODevice::ReadOnly | QIODevice::Text); + proc.start(QLibraryInfo::location(QLibraryInfo::BinariesPath) + QLatin1String("/moc-qt4"), QStringList() << QFile::decodeName(argv[i]), QIODevice::ReadOnly | QIODevice::Text); if (!proc.waitForStarted()) { fprintf(stderr, PROGRAMNAME ": could not execute moc! Aborting.\n"); diff --git a/tools/qtconfig/qtconfig.pro b/tools/qtconfig/qtconfig.pro index cb06e5a99..ca21a724f 100644 --- a/tools/qtconfig/qtconfig.pro +++ b/tools/qtconfig/qtconfig.pro @@ -19,7 +19,7 @@ FORMS = mainwindow.ui paletteeditoradvanced.ui previewwidget.ui RESOURCES = qtconfig.qrc PROJECTNAME = Qt Configuration -TARGET = qtconfig +TARGET = qtconfig-qt4 DESTDIR = ../../bin target.path=$$[QT_INSTALL_BINS] diff --git a/translations/translations.pro b/translations/translations.pro index dc99bebf5..884ce5ba4 100644 --- a/translations/translations.pro +++ b/translations/translations.pro @@ -1,8 +1,8 @@ TRANSLATIONS = $$files(*.ts) -qtPrepareTool(LRELEASE, lrelease) +qtPrepareTool(LRELEASE, lrelease-qt4) qtPrepareTool(LCONVERT, lconvert) -qtPrepareTool(LUPDATE, lupdate) +qtPrepareTool(LUPDATE, lupdate-qt4) LUPDATE += -locations relative -no-ui-lines TS_TARGETS = @@ -96,7 +96,7 @@ updateqm.input = TRANSLATIONS updateqm.output = ${QMAKE_FILE_BASE}.qm isEmpty(vcproj):updateqm.variable_out = PRE_TARGETDEPS updateqm.commands = $$LRELEASE ${QMAKE_FILE_IN} -qm ${QMAKE_FILE_OUT} -silent:updateqm.commands = @echo lrelease ${QMAKE_FILE_IN} && $$updateqm.commands +silent:updateqm.commands = @echo lrelease-qt4 ${QMAKE_FILE_IN} && $$updateqm.commands updateqm.name = LRELEASE ${QMAKE_FILE_IN} updateqm.CONFIG += no_link QMAKE_EXTRA_COMPILERS += updateqm -- 2.30.2