AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Sync .pr[oi] with the Makefiles so qmake builds again

Browse Source 
Change-Id: Ief766ac61f98859b84fc61b03b8c1292d3c06525
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
This commit is contained in:
Marius Storm-Olsen 2012-07-26 12:47:33 -05:00 committed by Qt by Nokia
parent 46e2c94417
commit addc9984fb
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
qmake/qmake.pri
View File

@ -128,12 +128,14 @@ bootstrap { #Qt code
SOURCES += qfilesystemengine_unix.cpp qfilesystemiterator_unix.cpp qfsfileengine_unix.cpp
mac {
SOURCES += qfilesystemengine_mac.cpp
SOURCES += qcore_mac.cpp qsettings_mac.cpp
SOURCES += qcore_mac.cpp qsettings_mac.cpp qlocale_mac.mm
LIBS += -framework ApplicationServices
} else {
SOURCES += qlocale_unix.cpp
}
} else:win32 {
SOURCES += qfilesystemengine_win.cpp qfsfileengine_win.cpp qfilesystemiterator_win.cpp qsettings_win.cpp \
qsystemlibrary.cpp
qsystemlibrary.cpp qlocale_win.cpp registry.cpp
win32-msvc*:LIBS += ole32.lib advapi32.lib
win32-g++*:LIBS += -lole32 -luuid -ladvapi32 -lkernel32
}
@ -144,7 +146,7 @@ bootstrap { #Qt code
}
DEFINES *= QT_NO_QOBJECT
} else {
CONFIG += qt
CONFIG += qt
QT = core
}
*-g++:profiling {

5
qmake/qmake.pro
View File

@ -19,7 +19,9 @@ VPATH += $$QT_SOURCE_TREE/src/corelib/global \
$$QT_SOURCE_TREE/src/corelib/codecs \
$$QT_SOURCE_TREE/src/corelib/plugin \
$$QT_SOURCE_TREE/src/corelib/xml \
$$QT_SOURCE_TREE/src/corelib/io
$$QT_SOURCE_TREE/src/corelib/io \
$$QT_SOURCE_TREE/tools/shared/windows
INCLUDEPATH += . \
generators \
generators/unix \
@ -30,6 +32,7 @@ INCLUDEPATH += . \
$$QT_SOURCE_TREE/include/QtCore \
$$QT_SOURCE_TREE/include/QtCore/$$QT_VERSION \
$$QT_SOURCE_TREE/include/QtCore/$$QT_VERSION/QtCore \
$$QT_SOURCE_TREE/tools/shared \
$$QT_SOURCE_TREE/qmake
include(qmake.pri)