diff options
| -rwxr-xr-x | configure | 41 | ||||
| -rw-r--r-- | qmake/Makefile.unix | 2 | ||||
| -rw-r--r-- | qmake/Makefile.win32 | 14 | ||||
| -rw-r--r-- | qmake/qmake.pro | 1 | ||||
| -rw-r--r-- | tools/configure/configureapp.cpp | 17 | ||||
| -rw-r--r-- | tools/configure/configureapp.h | 2 | ||||
| -rw-r--r-- | tools/configure/environment.cpp | 4 | ||||
| -rw-r--r-- | tools/configure/environment.h | 1 |
8 files changed, 5 insertions, 77 deletions
@@ -399,7 +399,6 @@ HostVar() UNAME_MACHINE=`(uname -m) 2>/dev/null` || UNAME_MACHINE=unknown UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown -UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown # detect the "echo without newline" style. usage: echo $ECHO_N "<string>$ECHO_C" if echo '\c' | grep '\c' >/dev/null; then @@ -512,8 +511,6 @@ QT_HOST_LIBS= QT_HOST_DATA= QT_EXT_PREFIX= -# default qpa platform - # Android vars CFG_DEFAULT_ANDROID_NDK_ROOT=$ANDROID_NDK_ROOT CFG_DEFAULT_ANDROID_SDK_ROOT=$ANDROID_SDK_ROOT @@ -529,7 +526,6 @@ CFG_DEFAULT_ANDROID_NDK_HOST=$ANDROID_NDK_HOST # parse the arguments, setting things to "yes" or "no" while [ "$#" -gt 0 ]; do CURRENT_OPT="$1" - UNKNOWN_ARG=no case "$1" in #Autoconf style options --enable-*) @@ -658,10 +654,6 @@ while [ "$#" -gt 0 ]; do extprefix) QT_EXT_PREFIX="$VAL" ;; - pkg-config) - ;; - force-pkg-config) - ;; docdir) QT_INSTALL_DOCS="$VAL" ;; @@ -1314,8 +1306,6 @@ if [ "$OPT_SHADOW" = "yes" ]; then [ "$OPT_VERBOSE" = "yes" ] && echo "Performing shadow build..." fi -# if the source tree is different from the build tree, -# symlink or copy part of the sources if [ "$OPT_SHADOW" = "yes" ]; then echo "Preparing build tree..." @@ -1628,35 +1618,21 @@ setBootstrapVariable() } # build qmake -if true; then ###[ '!' -f "$outpath/bin/qmake" ]; echo "Creating qmake..." - mkdir -p "$outpath/qmake" || exit - # fix makefiles - for mkfile in GNUmakefile Makefile; do - EXTRA_LFLAGS= - EXTRA_CFLAGS= - in_mkfile="${mkfile}.in" - if [ "$mkfile" = "Makefile" ]; then -# if which qmake >/dev/null 2>&1 && [ -f qmake/qmake.pro ]; then -# (cd qmake && qmake) >/dev/null 2>&1 && continue -# fi - in_mkfile="${mkfile}.unix" - fi - in_mkfile="$relpath/qmake/$in_mkfile" - mkfile="$outpath/qmake/$mkfile" + + in_mkfile=$relpath/qmake/Makefile.unix + mkfile=$outpath/qmake/Makefile if [ -f "$mkfile" ]; then [ "$CFG_DEV" = "yes" ] && "$WHICH" chflags >/dev/null 2>&1 && chflags nouchg "$mkfile" rm -f "$mkfile" fi - [ -f "$in_mkfile" ] || continue echo "########################################################################" > "$mkfile" echo "## This file was autogenerated by configure, all changes will be lost ##" >> "$mkfile" echo "########################################################################" >> "$mkfile" EXTRA_OBJS= EXTRA_SRCS= - EXTRA_CFLAGS="\$(QMAKE_CFLAGS) \$(QMAKE_CFLAGS_SPLIT_SECTIONS)" EXTRA_CXXFLAGS="\$(QMAKE_CXXFLAGS) \$(QMAKE_CXXFLAGS_CXX11) \$(QMAKE_CXXFLAGS_SPLIT_SECTIONS)" EXTRA_LFLAGS="\$(QMAKE_LFLAGS) \$(QMAKE_LFLAGS_GCSECTIONS)" @@ -1667,8 +1643,6 @@ if true; then ###[ '!' -f "$outpath/bin/qmake" ]; [ "$CFG_SILENT" = "yes" ] && CC_TRANSFORM='s,^,\@,' || CC_TRANSFORM= setBootstrapVariable QMAKE_CC CC "$CC_TRANSFORM" setBootstrapVariable QMAKE_CXX CXX "$CC_TRANSFORM" - setBootstrapVariable QMAKE_CFLAGS - setBootstrapVariable QMAKE_CFLAGS_SPLIT_SECTIONS setBootstrapVariable QMAKE_CXXFLAGS setBootstrapVariable QMAKE_CXXFLAGS_CXX11 setBootstrapVariable QMAKE_CXXFLAGS_SPLIT_SECTIONS @@ -1676,20 +1650,15 @@ if true; then ###[ '!' -f "$outpath/bin/qmake" ]; setBootstrapVariable QMAKE_LFLAGS_GCSECTIONS if [ "$CFG_DEBUG" = "no" ] || [ "$CFG_RELEASE_TOOLS" = "yes" ]; then - setBootstrapVariable QMAKE_CFLAGS_RELEASE setBootstrapVariable QMAKE_CXXFLAGS_RELEASE - EXTRA_CFLAGS="$EXTRA_CFLAGS \$(QMAKE_CFLAGS_RELEASE)" EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS \$(QMAKE_CXXFLAGS_RELEASE)" else - setBootstrapVariable QMAKE_CFLAGS_DEBUG setBootstrapVariable QMAKE_CXXFLAGS_DEBUG - EXTRA_CFLAGS="$EXTRA_CFLAGS \$(QMAKE_CFLAGS_DEBUG)" EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS \$(QMAKE_CXXFLAGS_DEBUG)" fi case `basename "$PLATFORM"` in win32-g++*) - EXTRA_CFLAGS="$EXTRA_CFLAGS -DUNICODE" EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS -DUNICODE" EXTRA_OBJS="qfilesystemengine_win.o \ qfilesystemiterator_win.o \ @@ -1726,7 +1695,6 @@ if true; then ###[ '!' -f "$outpath/bin/qmake" ]; echo "CARBON_CFLAGS =-fconstant-cfstrings" >>"$mkfile" EXTRA_LFLAGS="$EXTRA_LFLAGS \$(COCOA_LFLAGS)" EXTRA_LFLAGS="$EXTRA_LFLAGS \$(CARBON_LFLAGS)" - EXTRA_CFLAGS="$EXTRA_CFLAGS \$(CARBON_CFLAGS)" EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS \$(CARBON_CFLAGS)" EXTRA_OBJS="$EXTRA_OBJS \ qsettings_mac.o \ @@ -1757,7 +1725,6 @@ if true; then ###[ '!' -f "$outpath/bin/qmake" ]; echo "QT_MAJOR_VERSION = $QT_MAJOR_VERSION" >> "$mkfile" echo "QT_MINOR_VERSION = $QT_MINOR_VERSION" >> "$mkfile" echo "QT_PATCH_VERSION = $QT_PATCH_VERSION" >> "$mkfile" - echo "EXTRA_CFLAGS = $EXTRA_CFLAGS" >> "$mkfile" echo "EXTRA_CXXFLAGS = $EXTRA_CXXFLAGS" >> "$mkfile" echo "QTOBJS =" $EXTRA_OBJS >> "$mkfile" echo "QTSRCS =" $EXTRA_SRCS >> "$mkfile" @@ -1779,7 +1746,6 @@ if true; then ###[ '!' -f "$outpath/bin/qmake" ]; rm "$mkfile.tmp" fi fi - done if [ "$OPT_VERBOSE" = yes ]; then # Show the output of make @@ -1797,7 +1763,6 @@ if true; then ###[ '!' -f "$outpath/bin/qmake" ]; fi echo "Done." fi -fi # Build qmake #------------------------------------------------------------------------------- # create a qt.conf for the Qt build tree itself diff --git a/qmake/Makefile.unix b/qmake/Makefile.unix index 320979150f..0ab2a1b3c6 100644 --- a/qmake/Makefile.unix +++ b/qmake/Makefile.unix @@ -96,7 +96,7 @@ DEPEND_SRC = \ CPPFLAGS = -g $(EXTRA_CPPFLAGS) \ -I$(QMKSRC) -I$(QMKLIBSRC) -I$(QMKSRC)/generators -I$(QMKSRC)/generators/unix -I$(QMKSRC)/generators/win32 \ - -I$(QMKSRC)/generators/mac -I$(QMKSRC)/generators/integrity \ + -I$(QMKSRC)/generators/mac \ -I$(INC_PATH) -I$(INC_PATH)/QtCore \ -I$(INC_PATH)/QtCore/$(QT_VERSION) -I$(INC_PATH)/QtCore/$(QT_VERSION)/QtCore \ -I$(BUILD_PATH)/src/corelib/global \ diff --git a/qmake/Makefile.win32 b/qmake/Makefile.win32 index 3e67632939..0a1f5529af 100644 --- a/qmake/Makefile.win32 +++ b/qmake/Makefile.win32 @@ -38,7 +38,7 @@ PCH_OBJECT = qmake_pch.obj CFLAGS_BARE = -c -Fo./ -Fdqmake.pdb \ -W3 -nologo -O1 \ $(CFLAGS_EXTRA) \ - -I$(QMKSRC) -I$(QMKSRC)\library -I$(QMKSRC)\generators -I$(QMKSRC)\generators\unix -I$(QMKSRC)\generators\win32 -I$(QMKSRC)\generators\mac -I$(QMKSRC)\generators\integrity \ + -I$(QMKSRC) -I$(QMKSRC)\library -I$(QMKSRC)\generators -I$(QMKSRC)\generators\unix -I$(QMKSRC)\generators\win32 -I$(QMKSRC)\generators\mac \ -I$(INC_PATH) -I$(INC_PATH)\QtCore -I$(INC_PATH)\QtCore\$(QT_VERSION) -I$(INC_PATH)\QtCore\$(QT_VERSION)\QtCore \ -I$(BUILD_PATH)\src\corelib\global \ -I$(SOURCE_PATH)\mkspecs\$(QMAKESPEC) \ @@ -147,18 +147,9 @@ distclean:: clean -del $(BUILD_PATH)\bin\qmake.exe -del Makefile -.c.obj: - $(CXX) $(CFLAGS) $< - .cpp.obj: $(CXX) $(CXXFLAGS) $< -.cc.obj: - $(CXX) $(CXXFLAGS) $< - -.cxx.obj: - $(CXX) $(CXXFLAGS) $< - $(OBJS): $(PCH_OBJECT) $(QTOBJS): $(PCH_OBJECT) @@ -174,9 +165,6 @@ qmake_pch.obj: {$(SOURCE_PATH)\qmake\generators\mac}.cpp{}.obj:: $(CXX) $(CXXFLAGS) $< -{$(SOURCE_PATH)\qmake\generators\integrity}.cpp{}.obj:: - $(CXX) $(CXXFLAGS) $< - {$(SOURCE_PATH)\qmake\generators\unix}.cpp{}.obj:: $(CXX) $(CXXFLAGS) $< diff --git a/qmake/qmake.pro b/qmake/qmake.pro index 74cefb07aa..1472aef3e4 100644 --- a/qmake/qmake.pro +++ b/qmake/qmake.pro @@ -27,7 +27,6 @@ INCLUDEPATH += . \ generators/unix \ generators/win32 \ generators/mac \ - generators/integrity \ ../tools/shared include(qmake.pri) diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp index d9d247dbae..870bf3d368 100644 --- a/tools/configure/configureapp.cpp +++ b/tools/configure/configureapp.cpp @@ -173,12 +173,6 @@ QString Configure::formatPath(const QString &path) return ret; } -// #### somehow I get a compiler error about vc++ reaching the nesting limit without -// undefining the ansi for scoping. -#ifdef for -#undef for -#endif - void Configure::parseCmdLine() { sourcePathMangled = sourcePath; @@ -599,16 +593,6 @@ void Configure::generateQDevicePri() dictionary[ "DONE" ] = "error"; } -QString Configure::formatConfigPath(const char *var) -{ - QString val = dictionary[var]; - if (QFileInfo(val).isRelative()) { - QString pfx = dictionary["QT_INSTALL_PREFIX"]; - val = (val == ".") ? pfx : QDir(pfx).absoluteFilePath(val); - } - return QDir::toNativeSeparators(val); -} - void Configure::generateHeaders() { if (dictionary["SYNCQT"] == "auto") @@ -882,7 +866,6 @@ void Configure::buildQmake() << "QT_PATCH_VERSION = " << dictionary["VERSION_PATCH"] << endl; if (dictionary[ "QMAKESPEC" ].startsWith("win32-g++")) { stream << "QMAKESPEC = $(SOURCE_PATH)\\mkspecs\\" << dictionary[ "QMAKESPEC" ] << endl - << "EXTRA_CFLAGS = -DUNICODE -ffunction-sections" << endl << "EXTRA_CXXFLAGS = -std=c++11 -DUNICODE -ffunction-sections" << endl << "EXTRA_LFLAGS = -Wl,--gc-sections" << endl << "QTOBJS = qfilesystemengine_win.o \\" << endl diff --git a/tools/configure/configureapp.h b/tools/configure/configureapp.h index b1c6ea9181..c8d4d3df53 100644 --- a/tools/configure/configureapp.h +++ b/tools/configure/configureapp.h @@ -88,8 +88,6 @@ private: void saveCmdLine(); void applySpecSpecifics(); - - QString formatConfigPath(const char *var); }; class FileWriter : public QTextStream diff --git a/tools/configure/environment.cpp b/tools/configure/environment.cpp index 6cc350acc5..17f44c12f7 100644 --- a/tools/configure/environment.cpp +++ b/tools/configure/environment.cpp @@ -62,7 +62,6 @@ struct CompilerInfo{ const char *executable; } compiler_info[] = { // The compilers here are sorted in a reversed-preferred order - {CC_BORLAND, "Borland C++", 0, "bcc32.exe"}, {CC_MINGW, "MinGW (Minimalist GNU for Windows)", 0, "g++.exe"}, {CC_INTEL, "Intel(R) C++ Compiler for 32-bit applications", 0, "icl.exe"}, // xilink.exe, xilink5.exe, xilink6.exe, xilib.exe {CC_MSVC2012, "Microsoft (R) Visual Studio 2012 C/C++ Compiler (11.0)", "Software\\Microsoft\\VisualStudio\\SxS\\VC7\\11.0", "cl.exe"}, // link.exe, lib.exe @@ -109,9 +108,6 @@ QString Environment::detectQMakeSpec() case CC_MINGW: spec = "win32-g++"; break; - case CC_BORLAND: - spec = "win32-borland"; - break; default: break; } diff --git a/tools/configure/environment.h b/tools/configure/environment.h index d14961b5ac..2ab5b00d1c 100644 --- a/tools/configure/environment.h +++ b/tools/configure/environment.h @@ -33,7 +33,6 @@ QT_BEGIN_NAMESPACE enum Compiler { CC_UNKNOWN = 0, - CC_BORLAND = 0x01, CC_MINGW = 0x02, CC_INTEL = 0x03, CC_MSVC2005 = 0x80, |