diff options
| author | Jake Petroules <jake.petroules@qt.io> | 2016-04-22 20:54:51 -0700 |
|---|---|---|
| committer | Jake Petroules <jake.petroules@qt.io> | 2016-09-18 21:22:22 +0000 |
| commit | 26b2ad5a181eab7ad04ba819004bcc619c24147b (patch) | |
| tree | fca9c0653fa3be840021e819f4c89d32fc70aef3 /tools | |
| parent | 4ed59b90a1d91e5fd25bc8d1ddab7e6afe03619e (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 'tools')
| -rw-r--r-- | tools/configure/Makefile.mingw | 2 | ||||
| -rw-r--r-- | tools/configure/Makefile.win32 | 4 | ||||
| -rw-r--r-- | tools/configure/configureapp.cpp | 4 |
3 files changed, 9 insertions, 1 deletions
diff --git a/tools/configure/Makefile.mingw b/tools/configure/Makefile.mingw index ed13c1a776..f20822f8ba 100644 --- a/tools/configure/Makefile.mingw +++ b/tools/configure/Makefile.mingw @@ -48,6 +48,8 @@ OBJECTS = \ qfsfileengine_win.o \ qfsfileengine_iterator.o \ qiodevice.o \ + qoperatingsystemversion.o \ + qoperatingsystemversion_win.o \ qringbuffer.o \ qdebug.o \ qtextstream.o \ diff --git a/tools/configure/Makefile.win32 b/tools/configure/Makefile.win32 index aae3d57ce3..55453ad0bc 100644 --- a/tools/configure/Makefile.win32 +++ b/tools/configure/Makefile.win32 @@ -37,6 +37,8 @@ OBJECTS = \ qtextcodec.obj \ qglobal.obj \ qnumeric.obj \ + qoperatingsystemversion.obj \ + qoperatingsystemversion_win.obj \ qbuffer.obj \ qdatastream.obj \ qdir.obj \ @@ -114,6 +116,8 @@ qutfcodec.obj: $(CORESRC)\codecs\qutfcodec.cpp $(PCH) qtextcodec.obj: $(CORESRC)\codecs\qtextcodec.cpp $(PCH) qglobal.obj: $(CORESRC)\global\qglobal.cpp $(PCH) qnumeric.obj: $(CORESRC)\global\qnumeric.cpp $(PCH) +qoperatingsystemversion.obj: $(CORESRC)\global\qoperatingsystemversion.cpp $(PCH) +qoperatingsystemversion_win.obj: $(CORESRC)\global\qoperatingsystemversion_win.cpp $(PCH) qbuffer.obj: $(CORESRC)\io\qbuffer.cpp $(PCH) qdatastream.obj: $(CORESRC)\io\qdatastream.cpp $(PCH) qdir.obj: $(CORESRC)\io\qdir.cpp $(PCH) diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp index bf2d7aa8a7..f678ae61ca 100644 --- a/tools/configure/configureapp.cpp +++ b/tools/configure/configureapp.cpp @@ -895,10 +895,12 @@ void Configure::buildQmake() << " qfilesystemiterator_win.o \\" << endl << " qfsfileengine_win.o \\" << endl << " qlocale_win.o \\" << endl + << " qoperatingsystemversion_win.o \\" << endl << " qsettings_win.o \\" << endl << " qsystemlibrary.o \\" << endl << " registry.o" << endl - << "QTSRCS=\"$(SOURCE_PATH)/src/corelib/io/qfilesystemengine_win.cpp\" \\" << endl + << "QTSRCS=\"$(SOURCE_PATH)/src/corelib/global/qoperatingsystemversion_win.cpp\" \\" << endl + << " \"$(SOURCE_PATH)/src/corelib/io/qfilesystemengine_win.cpp\" \\" << endl << " \"$(SOURCE_PATH)/src/corelib/io/qfilesystemiterator_win.cpp\" \\" << endl << " \"$(SOURCE_PATH)/src/corelib/io/qfsfileengine_win.cpp\" \\" << endl << " \"$(SOURCE_PATH)/src/corelib/io/qsettings_win.cpp\" \\" << endl |