summaryrefslogtreecommitdiffstats
path: root/configure
diff options
context:
space:
mode:
authorJake Petroules <jake.petroules@qt.io>2016-04-22 20:54:51 -0700
committerJake Petroules <jake.petroules@qt.io>2016-09-18 21:22:22 +0000
commit26b2ad5a181eab7ad04ba819004bcc619c24147b (patch)
treefca9c0653fa3be840021e819f4c89d32fc70aef3 /configure
parent4ed59b90a1d91e5fd25bc8d1ddab7e6afe03619e (diff)
Long live QOperatingSystemVersion!
This class provides a "type safe" way to compare and access operating system version numbers. [ChangeLog][Deprecation Notice] QSysInfo::windowsVersion() and QSysInfo::macVersion() are deprecated and are replaced by the newly introduced QOperatingSystemVersion. Change-Id: I52b532de2e068ccf90faaa8342eee90c0a4145de Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure6
1 files changed, 4 insertions, 2 deletions
diff --git a/configure b/configure
index 789ba4cc74..3bd49a76f0 100755
--- a/configure
+++ b/configure
@@ -1696,9 +1696,11 @@ if true; then ###[ '!' -f "$outpath/bin/qmake" ];
qfsfileengine_win.o \
qlocale_win.o \
qsettings_win.o \
+ qoperatingsystemversion_win.o \
qsystemlibrary.o \
registry.o"
EXTRA_SRCS="\"\$(SOURCE_PATH)/src/corelib/corelib/io/qfilesystemengine_win.cpp\" \
+ \"\$(SOURCE_PATH)/src/corelib/global/qoperatingsystemversion_win.cpp\" \
\"\$(SOURCE_PATH)/src/corelib/io/qfilesystemiterator_win.cpp\" \
\"\$(SOURCE_PATH)/src/corelib/io/qfsfileengine_win.cpp\" \
\"\$(SOURCE_PATH)/src/corelib/io/qsettings_win.cpp\" \
@@ -1731,12 +1733,12 @@ if true; then ###[ '!' -f "$outpath/bin/qmake" ];
EXTRA_OBJS="$EXTRA_OBJS \
qsettings_mac.o \
qcore_mac.o \
- qcore_mac_objc.o \
+ qoperatingsystemversion_darwin.o \
qcore_foundation.o"
EXTRA_SRCS="$EXTRA_SRCS \
\"\$(SOURCE_PATH)/src/corelib/io/qsettings_mac.cpp\" \
\"\$(SOURCE_PATH)/src/corelib/kernel/qcore_mac.cpp\" \
- \"\$(SOURCE_PATH)/src/corelib/kernel/qcore_mac_objc.mm\" \
+ \"\$(SOURCE_PATH)/src/corelib/global/qoperatingsystemversion_darwin.mm\" \
\"\$(SOURCE_PATH)/src/corelib/kernel/qcore_foundation.mm\""
fi