Merge "Merge remote-tracking branch 'origin/5.15' into dev"

4 files changed, 3 insertions, 22 deletions

diff --git a/qmake/Makefile.unix b/qmake/Makefile.unix
index 4024231b70..32c6d1dae6 100644
--- a/qmake/Makefile.unix
+++ b/qmake/Makefile.unix
@@ -37,7 +37,6 @@ QOBJS = \
 	$(QTOBJS) $(QTOBJS2)
 # QTOBJS and QTOBJS2 are populated by Makefile.unix.* as for QTSRC (see below).
 # Note: qlibraryinfo.o omitted deliberately - see below.
-# Note: qcore_mac_objc.o is in SOURCES (see qmake.pri) but not QOBJS.
 
 #all sources, used for the depend target (please keep alphabetic in each block)
 DEPEND_SRC = \
@@ -92,7 +91,6 @@ DEPEND_SRC = \
 	   $(SOURCE_PATH)/src/corelib/io/qiodevice.cpp \
 	   $(SOURCE_PATH)/src/corelib/io/qsettings.cpp \
 	   $(SOURCE_PATH)/src/corelib/io/qtemporaryfile.cpp \
-	   $(SOURCE_PATH)/src/corelib/kernel/qcore_mac_objc.mm \
 	   $(SOURCE_PATH)/src/corelib/kernel/qmetatype.cpp \
 	   $(SOURCE_PATH)/src/corelib/kernel/qsystemerror.cpp \
 	   $(SOURCE_PATH)/src/corelib/kernel/qvariant.cpp \
@@ -325,7 +323,7 @@ qbytearraymatcher.o: $(SOURCE_PATH)/src/corelib/text/qbytearraymatcher.cpp
 qmetatype.o: $(SOURCE_PATH)/src/corelib/kernel/qmetatype.cpp
 	$(CXX) -c -o $@ $(CXXFLAGS) $<
 
-qcore_mac.o: $(SOURCE_PATH)/src/corelib/kernel/qcore_mac.cpp
+qcore_mac.o: $(SOURCE_PATH)/src/corelib/kernel/qcore_mac.mm
 	$(CXX) -c -o $@ $(CXXFLAGS) $<
 
 qcore_unix.o: $(SOURCE_PATH)/src/corelib/kernel/qcore_unix.cpp
@@ -340,9 +338,6 @@ qoperatingsystemversion_win.o: $(SOURCE_PATH)/src/corelib/global/qoperatingsyste
 qoperatingsystemversion_darwin.o: $(SOURCE_PATH)/src/corelib/global/qoperatingsystemversion_darwin.mm
 	$(CXX) -c -o $@ $(CXXFLAGS) $<
 
-qcore_mac_objc.o: $(SOURCE_PATH)/src/corelib/kernel/qcore_mac_objc.mm
-	$(CXX) -c -o $@ $(CXXFLAGS) $<
-
 qcore_foundation.o: $(SOURCE_PATH)/src/corelib/kernel/qcore_foundation.mm
 	$(CXX) -c -o $@ $(CXXFLAGS) $<
 
diff --git a/qmake/Makefile.unix.macos b/qmake/Makefile.unix.macos
index 2708d2aab5..8f84cd88f2 100644
--- a/qmake/Makefile.unix.macos
+++ b/qmake/Makefile.unix.macos
@@ -12,6 +12,6 @@ QTOBJS2 = \
     qcore_foundation.o
 QTSRCS2 = \
     $(SOURCE_PATH)/src/corelib/io/qsettings_mac.cpp \
-    $(SOURCE_PATH)/src/corelib/kernel/qcore_mac.cpp \
+    $(SOURCE_PATH)/src/corelib/kernel/qcore_mac.mm \
     $(SOURCE_PATH)/src/corelib/global/qoperatingsystemversion_darwin.mm \
     $(SOURCE_PATH)/src/corelib/kernel/qcore_foundation.mm
