summaryrefslogtreecommitdiffstats
path: root/qmake/qmake.pri
diff options
context:
space:
mode:
authorJørgen Lind <jorgen.lind@nokia.com>2011-01-04 14:17:44 (GMT)
committerJørgen Lind <jorgen.lind@nokia.com>2011-01-04 14:17:44 (GMT)
commitfc013b7be66a6d4fc13af8bd38b7e679ed3998af (patch)
treecc068fa05bbc357bce89f8c6dfe37d6308704a1e /qmake/qmake.pri
parentbe41c140594ccea16ce17ccca7251d614cc75e1e (diff)
parent4d53a691aaac9789ddd4f9d4e968d28ace2181ca (diff)
downloadQt-fc013b7be66a6d4fc13af8bd38b7e679ed3998af.zip
Qt-fc013b7be66a6d4fc13af8bd38b7e679ed3998af.tar.gz
Qt-fc013b7be66a6d4fc13af8bd38b7e679ed3998af.tar.bz2
Merge branch 'master' into lighthouse-master
Diffstat (limited to 'qmake/qmake.pri')
-rw-r--r--qmake/qmake.pri10
1 files changed, 8 insertions, 2 deletions
diff --git a/qmake/qmake.pri b/qmake/qmake.pri
index 8f46a2e..bc7ddb8 100644
--- a/qmake/qmake.pri
+++ b/qmake/qmake.pri
@@ -57,6 +57,8 @@ bootstrap { #Qt code
qfile.cpp \
qabstractfileengine.cpp \
qfileinfo.cpp \
+ qfilesystementry.cpp \
+ qfilesystemengine.cpp \
qfsfileengine.cpp \
qfsfileengine_iterator.cpp \
qglobal.cpp \
@@ -80,6 +82,7 @@ bootstrap { #Qt code
quuid.cpp \
qsettings.cpp \
qlibraryinfo.cpp \
+ qsystemerror.cpp \
qvariant.cpp \
qvector.cpp \
qvsnprintf.cpp \
@@ -96,6 +99,7 @@ bootstrap { #Qt code
qdatetime.h \
qdatetime_p.h \
qdir.h \
+ qdir_p.h \
qdiriterator.h \
qfile.h \
qabstractfileengine.h \
@@ -116,6 +120,7 @@ bootstrap { #Qt code
qstring.h \
qstringlist.h \
qstringmatcher.h \
+ qsystemerror_p.h \
qtemporaryfile.h \
qtextstream.h \
qurl.h \
@@ -125,14 +130,15 @@ bootstrap { #Qt code
qxmlutils.h
unix {
- SOURCES += qfsfileengine_unix.cpp qfsfileengine_iterator_unix.cpp
+ SOURCES += qfilesystemengine_unix.cpp qfilesystemiterator_unix.cpp qfsfileengine_unix.cpp
mac {
+ SOURCES += qfilesystemengine_mac.cpp
SOURCES += qcore_mac.cpp qsettings_mac.cpp
QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.4 #enables weak linking for 10.4 (exported)
LIBS += -framework ApplicationServices
}
} else:win32 {
- SOURCES += qfsfileengine_win.cpp qfsfileengine_iterator_win.cpp qsettings_win.cpp \
+ SOURCES += qfilesystemengine_win.cpp qfsfileengine_win.cpp qfilesystemiterator_win.cpp qsettings_win.cpp \
qsystemlibrary.cpp
win32-msvc*:LIBS += ole32.lib advapi32.lib
win32-g++*:LIBS += -lole32 -luuid