summaryrefslogtreecommitdiffstats
path: root/tools/configure
diff options
context:
space:
mode:
Diffstat (limited to 'tools/configure')
-rw-r--r--tools/configure/Makefile.mingw2
-rw-r--r--tools/configure/Makefile.win324
-rw-r--r--tools/configure/configure.pro2
-rw-r--r--tools/configure/configureapp.cpp45
4 files changed, 6 insertions, 47 deletions
diff --git a/tools/configure/Makefile.mingw b/tools/configure/Makefile.mingw
index 086dd71a85..c4255f545f 100644
--- a/tools/configure/Makefile.mingw
+++ b/tools/configure/Makefile.mingw
@@ -36,6 +36,7 @@ OBJECTS = \
qdatastream.o \
qdir.o \
qdiriterator.o \
+ qfiledevice.o \
qfile.o \
qfileinfo.o \
qabstractfileengine.o \
@@ -60,7 +61,6 @@ OBJECTS = \
qvsnprintf.o \
qvariant.o \
qsystemerror.o \
- qurl.o \
qmetatype.o \
qmalloc.o \
qxmlstream.o \
diff --git a/tools/configure/Makefile.win32 b/tools/configure/Makefile.win32
index d2193d7619..9d38f261f8 100644
--- a/tools/configure/Makefile.win32
+++ b/tools/configure/Makefile.win32
@@ -34,6 +34,7 @@ OBJECTS = \
qdatastream.obj \
qdir.obj \
qdiriterator.obj \
+ qfiledevice.obj \
qfile.obj \
qfileinfo.obj \
qabstractfileengine.obj \
@@ -58,7 +59,6 @@ OBJECTS = \
qvsnprintf.obj \
qvariant.obj \
qsystemerror.obj \
- qurl.obj \
qmetatype.obj \
qmalloc.obj \
qxmlstream.obj \
@@ -103,6 +103,7 @@ qbuffer.obj: $(CORESRC)\io\qbuffer.cpp $(PCH)
qdatastream.obj: $(CORESRC)\io\qdatastream.cpp $(PCH)
qdir.obj: $(CORESRC)\io\qdir.cpp $(PCH)
qdiriterator.obj: $(CORESRC)\io\qdiriterator.cpp $(PCH)
+qfiledevice.obj: $(CORESRC)\io\qfiledevice.cpp $(PCH)
qfile.obj: $(CORESRC)\io\qfile.cpp $(PCH)
qfileinfo.obj: $(CORESRC)\io\qfileinfo.cpp $(PCH)
qabstractfileengine.obj: $(CORESRC)\io\qabstractfileengine.cpp $(PCH)
@@ -126,7 +127,6 @@ qstringlist.obj: $(CORESRC)\tools\qstringlist.cpp $(PCH)
qvsnprintf.obj: $(CORESRC)\tools\qvsnprintf.cpp $(PCH)
qvariant.obj: $(CORESRC)\kernel\qvariant.cpp $(PCH)
qsystemerror.obj: $(CORESRC)\kernel\qsystemerror.cpp $(PCH)
-qurl.obj: $(CORESRC)\io\qurl.cpp $(PCH)
qline.obj: $(CORESRC)\tools\qline.cpp $(PCH)
qsize.obj: $(CORESRC)\tools\qsize.cpp $(PCH)
qpoint.obj: $(CORESRC)\tools\qpoint.cpp $(PCH)
diff --git a/tools/configure/configure.pro b/tools/configure/configure.pro
index b0224891c3..8aa45bebb4 100644
--- a/tools/configure/configure.pro
+++ b/tools/configure/configure.pro
@@ -48,6 +48,7 @@ HEADERS = configureapp.h environment.h tools.h\
$$QT_SOURCE_TREE/src/corelib/io/qdatastream.h \
$$QT_SOURCE_TREE/src/corelib/io/qdir.h \
$$QT_SOURCE_TREE/src/corelib/io/qdiriterator.h \
+ $$QT_SOURCE_TREE/src/corelib/io/qfiledevice.h \
$$QT_SOURCE_TREE/src/corelib/io/qfile.h \
$$QT_SOURCE_TREE/src/corelib/io/qfileinfo.h \
$$QT_SOURCE_TREE/src/corelib/io/qfilesystementry_p.h \
@@ -92,6 +93,7 @@ SOURCES = main.cpp configureapp.cpp environment.cpp tools.cpp \
$$QT_SOURCE_TREE/src/corelib/io/qdatastream.cpp \
$$QT_SOURCE_TREE/src/corelib/io/qdir.cpp \
$$QT_SOURCE_TREE/src/corelib/io/qdiriterator.cpp \
+ $$QT_SOURCE_TREE/src/corelib/io/qfiledevice.cpp \
$$QT_SOURCE_TREE/src/corelib/io/qfile.cpp \
$$QT_SOURCE_TREE/src/corelib/io/qfileinfo.cpp \
$$QT_SOURCE_TREE/src/corelib/io/qabstractfileengine.cpp \
diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp
index 8624285387..62040db66f 100644
--- a/tools/configure/configureapp.cpp
+++ b/tools/configure/configureapp.cpp
@@ -201,9 +201,6 @@ Configure::Configure(int& argc, char** argv)
dictionary[ "EXCEPTIONS" ] = "yes";
dictionary[ "WIDGETS" ] = "yes";
dictionary[ "RTTI" ] = "yes";
- dictionary[ "MMX" ] = "auto";
- dictionary[ "3DNOW" ] = "auto";
- dictionary[ "SSE" ] = "auto";
dictionary[ "SSE2" ] = "auto";
dictionary[ "IWMMXT" ] = "auto";
dictionary[ "SYNCQT" ] = "auto";
@@ -798,18 +795,6 @@ void Configure::parseCmdLine()
cout << "Setting accessibility to NO" << endl;
}
- else if (configCmdLine.at(i) == "-no-mmx")
- dictionary[ "MMX" ] = "no";
- else if (configCmdLine.at(i) == "-mmx")
- dictionary[ "MMX" ] = "yes";
- else if (configCmdLine.at(i) == "-no-3dnow")
- dictionary[ "3DNOW" ] = "no";
- else if (configCmdLine.at(i) == "-3dnow")
- dictionary[ "3DNOW" ] = "yes";
- else if (configCmdLine.at(i) == "-no-sse")
- dictionary[ "SSE" ] = "no";
- else if (configCmdLine.at(i) == "-sse")
- dictionary[ "SSE" ] = "yes";
else if (configCmdLine.at(i) == "-no-sse2")
dictionary[ "SSE2" ] = "no";
else if (configCmdLine.at(i) == "-sse2")
@@ -1380,10 +1365,7 @@ void Configure::applySpecSpecifics()
dictionary[ "STL" ] = "no";
dictionary[ "EXCEPTIONS" ] = "no";
dictionary[ "RTTI" ] = "no";
- dictionary[ "3DNOW" ] = "no";
- dictionary[ "SSE" ] = "no";
dictionary[ "SSE2" ] = "no";
- dictionary[ "MMX" ] = "no";
dictionary[ "IWMMXT" ] = "no";
dictionary[ "CE_CRT" ] = "yes";
dictionary[ "DIRECTSHOW" ] = "no";
@@ -1474,7 +1456,7 @@ bool Configure::displayHelp()
"[-qt-zlib] [-system-zlib] [-qt-pcre] [-system-pcre] [-no-gif]\n"
"[-no-libpng] [-qt-libpng] [-system-libpng]\n"
"[-no-libjpeg] [-qt-libjpeg] [-system-libjpeg]\n"
- "[-mmx] [-no-mmx] [-3dnow] [-no-3dnow] [-sse] [-no-sse] [-sse2] [-no-sse2]\n"
+ "[-sse2] [-no-sse2]\n"
"[-no-iwmmxt] [-iwmmxt] [-openssl] [-openssl-linked]\n"
"[-no-openssl] [-no-dbus] [-dbus] [-dbus-linked] [-platform <spec>]\n"
"[-qtnamespace <namespace>] [-qtlibinfix <infix>] [-no-phonon]\n"
@@ -1622,12 +1604,6 @@ bool Configure::displayHelp()
desc("RTTI", "no", "-no-rtti", "Do not compile runtime type information.");
desc("RTTI", "yes", "-rtti", "Compile runtime type information.\n");
- desc("MMX", "no", "-no-mmx", "Do not compile with use of MMX instructions");
- desc("MMX", "yes", "-mmx", "Compile with use of MMX instructions");
- desc("3DNOW", "no", "-no-3dnow", "Do not compile with use of 3DNOW instructions");
- desc("3DNOW", "yes", "-3dnow", "Compile with use of 3DNOW instructions");
- desc("SSE", "no", "-no-sse", "Do not compile with use of SSE instructions");
- desc("SSE", "yes", "-sse", "Compile with use of SSE instructions");
desc("SSE2", "no", "-no-sse2", "Do not compile with use of SSE2 instructions");
desc("SSE2", "yes", "-sse2", "Compile with use of SSE2 instructions");
desc("OPENSSL", "no", "-no-openssl", "Do not compile in OpenSSL support");
@@ -1873,10 +1849,6 @@ bool Configure::checkAvailability(const QString &part)
available = (dictionary.value("XQMAKESPEC").startsWith("wince"));
else if (part == "SSE2")
available = (dictionary.value("QMAKESPEC") != "win32-msvc");
- else if (part == "3DNOW")
- available = (dictionary.value("QMAKESPEC") != "win32-msvc") && (dictionary.value("QMAKESPEC") != "win32-icc") && findFile("mm3dnow.h");
- else if (part == "MMX" || part == "SSE")
- available = (dictionary.value("QMAKESPEC") != "win32-msvc");
else if (part == "OPENSSL")
available = findFile("openssl\\ssl.h");
else if (part == "DBUS")
@@ -1985,12 +1957,6 @@ void Configure::autoDetection()
dictionary["SQL_SQLITE2"] = checkAvailability("SQL_SQLITE2") ? defaultTo("SQL_SQLITE2") : "no";
if (dictionary["SQL_IBASE"] == "auto")
dictionary["SQL_IBASE"] = checkAvailability("SQL_IBASE") ? defaultTo("SQL_IBASE") : "no";
- if (dictionary["MMX"] == "auto")
- dictionary["MMX"] = checkAvailability("MMX") ? "yes" : "no";
- if (dictionary["3DNOW"] == "auto")
- dictionary["3DNOW"] = checkAvailability("3DNOW") ? "yes" : "no";
- if (dictionary["SSE"] == "auto")
- dictionary["SSE"] = checkAvailability("SSE") ? "yes" : "no";
if (dictionary["SSE2"] == "auto")
dictionary["SSE2"] = checkAvailability("SSE2") ? "yes" : "no";
if (dictionary["IWMMXT"] == "auto")
@@ -2635,12 +2601,6 @@ void Configure::generateQConfigPri()
configStream << " exceptions_off";
if (dictionary[ "RTTI" ] == "yes")
configStream << " rtti";
- if (dictionary[ "MMX" ] == "yes")
- configStream << " mmx";
- if (dictionary[ "3DNOW" ] == "yes")
- configStream << " 3dnow";
- if (dictionary[ "SSE" ] == "yes")
- configStream << " sse";
if (dictionary[ "SSE2" ] == "yes")
configStream << " sse2";
if (dictionary[ "IWMMXT" ] == "yes")
@@ -3048,9 +3008,6 @@ void Configure::displayConfig()
cout << "STL support................." << dictionary[ "STL" ] << endl;
cout << "Exception support..........." << dictionary[ "EXCEPTIONS" ] << endl;
cout << "RTTI support................" << dictionary[ "RTTI" ] << endl;
- cout << "MMX support................." << dictionary[ "MMX" ] << endl;
- cout << "3DNOW support..............." << dictionary[ "3DNOW" ] << endl;
- cout << "SSE support................." << dictionary[ "SSE" ] << endl;
cout << "SSE2 support................" << dictionary[ "SSE2" ] << endl;
cout << "IWMMXT support.............." << dictionary[ "IWMMXT" ] << endl;
cout << "OpenGL support.............." << dictionary[ "OPENGL" ] << endl;
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-26 10:31:46 +0000