diff options
| author | David Boddie <david.boddie@nokia.com> | 2010-09-14 12:36:58 (GMT) |
|---|---|---|
| committer | David Boddie <david.boddie@nokia.com> | 2010-09-14 12:36:58 (GMT) |
| commit | 7769e7bf79f0c17a01874fa0b3f1b227c1e41e93 (patch) | |
| tree | e69de39b2e33323b8213d0d7e7469bd33d9fb60e /qmake/qmake.pri | |
| parent | 6cd8a6001fe87107d32524c6115d37b620d3e108 (diff) | |
| parent | 8399cce50eb11db885e67a52055505951309cae8 (diff) | |
| download | Qt-7769e7bf79f0c17a01874fa0b3f1b227c1e41e93.zip Qt-7769e7bf79f0c17a01874fa0b3f1b227c1e41e93.tar.gz Qt-7769e7bf79f0c17a01874fa0b3f1b227c1e41e93.tar.bz2 | |
Merge branch '4.7' of ../qt-doc-team into 4.7
Diffstat (limited to 'qmake/qmake.pri')
| -rw-r--r-- | qmake/qmake.pri | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/qmake/qmake.pri b/qmake/qmake.pri index a7e0ab1..36c5d36 100644 --- a/qmake/qmake.pri +++ b/qmake/qmake.pri @@ -132,7 +132,8 @@ bootstrap { #Qt code LIBS += -framework ApplicationServices } } else:win32 { - SOURCES += qfsfileengine_win.cpp qfsfileengine_iterator_win.cpp qsettings_win.cpp + SOURCES += qfsfileengine_win.cpp qfsfileengine_iterator_win.cpp qsettings_win.cpp \ + qsystemlibrary.cpp win32-msvc*:LIBS += ole32.lib advapi32.lib win32-g++*:LIBS += -lole32 -luuid } |