Merge branch 'master' of ssh://codereview.qt-project.org/qt/qtbase into newdocs

Change-Id: I7e6cee190a341901dfbf8effb54ebccb91bf7a17

3 files changed, 2 insertions, 2 deletions

diff --git a/src/tools/bootstrap/bootstrap.pri b/src/tools/bootstrap/bootstrap.pri
index 7d3b9969fe..2b64b291b9 100644
--- a/src/tools/bootstrap/bootstrap.pri
+++ b/src/tools/bootstrap/bootstrap.pri
@@ -7,7 +7,6 @@ CONFIG += exceptions_off
 DEFINES	       += \
         QT_BOOTSTRAPPED \
         QT_LITE_UNICODE \
-        QT_TEXTCODEC \
         QT_NO_CAST_FROM_ASCII \
         QT_NO_CAST_TO_ASCII \
         QT_NO_CODECS \
diff --git a/src/tools/bootstrap/bootstrap.pro b/src/tools/bootstrap/bootstrap.pro
index 19c0005bcc..07c4a10573 100644
--- a/src/tools/bootstrap/bootstrap.pro
+++ b/src/tools/bootstrap/bootstrap.pro
@@ -114,6 +114,7 @@ macx: {
               ../../corelib/kernel/qcore_mac.cpp
    LIBS += -framework CoreServices
 }
+*-g++*: QMAKE_CXXFLAGS += -ffunction-sections
 
 if(contains(QT_CONFIG, zlib)|cross_compile):include(../../3rdparty/zlib.pri)
 else:include(../../3rdparty/zlib_dependency.pri)
diff --git a/src/tools/rcc/rcc.cpp b/src/tools/rcc/rcc.cpp
index 10d7c093fc..969b644d84 100644
--- a/src/tools/rcc/rcc.cpp
+++ b/src/tools/rcc/rcc.cpp
@@ -535,7 +535,7 @@ bool RCCResourceLibrary::interpretResourceFile(QIODevice *inputDevice,
                                                     child,
                                                     language,
                                                     country,
-                                                    RCCFileInfo::NoFlags,
+                                                    child.isDir() ? RCCFileInfo::Directory : RCCFileInfo::NoFlags,
                                                     compressLevel,
                                                     compressThreshold)
                                         );