Merge remote-tracking branch 'origin/4.8' into 4.9

Conflicts:
	qtcreator.pri

Change-Id: I84dc8b9c7a029f2f40c4fa3ef78eef338247a6c0

dist/changes-4.8.2.md

@@ -0,0 +1,72 @@
+Qt Creator version 4.8.2 contains bug fixes.
+
+The most important changes are listed in this document. For a complete
+list of changes, see the Git log for the Qt Creator sources that
+you can check out from the public Git repository. For example:
+
+    git clone git://code.qt.io/qt-creator/qt-creator.git
+    git log --cherry-pick --pretty=oneline origin/v4.8.1..v4.8.2
+
+Editing
+
+* Fixed highlighting of search results of regular expression search
+  (QTCREATORBUG-21887)
+
+Autotools Projects
+
+* Fixed that includes, defines and flags of `SUBDIRS` were ignored
+  (QTCREATORBUG-21618)
+
+C++ Support
+
+* Fixed crash when expanding macros (QTCREATORBUG-21642)
+
+QML Support
+
+* Fixed auto-insertion of single quotes
+
+Debugging
+
+* GDB
+    * Fixed detaching from process (QTCREATORBUG-21908)
+* LLDB
+    * Fixed stopping at some breakpoints with newer LLDB (QTCREATORBUG-21615)
+    * Fixed `Attach to Process` and `Run in Terminal` with newer LLDB
+* CDB
+    * Fixed display of `QDateTime` (QTCREATORBUG-21864)
+
+Qt Quick Designer
+
+* Added support for more JavaScript functions in `.ui.qml` files
+
+Test Integration
+
+* Fixed handling of empty tests
+
+Platform Specific
+
+macOS
+
+* Fixed crash when file change dialog is triggered while another modal dialog
+  is open
+* Fixed running of user applications that need access to camera, microphone or
+  other restricted services on macOS 10.14 (QTCREATORBUG-21887)
+
+Android
+
+* Fixed upload of GDB server on some devices (QTCREATORBUG-21317)
+
+Credits for these changes go to:  
+André Pönitz  
+Christian Kandeler  
+Christian Stenger  
+David Schulz  
+Eike Ziller  
+Ivan Donchevskii  
+Leena Miettinen  
+Liang Qi  
+Oliver Wolff  
+Raoul Hecky  
+Robert Löhning  
+Thomas Hartmann  
+Vikas Pachdha  

qbs/modules/qtc/qtc.qbs

@@ -17,7 +17,7 @@ Module {
     property string qtcreator_compat_version: ide_compat_version_major + '.'
             + ide_compat_version_minor + '.' + ide_compat_version_release
 
-    property string qtcreator_copyright_year: '2018'
+    property string qtcreator_copyright_year: '2019'
     property string qtcreator_copyright_string: "(C) " + qtcreator_copyright_year + " The Qt Company Ltd"
 
     property string ide_display_name: 'Qt Creator'

qtcreator.pri

@@ -5,7 +5,7 @@ QTCREATOR_VERSION = 4.8.82
 QTCREATOR_COMPAT_VERSION = 4.8.82
 VERSION = $$QTCREATOR_VERSION
 QTCREATOR_DISPLAY_VERSION = 4.9.0-beta1
-QTCREATOR_COPYRIGHT_YEAR = 2018
+QTCREATOR_COPYRIGHT_YEAR = 2019
 BINARY_ARTIFACTS_BRANCH = master
 
 isEmpty(IDE_DISPLAY_NAME):           IDE_DISPLAY_NAME = Qt Creator

src/app/app-Info.plist

@@ -274,3 +274,5 @@
 	<string>A user application wants to access the photo library.</string>
 	<key>NSRemindersUsageDescription</key>
 	<string>A user application wants to access the reminders.</string>
+</dict>
+</plist>

src/plugins/autotoolsprojectmanager/makefileparser.cpp

@@ -291,12 +291,27 @@ void MakefileParser::parseSubDirs()
         foreach (const QString& source, parser.sources())
             m_sources.append(subDir + slash + source);
 
-        // Duplicates might be possible in combination with several
-        // "..._SUBDIRS" targets
-        m_makefiles.removeDuplicates();
-        m_sources.removeDuplicates();
+        // Append the include paths of the sub directory
+        m_includePaths.append(parser.includePaths());
+
+        // Append the flags of the sub directory
+        m_cflags.append(parser.cflags());
+        m_cxxflags.append(parser.cxxflags());
+
+        // Append the macros of the sub directory
+        foreach (const auto& m, parser.macros())
+        {
+            if (!m_macros.contains(m))
+                m_macros.append(m);
+        }
+
     }
 
+    // Duplicates might be possible in combination with several
+    // "..._SUBDIRS" targets
+    m_makefiles.removeDuplicates();
+    m_sources.removeDuplicates();
+
     if (subDirs.isEmpty())
         m_success = false;
 }