diff options
Diffstat (limited to 'tools/configure')
| -rw-r--r-- | tools/configure/Makefile.mingw | 1 | ||||
| -rw-r--r-- | tools/configure/Makefile.win32 | 2 | ||||
| -rw-r--r-- | tools/configure/configure.pro | 2 | ||||
| -rw-r--r-- | tools/configure/configureapp.cpp | 4 |
4 files changed, 8 insertions, 1 deletions
diff --git a/tools/configure/Makefile.mingw b/tools/configure/Makefile.mingw index 9ac99fd678..539664e7d6 100644 --- a/tools/configure/Makefile.mingw +++ b/tools/configure/Makefile.mingw @@ -48,6 +48,7 @@ OBJECTS = \ qfsfileengine_win.o \ qfsfileengine_iterator.o \ qiodevice.o \ + qringbuffer.o \ qdebug.o \ qtextstream.o \ qlogging.o \ diff --git a/tools/configure/Makefile.win32 b/tools/configure/Makefile.win32 index 8c6d213e42..da5b430bb1 100644 --- a/tools/configure/Makefile.win32 +++ b/tools/configure/Makefile.win32 @@ -47,6 +47,7 @@ OBJECTS = \ qfsfileengine_win.obj \ qfsfileengine_iterator.obj \ qiodevice.obj \ + qringbuffer.obj \ qdebug.obj \ qtextstream.obj \ qlogging.obj \ @@ -122,6 +123,7 @@ qfsfileengine.obj: $(CORESRC)\io\qfsfileengine.cpp $(PCH) qfsfileengine_win.obj: $(CORESRC)\io\qfsfileengine_win.cpp $(PCH) qfsfileengine_iterator.obj: $(CORESRC)\io\qfsfileengine_iterator.cpp $(PCH) qiodevice.obj: $(CORESRC)\io\qiodevice.cpp $(PCH) +qringbuffer.obj: $(CORESRC)\tools\qringbuffer.cpp $(PCH) qdebug.obj: $(CORESRC)\io\qdebug.cpp $(PCH) qtextstream.obj: $(CORESRC)\io\qtextstream.cpp $(PCH) qtemporaryfile.obj: $(CORESRC)\io\qtemporaryfile.cpp $(PCH) diff --git a/tools/configure/configure.pro b/tools/configure/configure.pro index e4901bacde..939c9ea5ab 100644 --- a/tools/configure/configure.pro +++ b/tools/configure/configure.pro @@ -68,6 +68,7 @@ HEADERS = configureapp.h environment.h tools.h\ $$QT_SOURCE_TREE/src/corelib/tools/qdatetime.h \ $$QT_SOURCE_TREE/src/corelib/tools/qmap.h \ $$QT_SOURCE_TREE/src/corelib/tools/qregexp.h \ + $$QT_SOURCE_TREE/src/corelib/tools/qringbuffer_p.h \ $$QT_SOURCE_TREE/src/corelib/tools/qstring.h \ $$QT_SOURCE_TREE/src/corelib/tools/qstringlist.h \ $$QT_SOURCE_TREE/src/corelib/tools/qstringmatcher.h \ @@ -119,6 +120,7 @@ SOURCES = main.cpp configureapp.cpp environment.cpp tools.cpp \ $$QT_SOURCE_TREE/src/corelib/tools/qdatetime.cpp \ $$QT_SOURCE_TREE/src/corelib/tools/qmap.cpp \ $$QT_SOURCE_TREE/src/corelib/tools/qregexp.cpp \ + $$QT_SOURCE_TREE/src/corelib/tools/qringbuffer.cpp \ $$QT_SOURCE_TREE/src/corelib/tools/qstring.cpp \ $$QT_SOURCE_TREE/src/corelib/tools/qstring_compat.cpp \ $$QT_SOURCE_TREE/src/corelib/tools/qstringlist.cpp \ diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp index 3bf0546ac1..756703d1bd 100644 --- a/tools/configure/configureapp.cpp +++ b/tools/configure/configureapp.cpp @@ -2291,7 +2291,9 @@ bool Configure::checkAvailability(const QString &part) } else if (part == "WMF_BACKEND") { available = findFile("mfapi.h") && findFile("mf.lib"); } else if (part == "DIRECTWRITE") { - available = findFile("dwrite.h") && findFile("d2d1.h") && findFile("dwrite.lib"); + const char *dwriteLibrary = Environment::detectCompiler() != CC_MINGW + ? "dwrite.lib" : "libdwrite.a"; + available = findFile("dwrite.h") && findFile("d2d1.h") && findFile(QLatin1String(dwriteLibrary)); } else if (part == "DIRECT2D") { available = tryCompileProject("qpa/direct2d"); } else if (part == "ICONV") { |