From d0427759c67704fe0f1b04edadd4d30329af268c Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Fri, 25 May 2018 16:33:48 -0300 Subject: Add qbswap for a memory region The compiler was generating some vectorized code for qresource.cpp but it wasn't very efficient. So improve upon it and make use in other places where we read UTF-16BE strings. [ChangeLog][QtCore] Added an overload of q{To,From}{Big,Little}Endian that operates on a memory region. Change-Id: I6a540578e810472bb455fffd1531fa2f1d724dfc Reviewed-by: Allan Sandfeld Jensen --- qmake/Makefile.unix | 6 +++++- qmake/Makefile.win32 | 1 + 2 files changed, 6 insertions(+), 1 deletion(-) (limited to 'qmake') diff --git a/qmake/Makefile.unix b/qmake/Makefile.unix index 426387f0c2..29461be5c5 100644 --- a/qmake/Makefile.unix +++ b/qmake/Makefile.unix @@ -18,7 +18,7 @@ OBJS = \ #qt code (please keep in order matching DEPEND_SRC) QOBJS = \ qtextcodec.o qutfcodec.o \ - qglobal.o qlogging.o qmalloc.o qnumeric.o qoperatingsystemversion.o qrandom.o \ + qendian.o qglobal.o qlogging.o qmalloc.o qnumeric.o qoperatingsystemversion.o qrandom.o \ qabstractfileengine.o qbuffer.o qdatastream.o qdebug.o \ qdir.o qdiriterator.o \ qfile.o qfiledevice.o qfileinfo.o qfilesystemengine.o \ @@ -68,6 +68,7 @@ DEPEND_SRC = \ $(QMKGENSRC)/xmloutput.cpp \ $(SOURCE_PATH)/src/corelib/codecs/qtextcodec.cpp \ $(SOURCE_PATH)/src/corelib/codecs/qutfcodec.cpp \ + $(SOURCE_PATH)/src/corelib/global/qendian.cpp \ $(SOURCE_PATH)/src/corelib/global/qglobal.cpp \ $(SOURCE_PATH)/src/corelib/global/qlibraryinfo.cpp \ $(SOURCE_PATH)/src/corelib/global/qlogging.cpp \ @@ -295,6 +296,9 @@ qdebug.o: $(SOURCE_PATH)/src/corelib/io/qdebug.cpp qmalloc.o: $(SOURCE_PATH)/src/corelib/global/qmalloc.cpp $(CXX) -c -o $@ $(CXXFLAGS) $< +qendian.o: $(SOURCE_PATH)/src/corelib/global/qendian.cpp + $(CXX) -c -o $@ $(CXXFLAGS) $< + qglobal.o: $(SOURCE_PATH)/src/corelib/global/qglobal.cpp $(CXX) -c -o $@ $(CXXFLAGS) $< diff --git a/qmake/Makefile.win32 b/qmake/Makefile.win32 index 3abcc1f21c..851185f3ff 100644 --- a/qmake/Makefile.win32 +++ b/qmake/Makefile.win32 @@ -83,6 +83,7 @@ QTOBJS= \ qfsfileengine_win.obj \ qsystemlibrary.obj \ qfileinfo.obj \ + qendian.obj \ qglobal.obj \ qhash.obj \ qiodevice.obj \ -- cgit v1.2.3