From 67ea870f6f8432d002110af6f36bbc8539be5131 Mon Sep 17 00:00:00 2001 From: Iain Date: Fri, 18 Sep 2009 13:00:53 +0100 Subject: Remove remaining support for win32-mwc mkspec Qt 4.6 cannot be used with the win32-mwc makespec, as the Metrowerks compiler supplied with Symbian/S60 releases does not contain enough support to build the Qt host tools in a Unicode version, and ANSI support has been removed in 4.6. Alternative mkspecs are win32-g++, requiring mingw tools to be installed, or one of the win32-msvc.... mkspecs, requiring MS Visual Studio (Express edition is fine) The mwc makefile for qmake was already removed, so this just removes the remaining support. Reviewed-by: Jason Barron --- configure.exe | Bin 2038784 -> 1168384 bytes mkspecs/win32-mwc/qmake.conf | 110 ------------------------- mkspecs/win32-mwc/qplatformdefs.h | 164 -------------------------------------- tools/configure/configureapp.cpp | 3 - 4 files changed, 277 deletions(-) delete mode 100644 mkspecs/win32-mwc/qmake.conf delete mode 100644 mkspecs/win32-mwc/qplatformdefs.h diff --git a/configure.exe b/configure.exe index 2c5b717..c428581 100755 Binary files a/configure.exe and b/configure.exe differ diff --git a/mkspecs/win32-mwc/qmake.conf b/mkspecs/win32-mwc/qmake.conf deleted file mode 100644 index 8ebe4ff..0000000 --- a/mkspecs/win32-mwc/qmake.conf +++ /dev/null @@ -1,110 +0,0 @@ -# -# qmake configuration for win32-mwc -# -# Written for mwc -# - -MAKEFILE_GENERATOR = MINGW -TEMPLATE = app -CONFIG += qt warn_on release link_prl copy_dir_files debug_and_release debug_and_release_target -QT += core gui -DEFINES += UNICODE QT_NO_PROCESS QT_NO_SHAREDMEMORY QT_NO_CONCURRENT QT_NO_SYSTEMSEMAPHORE -QMAKE_COMPILER_DEFINES += __GNUC__ WIN32 - -QMAKE_EXT_OBJ = .o -QMAKE_EXT_RES = _res.o - -QMAKE_CC = mwccsym2 -QMAKE_LEX = flex -QMAKE_LEXFLAGS = -QMAKE_YACC = byacc -QMAKE_YACCFLAGS = -d -QMAKE_CFLAGS = -gccinc -stackcommit 1024000 -stackreserve 1024000 -QMAKE_CFLAGS_DEPS = -M -QMAKE_CFLAGS_WARN_ON = -w on -w nonotused -w nonotinlined -w noimplicit -w nopadding -w noemptydecl -w nounusedexpr -w nopossible -QMAKE_CFLAGS_WARN_OFF = -w off -QMAKE_CFLAGS_RELEASE = -O2 -QMAKE_CFLAGS_DEBUG = -g -O1 -QMAKE_CFLAGS_YACC = -Wno-unused -Wno-parentheses - -QMAKE_CXX = mwccsym2 -QMAKE_CXXFLAGS = $$QMAKE_CFLAGS -QMAKE_CXXFLAGS_DEPS = $$QMAKE_CFLAGS_DEPS -QMAKE_CXXFLAGS_WARN_ON = $$QMAKE_CFLAGS_WARN_ON -QMAKE_CXXFLAGS_WARN_OFF = $$QMAKE_CFLAGS_WARN_OFF -QMAKE_CXXFLAGS_RELEASE = $$QMAKE_CFLAGS_RELEASE -QMAKE_CXXFLAGS_DEBUG = $$QMAKE_CFLAGS_DEBUG -QMAKE_CXXFLAGS_YACC = $$QMAKE_CFLAGS_YACC -QMAKE_CXXFLAGS_THREAD = $$QMAKE_CFLAGS_THREAD -QMAKE_CXXFLAGS_RTTI_ON = -RTTI on -QMAKE_CXXFLAGS_RTTI_OFF = -RTTI off -QMAKE_CXXFLAGS_EXCEPTIONS_ON = "-Cpp_exceptions on" -QMAKE_CXXFLAGS_EXCEPTIONS_OFF = "-Cpp_exceptions off" - -QMAKE_INCDIR = -QMAKE_INCDIR_QT = $$[QT_INSTALL_HEADERS] -QMAKE_LIBDIR_QT = $$[QT_INSTALL_LIBS] - -QMAKE_RUN_CC = $(CC) -c $(CFLAGS) $(INCPATH) -o $obj $src -QMAKE_RUN_CC_IMP = $(CC) -c $(CFLAGS) $(INCPATH) -o $@ $< -QMAKE_RUN_CXX = $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $obj $src -QMAKE_RUN_CXX_IMP = $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< - -QMAKE_LINK = mwldsym2 -#QMAKE_LFLAGS = -enable-stdcall-fixup -Wl,-enable-auto-import -Wl,-enable-runtime-pseudo-reloc -QMAKE_LFLAGS = -QMAKE_LFLAGS_EXCEPTIONS_ON = -QMAKE_LFLAGS_EXCEPTIONS_OFF = -#QMAKE_LFLAGS_RELEASE = -Wl,-s -QMAKE_LFLAGS_RELEASE = -QMAKE_LFLAGS_DEBUG = -#QMAKE_LFLAGS_CONSOLE = -Wl,-subsystem,console -#QMAKE_LFLAGS_WINDOWS = -Wl,-subsystem,windows -QMAKE_LFLAGS_CONSOLE = -QMAKE_LFLAGS_WINDOWS = -QMAKE_LFLAGS_DLL = -runtime dm -QMAKE_LINK_OBJECT_MAX = 99999999 -QMAKE_LINK_OBJECT_SCRIPT= object_script - - -QMAKE_LIBS = -QMAKE_LIBS_CORE = -lkernel32 -luser32 -lshell32 -luuid -lole32 -ladvapi32 -lws2_32 -QMAKE_LIBS_GUI = -lgdi32 -lcomdlg32 -loleaut32 -limm32 -lwinmm -lwinspool -lws2_32 -lole32 -luuid -luser32 -ladvapi32 -QMAKE_LIBS_NETWORK = -lws2_32 -QMAKE_LIBS_OPENGL = -lopengl32 -lglu32 -lgdi32 -luser32 -QMAKE_LIBS_COMPAT = -ladvapi32 -lshell32 -lcomdlg32 -luser32 -lgdi32 -lws2_32 -#QMAKE_LIBS_QT_ENTRY = -lmingw32 -lqtmain -QMAKE_LIBS_QT_ENTRY = -lqtmain - -!isEmpty(QMAKE_SH) { - MINGW_IN_SHELL = 1 - QMAKE_DIR_SEP = / - QMAKE_COPY = cp - QMAKE_COPY_DIR = xcopy /s /q /y /i - QMAKE_MOVE = mv - QMAKE_DEL_FILE = rm - QMAKE_MKDIR = mkdir - QMAKE_DEL_DIR = rmdir - QMAKE_CHK_DIR_EXISTS = test -d -} else { - QMAKE_COPY = copy /y - QMAKE_COPY_DIR = xcopy /s /q /y /i - QMAKE_MOVE = move - QMAKE_DEL_FILE = del - QMAKE_MKDIR = mkdir - QMAKE_DEL_DIR = rmdir - QMAKE_CHK_DIR_EXISTS = if not exist -} - -QMAKE_MOC = $$[QT_INSTALL_BINS]$${DIR_SEPARATOR}moc.exe -QMAKE_UIC = $$[QT_INSTALL_BINS]$${DIR_SEPARATOR}uic.exe -QMAKE_IDC = $$[QT_INSTALL_BINS]$${DIR_SEPARATOR}idc.exe - -QMAKE_IDL = midl -QMAKE_LIB = $$QMAKE_LINK -library -o -QMAKE_RC = windres -QMAKE_ZIP = zip -r -9 - -QMAKE_STRIP = strip -QMAKE_STRIPFLAGS_LIB += --strip-unneeded -load(qt_config) diff --git a/mkspecs/win32-mwc/qplatformdefs.h b/mkspecs/win32-mwc/qplatformdefs.h deleted file mode 100644 index c1d6eb1..0000000 --- a/mkspecs/win32-mwc/qplatformdefs.h +++ /dev/null @@ -1,164 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the qmake spec of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** No Commercial Usage -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the Technology Preview License Agreement accompanying -** this package. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** If you have questions regarding the use of this file, please contact -** Nokia at qt-info@nokia.com. -** -** -** -** -** -** -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#ifndef QPLATFORMDEFS_H -#define QPLATFORMDEFS_H - -#ifdef UNICODE -#ifndef _UNICODE -#define _UNICODE -#endif -#endif - -// Get Qt defines/settings - -#include "qglobal.h" - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#if !defined(_WIN32_WINNT) || (_WIN32_WINNT-0 < 0x0500) -typedef enum { - NameUnknown = 0, - NameFullyQualifiedDN = 1, - NameSamCompatible = 2, - NameDisplay = 3, - NameUniqueId = 6, - NameCanonical = 7, - NameUserPrincipal = 8, - NameCanonicalEx = 9, - NameServicePrincipal = 10, - NameDnsDomain = 12 -} EXTENDED_NAME_FORMAT, *PEXTENDED_NAME_FORMAT; -#endif - -#define Q_FS_FAT -#ifdef QT_LARGEFILE_SUPPORT -#define QT_STATBUF struct _stati64 // non-ANSI defs -#define QT_STATBUF4TSTAT struct _stati64 // non-ANSI defs -#define QT_STAT _stati64 -#define QT_FSTAT _fstati64 -#else -#define QT_STATBUF struct _stat // non-ANSI defs -#define QT_STATBUF4TSTAT struct _stat // non-ANSI defs -#define QT_STAT _stat -#define QT_FSTAT _fstat -#endif -#define QT_STAT_REG _S_IFREG -#define QT_STAT_DIR _S_IFDIR -#define QT_STAT_MASK _S_IFMT -#if defined(_S_IFLNK) -# define QT_STAT_LNK _S_IFLNK -#endif -#define QT_FILENO _fileno -#define QT_OPEN _open -#define QT_CLOSE _close -#ifdef QT_LARGEFILE_SUPPORT -#define QT_LSEEK _lseeki64 -#ifndef UNICODE -#define QT_TSTAT _stati64 -#else -#define QT_TSTAT _wstati64 -#endif -#else -#define QT_LSEEK _lseek -#ifndef UNICODE -#define QT_TSTAT _stat -#else -#define QT_TSTAT _wstat -#endif -#endif -#define QT_READ _read -#define QT_WRITE _write -#define QT_ACCESS _access -#define QT_GETCWD _getcwd -#define QT_CHDIR _chdir -#define QT_MKDIR _mkdir -#define QT_RMDIR _rmdir -#define QT_OPEN_LARGEFILE 0 -#define QT_OPEN_RDONLY _O_RDONLY -#define QT_OPEN_WRONLY _O_WRONLY -#define QT_OPEN_RDWR _O_RDWR -#define QT_OPEN_CREAT _O_CREAT -#define QT_OPEN_TRUNC _O_TRUNC -#define QT_OPEN_APPEND _O_APPEND -#if defined(O_TEXT) -# define QT_OPEN_TEXT _O_TEXT -# define QT_OPEN_BINARY _O_BINARY -#endif - -#define QT_FOPEN fopen -#ifdef QT_LARGEFILE_SUPPORT -#define QT_FSEEK fseeko64 -#define QT_FTELL ftello64 -#else -#define QT_FSEEK fseek -#define QT_FTELL ftell -#endif -#define QT_FGETPOS fgetpos -#define QT_FSETPOS fsetpos -#define QT_FPOS_T fpos_t -#ifdef QT_LARGEFILE_SUPPORT -#define QT_OFF_T off64_t -#else -#define QT_OFF_T long -#endif - -#define QT_SIGNAL_ARGS int - -#define QT_VSNPRINTF _vsnprintf -#define QT_SNPRINTF _snprintf - -# define F_OK 0 -# define X_OK 1 -# define W_OK 2 -# define R_OK 4 - -#define PATH_MAX 1024 -#endif // QPLATFORMDEFS_H diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp index c8e369e..94f7915 100644 --- a/tools/configure/configureapp.cpp +++ b/tools/configure/configureapp.cpp @@ -1154,9 +1154,6 @@ void Configure::parseCmdLine() } else { dictionary[ "QMAKEMAKEFILE" ] = "Makefile.win32-g++"; } - } else if ( dictionary[ "QMAKESPEC" ] == QString( "win32-mwc" ) ) { - dictionary[ "QMAKEMAKEFILE" ] = "Makefile.win32-mwc"; - dictionary[ "MAKE" ] = "make"; } else { if ( dictionary[ "MAKE" ].isEmpty() ) dictionary[ "MAKE" ] = "make"; dictionary[ "QMAKEMAKEFILE" ] = "Makefile.win32"; -- cgit v0.12