Move QElapsedTimer to src/corelib/kernel
It's really a kernel functionality, as it implements really low-level functionality and it's used by the event dispatcher. It was in tools/ only because QTime is. QDeadlineTimer is also coming to kernel/. Change-Id: Ifea6e497f11a461db432ffff14491c6d9b839eb0 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> Reviewed-by: Lars Knoll <lars.knoll@qt.io>
This commit is contained in:
parent
6662919ecd
commit
169f1beaf5
@ -4,6 +4,7 @@ HEADERS += \
|
||||
kernel/qabstracteventdispatcher.h \
|
||||
kernel/qabstractnativeeventfilter.h \
|
||||
kernel/qbasictimer.h \
|
||||
kernel/qelapsedtimer.h \
|
||||
kernel/qeventloop.h\
|
||||
kernel/qpointer.h \
|
||||
kernel/qcorecmdlineargs_p.h \
|
||||
@ -45,6 +46,7 @@ SOURCES += \
|
||||
kernel/qabstracteventdispatcher.cpp \
|
||||
kernel/qabstractnativeeventfilter.cpp \
|
||||
kernel/qbasictimer.cpp \
|
||||
kernel/qelapsedtimer.cpp \
|
||||
kernel/qeventloop.cpp \
|
||||
kernel/qcoreapplication.cpp \
|
||||
kernel/qcoreevent.cpp \
|
||||
@ -69,6 +71,7 @@ SOURCES += \
|
||||
win32 {
|
||||
SOURCES += \
|
||||
kernel/qcoreapplication_win.cpp \
|
||||
kernel/qelapsedtimer_win.cpp \
|
||||
kernel/qwineventnotifier.cpp \
|
||||
kernel/qsharedmemory_win.cpp \
|
||||
kernel/qsystemsemaphore_win.cpp
|
||||
@ -103,6 +106,7 @@ mac {
|
||||
kernel/qcoreapplication_mac.cpp \
|
||||
kernel/qcore_mac.cpp \
|
||||
kernel/qcore_foundation.mm
|
||||
!nacl: SOURCES += kernel/qelapsedtimer_mac.cpp
|
||||
|
||||
OBJECTIVE_SOURCES += \
|
||||
kernel/qcore_mac_objc.mm \
|
||||
@ -131,6 +135,7 @@ unix|integrity {
|
||||
kernel/qcrashhandler.cpp \
|
||||
kernel/qeventdispatcher_unix.cpp \
|
||||
kernel/qtimerinfo_unix.cpp
|
||||
!darwin|nacl: SOURCES += kernel/qelapsedtimer_unix.cpp
|
||||
|
||||
HEADERS += \
|
||||
kernel/qcore_unix_p.h \
|
||||
@ -196,3 +201,5 @@ android {
|
||||
kernel/qjnihelpers_p.h \
|
||||
kernel/qjni_p.h
|
||||
}
|
||||
|
||||
!darwin:!unix:!win32: SOURCES += kernel/qelapsedtimer_generic.cpp
|
||||
|
@ -71,7 +71,6 @@ HEADERS += \
|
||||
tools/qtimezoneprivate_p.h \
|
||||
tools/qtimezoneprivate_data_p.h \
|
||||
tools/qtools_p.h \
|
||||
tools/qelapsedtimer.h \
|
||||
tools/qunicodetables_p.h \
|
||||
tools/qunicodetools_p.h \
|
||||
tools/qvarlengtharray.h \
|
||||
@ -92,7 +91,6 @@ SOURCES += \
|
||||
tools/qdatetime.cpp \
|
||||
tools/qdatetimeparser.cpp \
|
||||
tools/qeasingcurve.cpp \
|
||||
tools/qelapsedtimer.cpp \
|
||||
tools/qfreelist.cpp \
|
||||
tools/qhash.cpp \
|
||||
tools/qline.cpp \
|
||||
@ -130,24 +128,23 @@ msvc: NO_PCH_SOURCES += tools/qvector_msvc.cpp
|
||||
false: SOURCES += $$NO_PCH_SOURCES # Hack for QtCreator
|
||||
|
||||
!nacl:mac: {
|
||||
SOURCES += tools/qelapsedtimer_mac.cpp
|
||||
OBJECTIVE_SOURCES += tools/qlocale_mac.mm \
|
||||
tools/qtimezoneprivate_mac.mm \
|
||||
}
|
||||
else:android {
|
||||
SOURCES += tools/qelapsedtimer_unix.cpp tools/qlocale_unix.cpp tools/qtimezoneprivate_android.cpp
|
||||
SOURCES += tools/qlocale_unix.cpp tools/qtimezoneprivate_android.cpp
|
||||
}
|
||||
else:unix {
|
||||
SOURCES += tools/qelapsedtimer_unix.cpp tools/qlocale_unix.cpp tools/qtimezoneprivate_tz.cpp
|
||||
SOURCES += tools/qlocale_unix.cpp tools/qtimezoneprivate_tz.cpp
|
||||
}
|
||||
else:win32 {
|
||||
SOURCES += tools/qelapsedtimer_win.cpp \
|
||||
tools/qlocale_win.cpp \
|
||||
SOURCES += tools/qlocale_win.cpp \
|
||||
tools/qtimezoneprivate_win.cpp
|
||||
winphone: LIBS_PRIVATE += -lWindowsPhoneGlobalizationUtil
|
||||
winrt-*-msvc2013: LIBS += advapi32.lib
|
||||
} else:integrity:SOURCES += tools/qelapsedtimer_unix.cpp tools/qlocale_unix.cpp
|
||||
else:SOURCES += tools/qelapsedtimer_generic.cpp
|
||||
} else:integrity {
|
||||
SOURCES += tools/qlocale_unix.cpp
|
||||
}
|
||||
|
||||
contains(QT_CONFIG, system-zlib) {
|
||||
include($$PWD/../../3rdparty/zlib_dependency.pri)
|
||||
|
@ -1,6 +1,7 @@
|
||||
TEMPLATE=subdirs
|
||||
SUBDIRS=\
|
||||
qcoreapplication \
|
||||
qelapsedtimer \
|
||||
qeventdispatcher \
|
||||
qeventloop \
|
||||
qmath \
|
||||
|
@ -18,7 +18,6 @@ SUBDIRS=\
|
||||
qdate \
|
||||
qdatetime \
|
||||
qeasingcurve \
|
||||
qelapsedtimer \
|
||||
qexplicitlyshareddatapointer \
|
||||
qfreelist \
|
||||
qhash \
|
||||
|
Loading…
x
Reference in New Issue
Block a user