diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2017-07-09 13:58:26 -0700 |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@intel.com> | 2017-07-25 01:01:02 +0000 |
| commit | 1c6d5b0696f324495e95a12f7718ae7593c9b58a (patch) | |
| tree | 8572f9ca449bfcfa762ff3f6cb293290cc7d8e02 /qmake | |
| parent | 325b46ce62815a82090436ccf2269fd3a70e3374 (diff) | |
QFileSystemEngine: Remove the remainder of Windows XP functions
The attempt at loading these functions at runtime with WinRT always
failed, so stop trying.
Change-Id: I658f552684924f8aa2cafffd14cfc5179ac08498
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'qmake')
| -rw-r--r-- | qmake/Makefile.unix.win32 | 2 | ||||
| -rw-r--r-- | qmake/Makefile.win32 | 2 | ||||
| -rw-r--r-- | qmake/qmake.pri | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/qmake/Makefile.unix.win32 b/qmake/Makefile.unix.win32 index c747eedcd0..bfcad35357 100644 --- a/qmake/Makefile.unix.win32 +++ b/qmake/Makefile.unix.win32 @@ -1,6 +1,6 @@ EXEEXT = .exe EXTRA_CXXFLAGS = -DUNICODE -EXTRA_LFLAGS = -static -s -lole32 -luuid -ladvapi32 -lkernel32 +EXTRA_LFLAGS = -static -s -lole32 -luuid -ladvapi32 -lkernel32 -lnetapi32 QTOBJS = \ qfilesystemengine_win.o \ qfilesystemiterator_win.o \ diff --git a/qmake/Makefile.win32 b/qmake/Makefile.win32 index 385493b582..28bf96939b 100644 --- a/qmake/Makefile.win32 +++ b/qmake/Makefile.win32 @@ -46,7 +46,7 @@ CXXFLAGS_BARE = $(CFLAGS_BARE) CXXFLAGS = $(CFLAGS) LFLAGS = -LIBS = ole32.lib advapi32.lib shell32.lib +LIBS = ole32.lib advapi32.lib shell32.lib netapi32.lib ADDCLEAN = qmake.pdb qmake.ilk #qmake code diff --git a/qmake/qmake.pri b/qmake/qmake.pri index 77c190bb9a..f6f6a47e95 100644 --- a/qmake/qmake.pri +++ b/qmake/qmake.pri @@ -142,8 +142,8 @@ bootstrap { #Qt code } else:win32 { SOURCES += qfilesystemengine_win.cpp qfsfileengine_win.cpp qfilesystemiterator_win.cpp qsettings_win.cpp \ qsystemlibrary.cpp qlocale_win.cpp registry.cpp - win32-msvc*:LIBS += ole32.lib advapi32.lib - mingw:LIBS += -lole32 -luuid -ladvapi32 -lkernel32 + win32-msvc*:LIBS += ole32.lib advapi32.lib netapi32.lib + mingw:LIBS += -lole32 -luuid -ladvapi32 -lkernel32 -lnetapi32 } qnx { |