summaryrefslogtreecommitdiffstats
path: root/mkspecs/features/resources.prf
diff options
context:
space:
mode:
authorKurt Korbatits <kurt.korbatits@nokia.com>2010-05-21 03:34:21 (GMT)
committerKurt Korbatits <kurt.korbatits@nokia.com>2010-05-21 03:34:21 (GMT)
commit04ba5e501b96f77b56d6cf49fe8fb059a256e1e7 (patch)
treee57be024b99486986172757e2761d0b21d90ec02 /mkspecs/features/resources.prf
parentc5f58f9a2ea2051289636a3491034136611d9922 (diff)
parent2e7c9082fd472911e61e265eb184f408b8ac62e4 (diff)
downloadQt-04ba5e501b96f77b56d6cf49fe8fb059a256e1e7.zip
Qt-04ba5e501b96f77b56d6cf49fe8fb059a256e1e7.tar.gz
Qt-04ba5e501b96f77b56d6cf49fe8fb059a256e1e7.tar.bz2
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.6
Diffstat (limited to 'mkspecs/features/resources.prf')
-rw-r--r--mkspecs/features/resources.prf1
1 files changed, 1 insertions, 0 deletions
diff --git a/mkspecs/features/resources.prf b/mkspecs/features/resources.prf
index 5d00a4d..a305a4f 100644
--- a/mkspecs/features/resources.prf
+++ b/mkspecs/features/resources.prf
@@ -1,3 +1,4 @@
+defined(qtPrepareTool)|load(qt_functions) ### Qt 5: see default_pre.prf
qtPrepareTool(QMAKE_RCC, rcc)
isEmpty(RCC_DIR):RCC_DIR = .