diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2018-03-18 09:40:01 -0700 |
|---|---|---|
| committer | Aapo Keskimolo <aapo.keskimolo@qt.io> | 2018-03-19 20:36:45 +0000 |
| commit | 9fa2626ef8760fe2923af5b47d027e63d9333776 (patch) | |
| tree | 74f792e108605efaf7026f8f6a277fe29716bef7 | |
| parent | 90493e16b8dd9edc6176d0abc255422edbbb05c3 (diff) | |
Remove src/corelib/arch, merging with src/corelib/thread
There is no more architecture-specific code.
Change-Id: Ie9d9215342d449c48a11fffd151d11411cd73fc7
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
| -rw-r--r-- | src/corelib/arch/arch.pri | 5 | ||||
| -rw-r--r-- | src/corelib/corelib.pro | 1 | ||||
| -rw-r--r-- | src/corelib/thread/qatomic_bootstrap.h (renamed from src/corelib/arch/qatomic_bootstrap.h) | 0 | ||||
| -rw-r--r-- | src/corelib/thread/qatomic_cxx11.h (renamed from src/corelib/arch/qatomic_cxx11.h) | 0 | ||||
| -rw-r--r-- | src/corelib/thread/thread.pri | 4 |
5 files changed, 4 insertions, 6 deletions
diff --git a/src/corelib/arch/arch.pri b/src/corelib/arch/arch.pri deleted file mode 100644 index c9e54d1972..0000000000 --- a/src/corelib/arch/arch.pri +++ /dev/null @@ -1,5 +0,0 @@ -HEADERS += \ - arch/qatomic_bootstrap.h \ - arch/qatomic_cxx11.h - -qtConfig(std-atomic64): QMAKE_USE += libatomic diff --git a/src/corelib/corelib.pro b/src/corelib/corelib.pro index 3db2e2ceb8..7f62a6f1b0 100644 --- a/src/corelib/corelib.pro +++ b/src/corelib/corelib.pro @@ -32,7 +32,6 @@ ANDROID_PERMISSIONS = \ freebsd|openbsd: QMAKE_LFLAGS_NOUNDEF = include(animation/animation.pri) -include(arch/arch.pri) include(global/global.pri) include(thread/thread.pri) include(tools/tools.pri) diff --git a/src/corelib/arch/qatomic_bootstrap.h b/src/corelib/thread/qatomic_bootstrap.h index b463f817bd..b463f817bd 100644 --- a/src/corelib/arch/qatomic_bootstrap.h +++ b/src/corelib/thread/qatomic_bootstrap.h diff --git a/src/corelib/arch/qatomic_cxx11.h b/src/corelib/thread/qatomic_cxx11.h index 2fc0bf5419..2fc0bf5419 100644 --- a/src/corelib/arch/qatomic_cxx11.h +++ b/src/corelib/thread/qatomic_cxx11.h diff --git a/src/corelib/thread/thread.pri b/src/corelib/thread/thread.pri index e4972a57b3..47775f3fde 100644 --- a/src/corelib/thread/thread.pri +++ b/src/corelib/thread/thread.pri @@ -10,6 +10,8 @@ HEADERS += thread/qmutex.h \ thread/qthreadstorage.h \ thread/qwaitcondition.h \ thread/qatomic.h \ + thread/qatomic_bootstrap.h \ + thread/qatomic_cxx11.h \ thread/qbasicatomic.h \ thread/qgenericatomic.h @@ -67,3 +69,5 @@ win32 { thread/qthread_unix.cpp \ thread/qwaitcondition_unix.cpp } + +qtConfig(std-atomic64): QMAKE_USE += libatomic |