diff options
Diffstat (limited to 'qmake')
-rw-r--r-- | qmake/.prev_CMakeLists.txt | 188 | ||||
-rw-r--r-- | qmake/CMakeLists.txt | 220 | ||||
-rw-r--r-- | qmake/Makefile.unix | 6 | ||||
-rw-r--r-- | qmake/Makefile.win32 | 3 | ||||
-rw-r--r-- | qmake/generators/makefiledeps.cpp | 13 | ||||
-rw-r--r-- | qmake/generators/makefiledeps.h | 10 | ||||
-rw-r--r-- | qmake/library/proitems.h | 3 | ||||
-rw-r--r-- | qmake/main.cpp | 2 | ||||
-rw-r--r-- | qmake/property.cpp | 1 |
9 files changed, 423 insertions, 23 deletions
diff --git a/qmake/.prev_CMakeLists.txt b/qmake/.prev_CMakeLists.txt new file mode 100644 index 0000000000..3f30387fd4 --- /dev/null +++ b/qmake/.prev_CMakeLists.txt @@ -0,0 +1,188 @@ +# Generated from qmake.pro. + +##################################################################### +## qmake Binary: +##################################################################### + +qt_add_executable(qmake + SOURCES + ../src/corelib/codecs/qutfcodec.cpp ../src/corelib/codecs/qutfcodec_p.h + ../src/corelib/global/qglobal.cpp ../src/corelib/global/qglobal.h + ../src/corelib/global/qlibraryinfo.cpp + ../src/corelib/global/qlogging.cpp + ../src/corelib/global/qmalloc.cpp + ../src/corelib/global/qnumeric.cpp ../src/corelib/global/qnumeric.h + ../src/corelib/io/qabstractfileengine.cpp ../src/corelib/io/qabstractfileengine_p.h + ../src/corelib/io/qbuffer.cpp ../src/corelib/io/qbuffer.h + ../src/corelib/io/qdir.cpp ../src/corelib/io/qdir.h ../src/corelib/io/qdir_p.h + ../src/corelib/io/qdiriterator.cpp ../src/corelib/io/qdiriterator.h + ../src/corelib/io/qfile.cpp ../src/corelib/io/qfile.h + ../src/corelib/io/qfiledevice.cpp + ../src/corelib/io/qfileinfo.cpp ../src/corelib/io/qfileinfo.h + ../src/corelib/io/qfilesystemengine.cpp + ../src/corelib/io/qfilesystementry.cpp + ../src/corelib/io/qfsfileengine.cpp + ../src/corelib/io/qfsfileengine_iterator.cpp + ../src/corelib/io/qiodevice.cpp ../src/corelib/io/qiodevice.h + ../src/corelib/io/qsettings.cpp + ../src/corelib/io/qtemporaryfile.cpp ../src/corelib/io/qtemporaryfile.h + ../src/corelib/kernel/qmetatype.cpp ../src/corelib/kernel/qmetatype.h + ../src/corelib/kernel/qsystemerror.cpp ../src/corelib/kernel/qsystemerror_p.h + ../src/corelib/kernel/qvariant.cpp + ../src/corelib/plugin/quuid.cpp ../src/corelib/plugin/quuid.h + ../src/corelib/serialization/qcborstreamwriter.cpp ../src/corelib/serialization/qcborstreamwriter.h + ../src/corelib/serialization/qcborvalue.cpp ../src/corelib/serialization/qcborvalue.h ../src/corelib/serialization/qcborvalue_p.h + ../src/corelib/serialization/qjson_p.h + ../src/corelib/serialization/qjsonarray.cpp ../src/corelib/serialization/qjsonarray.h + ../src/corelib/serialization/qjsoncbor.cpp + ../src/corelib/serialization/qjsondocument.cpp ../src/corelib/serialization/qjsondocument.h + ../src/corelib/serialization/qjsonobject.cpp ../src/corelib/serialization/qjsonobject.h + ../src/corelib/serialization/qjsonparser.cpp ../src/corelib/serialization/qjsonparser_p.h + ../src/corelib/serialization/qjsonvalue.cpp ../src/corelib/serialization/qjsonvalue.h + ../src/corelib/serialization/qjsonwriter_p.h + ../src/corelib/serialization/qtextstream.cpp ../src/corelib/serialization/qtextstream.h + ../src/corelib/serialization/qxmlstream.cpp ../src/corelib/serialization/qxmlstream.h + ../src/corelib/serialization/qxmlutils.cpp ../src/corelib/serialization/qxmlutils_p.h + ../src/corelib/tools/qarraydata.cpp ../src/corelib/tools/qarraydata.h + ../src/corelib/tools/qarraydataops.h + ../src/corelib/tools/qarraydatapointer.h + ../src/corelib/tools/qbitarray.cpp ../src/corelib/tools/qbitarray.h + ../src/corelib/tools/qcryptographichash.cpp ../src/corelib/tools/qcryptographichash.h + ../src/corelib/tools/qhash.cpp ../src/corelib/tools/qhash.h + ../src/corelib/tools/qlist.cpp ../src/corelib/tools/qlist.h + ../src/corelib/tools/qmap.cpp ../src/corelib/tools/qmap.h + ../src/corelib/tools/qvector.h + ../src/corelib/tools/qversionnumber.cpp ../src/corelib/tools/qversionnumber.h + cachekeys.h + generators/mac/pbuilder_pbx.cpp generators/mac/pbuilder_pbx.h + generators/makefile.cpp generators/makefile.h + generators/makefiledeps.cpp generators/makefiledeps.h + generators/metamakefile.cpp generators/metamakefile.h + generators/projectgenerator.cpp generators/projectgenerator.h + generators/unix/unixmake.cpp generators/unix/unixmake.h + generators/unix/unixmake2.cpp + generators/win32/mingw_make.cpp generators/win32/mingw_make.h + generators/win32/msbuild_objectmodel.cpp generators/win32/msbuild_objectmodel.h + generators/win32/msvc_nmake.cpp generators/win32/msvc_nmake.h + generators/win32/msvc_objectmodel.cpp generators/win32/msvc_objectmodel.h + generators/win32/msvc_vcproj.cpp generators/win32/msvc_vcproj.h + generators/win32/msvc_vcxproj.cpp generators/win32/msvc_vcxproj.h + generators/win32/winmakefile.cpp generators/win32/winmakefile.h + generators/xmloutput.cpp generators/xmloutput.h + library/ioutils.cpp library/ioutils.h + library/proitems.cpp library/proitems.h + library/qmake_global.h + library/qmakebuiltins.cpp + library/qmakeevaluator.cpp library/qmakeevaluator.h library/qmakeevaluator_p.h + library/qmakeglobals.cpp library/qmakeglobals.h + library/qmakeparser.cpp library/qmakeparser.h + library/qmakevfs.cpp library/qmakevfs.h + main.cpp + meta.cpp meta.h + option.cpp option.h + project.cpp project.h + property.cpp property.h + qbytearray.cpp-NOTFOUND qbytearray.h-NOTFOUND + qbytearraymatcher.cpp-NOTFOUND qbytearraymatcher.h-NOTFOUND + qcalendar.cpp-NOTFOUND qcalendar.h-NOTFOUND + qcalendarbackend_p.h-NOTFOUND + qcalendarmath_p.h-NOTFOUND + qchar.h-NOTFOUND + qdatetime.cpp-NOTFOUND qdatetime.h-NOTFOUND qdatetime_p.h-NOTFOUND + qgregoriancalendar.cpp-NOTFOUND qgregoriancalendar_p.h-NOTFOUND + qlocale.cpp-NOTFOUND qlocale.h-NOTFOUND + qlocale_tools.cpp-NOTFOUND qlocale_tools_p.h-NOTFOUND + qregexp.cpp-NOTFOUND qregexp.h-NOTFOUND + qromancalendar.cpp-NOTFOUND qromancalendar_p.h-NOTFOUND + qstring.cpp-NOTFOUND qstring.h-NOTFOUND + qstringlist.cpp-NOTFOUND qstringlist.h-NOTFOUND + qstringmatcher.h-NOTFOUND + qvsnprintf.cpp-NOTFOUND + DEFINES + (QT_VERSION_STR=\"\") + PROEVALUATOR_FULL + QT_BOOTSTRAPPED + QT_BUILD_QMAKE + QT_NO_FOREACH + QT_VERSION_MAJOR= + QT_VERSION_MINOR= + QT_VERSION_PATCH= + INCLUDE_DIRECTORIES + (..)/include + (..)/include/QtCore (..)/include/QtCore + (..)/include/QtCore//QtCore + (..)/src/corelib/global + . + ../src/3rdparty/tinycbor/src + generators + generators/mac + generators/unix + generators/win32 + library + PUBLIC_LIBRARIES + Qt::Gui + PRECOMPILED_HEADER + "qmake_pch.h" +) + +#### Keys ignored in scope 1:.:.:qmake.pro:<TRUE>: +# _OPTION = "host_build" + +## Scopes: +##################################################################### + +qt_extend_target(qmake CONDITION WIN32 + SOURCES + ../src/corelib/global/qoperatingsystemversion_win.cpp + ../src/corelib/io/qfilesystemengine_win.cpp + ../src/corelib/io/qfilesystemiterator_win.cpp + ../src/corelib/io/qfsfileengine_win.cpp + ../src/corelib/io/qsettings_win.cpp + ../src/corelib/plugin/qsystemlibrary.cpp + qlocale_win.cpp-NOTFOUND + registry.cpp-NOTFOUND + DEFINES + UNICODE + _CRT_SECURE_NO_WARNINGS + _ENABLE_EXTENDED_ALIGNED_STORAGE + _SCL_SECURE_NO_WARNINGS + PUBLIC_LIBRARIES + advapi32 + kernel32 + netapi32 + ole32 +) + +qt_extend_target(qmake CONDITION UNIX + SOURCES + ../src/corelib/io/qfilesystemengine_unix.cpp + ../src/corelib/io/qfilesystemiterator_unix.cpp + ../src/corelib/io/qfsfileengine_unix.cpp + ../src/corelib/kernel/qcore_unix.cpp + qlocale_unix.cpp-NOTFOUND +) + +qt_extend_target(qmake CONDITION APPLE_OSX + SOURCES + qcore_foundation.mm + qcore_mac.cpp + qoperatingsystemversion_darwin.mm + qsettings_mac.cpp + PUBLIC_LIBRARIES + ${FWApplicationServices} + ${FWCoreServices} + ${FWFoundation} + COMPILE_OPTIONS + -fconstant-cfstrings +) + +qt_extend_target(qmake CONDITION WIN32 AND mingw + PUBLIC_LIBRARIES + uuid +) + +qt_extend_target(qmake CONDITION CLANG AND WIN32 + COMPILE_OPTIONS + -Wno-microsoft-enum-value + -fms-compatibility-version=19.00.23506 +) diff --git a/qmake/CMakeLists.txt b/qmake/CMakeLists.txt new file mode 100644 index 0000000000..fb370eda4a --- /dev/null +++ b/qmake/CMakeLists.txt @@ -0,0 +1,220 @@ +# Generated from qmake.pro. + +##################################################################### +## qmake Binary: +##################################################################### + +qt_add_tool(qmake # special case + NO_QT # special case + TOOLS_TARGET Core # special case + # GUI # special case: remove this + SOURCES + ../src/corelib/codecs/qutfcodec.cpp ../src/corelib/codecs/qutfcodec_p.h + ../src/corelib/global/qendian.cpp # special case + ../src/corelib/global/qglobal.cpp ../src/corelib/global/qglobal.h + ../src/corelib/global/qlibraryinfo.cpp + ../src/corelib/global/qlogging.cpp + ../src/corelib/global/qmalloc.cpp + ../src/corelib/global/qnumeric.cpp ../src/corelib/global/qnumeric.h + ../src/corelib/global/qoperatingsystemversion.cpp # special case + ../src/corelib/global/qrandom.cpp # special case + ../src/corelib/io/qabstractfileengine.cpp ../src/corelib/io/qabstractfileengine_p.h + ../src/corelib/io/qbuffer.cpp ../src/corelib/io/qbuffer.h + ../src/corelib/io/qdebug.cpp # special case + ../src/corelib/io/qdir.cpp ../src/corelib/io/qdir.h ../src/corelib/io/qdir_p.h + ../src/corelib/io/qdiriterator.cpp ../src/corelib/io/qdiriterator.h + ../src/corelib/io/qfile.cpp ../src/corelib/io/qfile.h + ../src/corelib/io/qfiledevice.cpp + ../src/corelib/io/qfileinfo.cpp ../src/corelib/io/qfileinfo.h + ../src/corelib/io/qfilesystemengine.cpp + ../src/corelib/io/qfilesystementry.cpp + ../src/corelib/io/qfsfileengine.cpp + ../src/corelib/io/qfsfileengine_iterator.cpp + ../src/corelib/io/qiodevice.cpp ../src/corelib/io/qiodevice.h + ../src/corelib/io/qsettings.cpp + ../src/corelib/io/qtemporaryfile.cpp ../src/corelib/io/qtemporaryfile.h + ../src/corelib/kernel/qmetatype.cpp ../src/corelib/kernel/qmetatype.h + ../src/corelib/kernel/qsystemerror.cpp ../src/corelib/kernel/qsystemerror_p.h + ../src/corelib/kernel/qvariant.cpp + ../src/corelib/plugin/quuid.cpp ../src/corelib/plugin/quuid.h + ../src/corelib/serialization/qcborstreamwriter.cpp ../src/corelib/serialization/qcborstreamwriter.h + ../src/corelib/serialization/qcborvalue.cpp ../src/corelib/serialization/qcborvalue.h ../src/corelib/serialization/qcborvalue_p.h + ../src/corelib/serialization/qjson_p.h + ../src/corelib/serialization/qjsonarray.cpp ../src/corelib/serialization/qjsonarray.h + ../src/corelib/serialization/qjsoncbor.cpp + ../src/corelib/serialization/qjsondocument.cpp ../src/corelib/serialization/qjsondocument.h + ../src/corelib/serialization/qjsonobject.cpp ../src/corelib/serialization/qjsonobject.h + ../src/corelib/serialization/qjsonparser.cpp ../src/corelib/serialization/qjsonparser_p.h + ../src/corelib/serialization/qjsonvalue.cpp ../src/corelib/serialization/qjsonvalue.h + ../src/corelib/serialization/qjsonwriter_p.h + ../src/corelib/serialization/qtextstream.cpp ../src/corelib/serialization/qtextstream.h + ../src/corelib/serialization/qxmlstream.cpp ../src/corelib/serialization/qxmlstream.h + ../src/corelib/serialization/qxmlutils.cpp ../src/corelib/serialization/qxmlutils_p.h + ../src/corelib/tools/qarraydata.cpp ../src/corelib/tools/qarraydata.h + ../src/corelib/tools/qarraydataops.h + ../src/corelib/tools/qarraydatapointer.h + ../src/corelib/tools/qbitarray.cpp ../src/corelib/tools/qbitarray.h + ../src/corelib/text/qbytearray.cpp ../src/corelib/text/qbytearray.h + ../src/corelib/text/qbytearraylist.cpp ../src/corelib/text/qbytearraylist.h # special case + ../src/corelib/text/qbytearraymatcher.cpp ../src/corelib/text/qbytearraymatcher.h + ../src/corelib/text/qchar.h + ../src/corelib/tools/qcryptographichash.cpp ../src/corelib/tools/qcryptographichash.h + ../src/corelib/time/qcalendar.cpp ../src/corelib/time/qcalendar.h # special case + ../src/corelib/time/qcalendarbackend_p.h ../src/corelib/time/qcalendarmath_p.h # special case + ../src/corelib/time/qgregoriancalendar.cpp ../src/corelib/time/qgregoriancalendar_p.h # special case + ../src/corelib/time/qromancalendar.cpp ../src/corelib/time/qromancalendar_p.h # special case + ../src/corelib/time/qdatetime.cpp ../src/corelib/time/qdatetime.h ../src/corelib/time/qdatetime_p.h # special case + ../src/corelib/tools/qhash.cpp ../src/corelib/tools/qhash.h + ../src/corelib/tools/qlist.cpp ../src/corelib/tools/qlist.h + ../src/corelib/text/qlocale.cpp ../src/corelib/text/qlocale.h + ../src/corelib/text/qlocale_tools.cpp ../src/corelib/text/qlocale_tools_p.h + ../src/corelib/tools/qmap.cpp ../src/corelib/tools/qmap.h + ../src/corelib/text/qregexp.cpp ../src/corelib/text/qregexp.h + ../src/corelib/tools/qringbuffer.cpp # special case + ../src/corelib/text/qstring.cpp ../src/corelib/text/qstring.h + ../src/corelib/text/qstringlist.cpp ../src/corelib/text/qstringlist.h + ../src/corelib/text/qstringmatcher.h + ../src/corelib/tools/qvector.h + ../src/corelib/tools/qversionnumber.cpp ../src/corelib/tools/qversionnumber.h + ../src/corelib/text/qvsnprintf.cpp + cachekeys.h + generators/mac/pbuilder_pbx.cpp generators/mac/pbuilder_pbx.h + generators/makefile.cpp generators/makefile.h + generators/makefiledeps.cpp generators/makefiledeps.h + generators/metamakefile.cpp generators/metamakefile.h + generators/projectgenerator.cpp generators/projectgenerator.h + generators/unix/unixmake.cpp generators/unix/unixmake.h + generators/unix/unixmake2.cpp + generators/win32/mingw_make.cpp generators/win32/mingw_make.h + generators/win32/msbuild_objectmodel.cpp generators/win32/msbuild_objectmodel.h + generators/win32/msvc_nmake.cpp generators/win32/msvc_nmake.h + generators/win32/msvc_objectmodel.cpp generators/win32/msvc_objectmodel.h + generators/win32/msvc_vcproj.cpp generators/win32/msvc_vcproj.h + generators/win32/msvc_vcxproj.cpp generators/win32/msvc_vcxproj.h + generators/win32/winmakefile.cpp generators/win32/winmakefile.h + generators/xmloutput.cpp generators/xmloutput.h + library/ioutils.cpp library/ioutils.h + library/proitems.cpp library/proitems.h + library/qmake_global.h + library/qmakebuiltins.cpp + library/qmakeevaluator.cpp library/qmakeevaluator.h library/qmakeevaluator_p.h + library/qmakeglobals.cpp library/qmakeglobals.h + library/qmakeparser.cpp library/qmakeparser.h + library/qmakevfs.cpp library/qmakevfs.h + main.cpp + meta.cpp meta.h + option.cpp option.h + project.cpp project.h + property.cpp property.h + DEFINES + PROEVALUATOR_FULL + QT_BOOTSTRAPPED + QT_BUILD_QMAKE + QT_NO_FOREACH + QT_VERSION_STR="${PROJECT_VERSION}" # special case + QT_VERSION_MAJOR=${PROJECT_VERSION_MAJOR} # special case + QT_VERSION_MINOR=${PROJECT_VERSION_MINOR} # special case + QT_VERSION_PATCH=${PROJECT_VERSION_PATCH} # special case + INCLUDE_DIRECTORIES + # . # special case remove + generators + generators/mac + generators/unix + generators/win32 + library + $<TARGET_PROPERTY:Qt::Core,INCLUDE_DIRECTORIES> # special case + "${PROJECT_BINARY_DIR}/src/corelib/global" # special case: for qconfig.cpp + PRECOMPILED_HEADER + "qmake_pch.h" +) + +#### Keys ignored in scope 1:.:.:qmake.pro:<TRUE>: +# _OPTION = "host_build" + +## Scopes: +##################################################################### + +qt_extend_target(qmake CONDITION WIN32 + SOURCES + ../src/corelib/global/qoperatingsystemversion_win.cpp + ../src/corelib/io/qfilesystemengine_win.cpp + ../src/corelib/io/qfilesystemiterator_win.cpp + ../src/corelib/io/qfsfileengine_win.cpp + ../src/corelib/io/qsettings_win.cpp + ../src/corelib/plugin/qsystemlibrary.cpp + ../src/corelib/text/qlocale_win.cpp # special case + library/registry.cpp # special case + DEFINES + UNICODE + _CRT_SECURE_NO_WARNINGS + _ENABLE_EXTENDED_ALIGNED_STORAGE + _SCL_SECURE_NO_WARNINGS + PUBLIC_LIBRARIES + advapi32 + kernel32 + netapi32 + ole32 +) + +qt_extend_target(qmake CONDITION UNIX + SOURCES + ../src/corelib/io/qfilesystemengine_unix.cpp + ../src/corelib/io/qfilesystemiterator_unix.cpp + ../src/corelib/io/qfsfileengine_unix.cpp + ../src/corelib/kernel/qcore_unix.cpp + ../src/corelib/text/qlocale_unix.cpp +) + +qt_extend_target(qmake CONDITION APPLE_OSX + SOURCES + ../src/corelib/kernel/qcore_foundation.mm # special case + ../src/corelib/kernel/qcore_mac.cpp # special case + ../src/corelib/global/qoperatingsystemversion_darwin.mm # special case + ../src/corelib/io/qsettings_mac.cpp # special case + PUBLIC_LIBRARIES + ${FWApplicationServices} + ${FWCoreServices} + ${FWFoundation} + COMPILE_OPTIONS + "-fconstant-cfstrings" +) + +# special case big +extend_target(qmake CONDITION WIN32 + SOURCES + ../src/corelib/io/qfilesystemengine_win.cpp + ../src/corelib/io/qfilesystemiterator_win.cpp + ../src/corelib/io/qfsfileengine_win.cpp + ../src/corelib/text/qlocale_win.cpp + ../src/corelib/io/qsettings_win.cpp + # ../src/corelib/global/qoperatingsystemversion.cpp special case: remove this + ../src/corelib/plugin/qsystemlibrary.cpp + library/registry.cpp + DEFINES + UNICODE _ENABLE_EXTENDED_ALIGNED_STORAGE _CRT_SECURE_NO_WARNINGS _SCL_SECURE_NO_WARNINGS + LIBRARIES + ole32 advapi32 kernel32 netapi32 +) + +qt_extend_target(qmake CONDITION WIN32 AND mingw + PUBLIC_LIBRARIES + uuid +) + +qt_extend_target(qmake CONDITION CLANG AND WIN32 + COMPILE_OPTIONS + "-fms-compatibility-version=19.00.23506" + "-Wno-microsoft-enum-value" +) + +# special case: +set_target_properties(qmake PROPERTIES + AUTOMOC OFF + AUTORCC OFF + AUTOUIC OFF +) + +qt_internal_add_link_flags_gc_sections(qmake PRIVATE) # special case + +qt_enable_msvc_cplusplus_define(qmake PUBLIC) # special case + diff --git a/qmake/Makefile.unix b/qmake/Makefile.unix index 325a8548cf..4024231b70 100644 --- a/qmake/Makefile.unix +++ b/qmake/Makefile.unix @@ -30,7 +30,7 @@ QOBJS = \ quuid.o \ qarraydata.o qbitarray.o qbytearray.o qbytearraylist.o qbytearraymatcher.o \ qcalendar.o qgregoriancalendar.o qromancalendar.o \ - qcryptographichash.o qdatetime.o qhash.o qlist.o \ + qcryptographichash.o qdatetime.o qhash.o \ qlocale.o qlocale_tools.o qmap.o qregexp.o qringbuffer.o \ qstringbuilder.o qstring.o qstringlist.o qversionnumber.o \ qvsnprintf.o qxmlstream.o qxmlutils.o \ @@ -127,7 +127,6 @@ DEPEND_SRC = \ $(SOURCE_PATH)/src/corelib/tools/qbitarray.cpp \ $(SOURCE_PATH)/src/corelib/tools/qcryptographichash.cpp \ $(SOURCE_PATH)/src/corelib/tools/qhash.cpp \ - $(SOURCE_PATH)/src/corelib/tools/qlist.cpp \ $(SOURCE_PATH)/src/corelib/tools/qmap.cpp \ $(SOURCE_PATH)/src/corelib/tools/qringbuffer.cpp \ $(SOURCE_PATH)/src/corelib/tools/qversionnumber.cpp \ @@ -374,9 +373,6 @@ qversionnumber.o: $(SOURCE_PATH)/src/corelib/tools/qversionnumber.cpp qbuffer.o: $(SOURCE_PATH)/src/corelib/io/qbuffer.cpp $(CXX) -c -o $@ $(CXXFLAGS) $< -qlist.o: $(SOURCE_PATH)/src/corelib/tools/qlist.cpp - $(CXX) -c -o $@ $(CXXFLAGS) $< - qfile.o: $(SOURCE_PATH)/src/corelib/io/qfile.cpp $(CXX) -c -o $@ $(CXXFLAGS) $< diff --git a/qmake/Makefile.win32 b/qmake/Makefile.win32 index 6c8d5ec922..20644595d2 100644 --- a/qmake/Makefile.win32 +++ b/qmake/Makefile.win32 @@ -28,7 +28,7 @@ CFLAGS_PCH = -Yuqmake_pch.h -FIqmake_pch.h -Fpqmake_pch.pch PCH_OBJECT = qmake_pch.obj CFLAGS_BARE = -c -Fo./ -Fdqmake.pdb \ - -W2 -nologo -O2 \ + -W2 -nologo -O2 -std:c++17 -Zc:__cplusplus \ $(CFLAGS_EXTRA) \ -I$(QMKSRC) -I$(QMKSRC)\library -I$(QMKSRC)\generators -I$(QMKSRC)\generators\unix -I$(QMKSRC)\generators\win32 -I$(QMKSRC)\generators\mac \ -I$(SOURCE_PATH)/src/3rdparty/tinycbor/src \ @@ -91,7 +91,6 @@ QTOBJS= \ qiodevice.obj \ qringbuffer.obj \ qdebug.obj \ - qlist.obj \ qlocale.obj \ qlocale_tools.obj \ qlocale_win.obj \ diff --git a/qmake/generators/makefiledeps.cpp b/qmake/generators/makefiledeps.cpp index d68539814e..0ff64c4fbc 100644 --- a/qmake/generators/makefiledeps.cpp +++ b/qmake/generators/makefiledeps.cpp @@ -60,19 +60,14 @@ QT_BEGIN_NAMESPACE inline bool qmake_endOfLine(const char &c) { return (c == '\r' || c == '\n'); } #endif -QMakeLocalFileName::QMakeLocalFileName(const QString &name) : is_null(name.isNull()) +QMakeLocalFileName::QMakeLocalFileName(const QString &name) + : real_name(name) { - if(!name.isEmpty()) { - if(name.at(0) == QLatin1Char('"') && name.at(name.length()-2) == QLatin1Char('"')) - real_name = name.mid(1, name.length()-2); - else - real_name = name; - } } const QString &QMakeLocalFileName::local() const { - if(!is_null && local_name.isNull()) + if (!isNull() && local_name.isNull()) local_name = Option::normalizePath(real_name); return local_name; } @@ -251,7 +246,7 @@ bool QMakeSourceFileInfo::mocable(const QString &file) return false; } -QMakeSourceFileInfo::QMakeSourceFileInfo(const QString &cf) +QMakeSourceFileInfo::QMakeSourceFileInfo() { //dep_mode dep_mode = Recursive; diff --git a/qmake/generators/makefiledeps.h b/qmake/generators/makefiledeps.h index 66b87bf470..b97ace42a6 100644 --- a/qmake/generators/makefiledeps.h +++ b/qmake/generators/makefiledeps.h @@ -41,14 +41,14 @@ struct SourceFile; struct SourceDependChildren; class SourceFiles; -class QMakeLocalFileName { - bool is_null; +class QMakeLocalFileName +{ QString real_name; mutable QString local_name; public: - QMakeLocalFileName() : is_null(true) {} + QMakeLocalFileName() = default; QMakeLocalFileName(const QString &); - bool isNull() const { return is_null; } + bool isNull() const { return real_name.isNull(); } inline const QString &real() const { return real_name; } const QString &local() const; @@ -86,7 +86,7 @@ protected: public: - QMakeSourceFileInfo(const QString &cachefile=""); + QMakeSourceFileInfo(); virtual ~QMakeSourceFileInfo(); QVector<QMakeLocalFileName> dependencyPaths() const { return depdirs; } diff --git a/qmake/library/proitems.h b/qmake/library/proitems.h index 4569d7c3ff..01370959c7 100644 --- a/qmake/library/proitems.h +++ b/qmake/library/proitems.h @@ -35,6 +35,7 @@ #include <qstring.h> #include <qvector.h> #include <qhash.h> +#include <qmap.h> QT_BEGIN_NAMESPACE @@ -316,7 +317,7 @@ Q_DECLARE_TYPEINFO(ProStringList, Q_MOVABLE_TYPE); inline ProStringList operator+(const ProStringList &one, const ProStringList &two) { ProStringList ret = one; ret += two; return ret; } -typedef QHash<ProKey, ProStringList> ProValueMap; +typedef QMap<ProKey, ProStringList> ProValueMap; // These token definitions affect both ProFileEvaluator and ProWriter enum ProToken { diff --git a/qmake/main.cpp b/qmake/main.cpp index 86f91031df..c0e6088d80 100644 --- a/qmake/main.cpp +++ b/qmake/main.cpp @@ -265,6 +265,8 @@ static bool copyFileTimes(QFile &targetFile, const QString &sourceFilePath, return false; } } +#else + Q_UNUSED(mustEnsureWritability); #endif if (!IoUtils::touchFile(targetFile.fileName(), sourceFilePath, errorString)) return false; diff --git a/qmake/property.cpp b/qmake/property.cpp index 432ff55664..31d6cdc9d6 100644 --- a/qmake/property.cpp +++ b/qmake/property.cpp @@ -54,7 +54,6 @@ static const struct { { "QT_INSTALL_BINS", QLibraryInfo::BinariesPath, false, false }, { "QT_INSTALL_TESTS", QLibraryInfo::TestsPath, false, false }, { "QT_INSTALL_PLUGINS", QLibraryInfo::PluginsPath, false, false }, - { "QT_INSTALL_IMPORTS", QLibraryInfo::ImportsPath, false, false }, { "QT_INSTALL_QML", QLibraryInfo::Qml2ImportsPath, false, false }, { "QT_INSTALL_TRANSLATIONS", QLibraryInfo::TranslationsPath, false, false }, { "QT_INSTALL_CONFIGURATION", QLibraryInfo::SettingsPath, false, false }, |