diff --git a/qmake/doc/src/qmake-manual.qdoc b/qmake/doc/src/qmake-manual.qdoc
index 351009bd1c..f1e03eb407 100644
--- a/qmake/doc/src/qmake-manual.qdoc
+++ b/qmake/doc/src/qmake-manual.qdoc
@@ -84,7 +84,6 @@
 /*!
     \page qmake-overview.html
     \title Overview
-    \contentspage {qmake Manual}{Contents}
     \previouspage qmake Manual
     \nextpage Getting Started
 
@@ -158,7 +157,6 @@
 /*!
     \page qmake-project-files.html
     \title Creating Project Files
-    \contentspage {qmake Manual}{Contents}
     \previouspage Getting Started
     \nextpage Building Common Project Types
 
@@ -477,7 +475,6 @@
 /*!
     \page qmake-running.html
     \title Running qmake
-    \contentspage {qmake Manual}{Contents}
     \previouspage Building Common Project Types
     \nextpage Platform Notes
 
@@ -647,7 +644,6 @@
 /*!
     \page qmake-platform-notes.html
     \title Platform Notes
-    \contentspage {qmake Manual}{Contents}
     \previouspage Running qmake
     \nextpage qmake Language
 
@@ -863,7 +859,6 @@
 /*!
     \page qmake-reference.html
     \title Reference
-    \contentspage {qmake Manual}{Contents}
     \previouspage Configuring qmake
     \nextpage Variables
 
@@ -894,7 +889,6 @@
 /*!
     \page qmake-variable-reference.html
     \title Variables
-    \contentspage {qmake Manual}{Contents}
     \previouspage Reference
     \nextpage Replace Functions
     \keyword qmake Variable Reference
@@ -3189,7 +3183,6 @@
 /*!
     \page qmake-function-reference.html
     \title Replace Functions
-    \contentspage {qmake Manual}{Contents}
     \previouspage Variables
     \nextpage Test Functions
     \keyword qmake Function Reference - Replace Functions
@@ -3723,7 +3716,6 @@
 /*!
     \page qmake-test-function-reference.html
     \title Test Functions
-    \contentspage {qmake Manual}{Contents}
     \previouspage Replace Functions
     \keyword qmake Function Reference - Test Functions
 
@@ -4145,7 +4137,6 @@
 
 /*!
     \page qmake-environment-reference.html
-    \contentspage {qmake Manual}{Contents}
     \previouspage Using Precompiled Headers
     \nextpage Reference
 
@@ -4297,7 +4288,6 @@
 /*!
     \page qmake-language.html
     \title qmake Language
-    \contentspage {qmake Manual}{Contents}
     \previouspage Platform Notes
     \nextpage Advanced Usage
 
@@ -4624,7 +4614,6 @@
 /*!
     \page qmake-advanced-usage.html
     \title Advanced Usage
-    \contentspage {qmake Manual}{Contents}
     \previouspage qmake Language
     \nextpage Using Precompiled Headers
 
@@ -4973,7 +4962,6 @@
 /*!
     \page qmake-precompiledheaders.html
     \title Using Precompiled Headers
-    \contentspage {qmake Manual}{Contents}
     \previouspage Advanced Usage
     \nextpage Configuring qmake
 
@@ -5191,7 +5179,6 @@
     \keyword qmake-getting-started
     \page qmake-tutorial.html
     \title Getting Started
-    \contentspage {qmake Manual}{Contents}
     \previouspage Overview
     \nextpage Creating Project Files
 
@@ -5360,7 +5347,6 @@
 /*!
     \page qmake-common-projects.html
     \title Building Common Project Types
-    \contentspage {qmake Manual}{Contents}
     \previouspage Creating Project Files
     \nextpage Running qmake
 
diff --git a/qmake/qmake.pro b/qmake/qmake.pro
index 745ee9b6af..53e0811098 100644
--- a/qmake/qmake.pro
+++ b/qmake/qmake.pro
@@ -231,7 +231,7 @@ unix {
     macos {
         SOURCES += \
             qcore_foundation.mm \
-            qcore_mac.cpp \
+            qcore_mac.mm \
             qoperatingsystemversion_darwin.mm \
             qsettings_mac.cpp
         LIBS += \