diff options
Diffstat (limited to 'src/corelib')
-rw-r--r-- | src/corelib/kernel/kernel.pri | 7 | ||||
-rw-r--r-- | src/corelib/kernel/qelapsedtimer.cpp (renamed from src/corelib/tools/qelapsedtimer.cpp) | 0 | ||||
-rw-r--r-- | src/corelib/kernel/qelapsedtimer.h (renamed from src/corelib/tools/qelapsedtimer.h) | 0 | ||||
-rw-r--r-- | src/corelib/kernel/qelapsedtimer_generic.cpp (renamed from src/corelib/tools/qelapsedtimer_generic.cpp) | 0 | ||||
-rw-r--r-- | src/corelib/kernel/qelapsedtimer_mac.cpp (renamed from src/corelib/tools/qelapsedtimer_mac.cpp) | 0 | ||||
-rw-r--r-- | src/corelib/kernel/qelapsedtimer_unix.cpp (renamed from src/corelib/tools/qelapsedtimer_unix.cpp) | 0 | ||||
-rw-r--r-- | src/corelib/kernel/qelapsedtimer_win.cpp (renamed from src/corelib/tools/qelapsedtimer_win.cpp) | 0 | ||||
-rw-r--r-- | src/corelib/tools/tools.pri | 15 |
8 files changed, 13 insertions, 9 deletions
diff --git a/src/corelib/kernel/kernel.pri b/src/corelib/kernel/kernel.pri index 991b73812a..39fe61ea4e 100644 --- a/src/corelib/kernel/kernel.pri +++ b/src/corelib/kernel/kernel.pri @@ -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 diff --git a/src/corelib/tools/qelapsedtimer.cpp b/src/corelib/kernel/qelapsedtimer.cpp index 2eabb4c3a3..2eabb4c3a3 100644 --- a/src/corelib/tools/qelapsedtimer.cpp +++ b/src/corelib/kernel/qelapsedtimer.cpp diff --git a/src/corelib/tools/qelapsedtimer.h b/src/corelib/kernel/qelapsedtimer.h index 7954b41bf4..7954b41bf4 100644 --- a/src/corelib/tools/qelapsedtimer.h +++ b/src/corelib/kernel/qelapsedtimer.h diff --git a/src/corelib/tools/qelapsedtimer_generic.cpp b/src/corelib/kernel/qelapsedtimer_generic.cpp index 8c724247be..8c724247be 100644 --- a/src/corelib/tools/qelapsedtimer_generic.cpp +++ b/src/corelib/kernel/qelapsedtimer_generic.cpp diff --git a/src/corelib/tools/qelapsedtimer_mac.cpp b/src/corelib/kernel/qelapsedtimer_mac.cpp index 886e0f41b2..886e0f41b2 100644 --- a/src/corelib/tools/qelapsedtimer_mac.cpp +++ b/src/corelib/kernel/qelapsedtimer_mac.cpp diff --git a/src/corelib/tools/qelapsedtimer_unix.cpp b/src/corelib/kernel/qelapsedtimer_unix.cpp index e2c3ae6280..e2c3ae6280 100644 --- a/src/corelib/tools/qelapsedtimer_unix.cpp +++ b/src/corelib/kernel/qelapsedtimer_unix.cpp diff --git a/src/corelib/tools/qelapsedtimer_win.cpp b/src/corelib/kernel/qelapsedtimer_win.cpp index 520126d262..520126d262 100644 --- a/src/corelib/tools/qelapsedtimer_win.cpp +++ b/src/corelib/kernel/qelapsedtimer_win.cpp diff --git a/src/corelib/tools/tools.pri b/src/corelib/tools/tools.pri index 4d77f4e43f..853827e032 100644 --- a/src/corelib/tools/tools.pri +++ b/src/corelib/tools/tools.pri @@ -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) |