diff options
author | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2016-11-18 18:11:41 +0100 |
---|---|---|
committer | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2016-11-23 09:38:09 +0000 |
commit | 4ce0beee1b69a8695fc24a244a8a3053711906ac (patch) | |
tree | 9e7bce164357b07744a14a15a0f00f2783542664 /qmake | |
parent | 798b09ffe61b6b7f490b7d530f0e89501bbc89fd (diff) |
configure: delete some dead code and outdated comments
Change-Id: I764a9b383176e1fe9573790547ce0e12d1f88261
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'qmake')
-rw-r--r-- | qmake/Makefile.unix | 2 | ||||
-rw-r--r-- | qmake/Makefile.win32 | 14 | ||||
-rw-r--r-- | qmake/qmake.pro | 1 |
3 files changed, 2 insertions, 15 deletions
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) |