diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-02-17 11:39:16 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-02-17 11:39:16 +0100 |
| commit | dbafabb019eac6ab21b43279b3a348e4afbd065e (patch) | |
| tree | 24245148e3f0b948df06823d879f9158d1b81d2f /mkspecs/freebsd-g++ | |
| parent | 00b96399e6d3bcd7a1081721cafeb15da3ab9781 (diff) | |
| parent | 9de2853a942529f88815ed29375ff4efc44d168c (diff) | |
| download | qtbase-dbafabb019eac6ab21b43279b3a348e4afbd065e.tar.gz | |
Merge remote-tracking branch 'origin/stable' into dev
Conflicts:
src/corelib/global/qglobal.h
Change-Id: I03d8b6e07135056baaa1d97c3c63fbe8b25583d9
Diffstat (limited to 'mkspecs/freebsd-g++')
| -rw-r--r-- | mkspecs/freebsd-g++/qmake.conf | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/mkspecs/freebsd-g++/qmake.conf b/mkspecs/freebsd-g++/qmake.conf index cb6cd3131c..f736e183ec 100644 --- a/mkspecs/freebsd-g++/qmake.conf +++ b/mkspecs/freebsd-g++/qmake.conf @@ -4,7 +4,6 @@ MAKEFILE_GENERATOR = UNIX QMAKE_PLATFORM = freebsd bsd -CONFIG += gdb_dwarf_index QMAKE_CFLAGS_THREAD = -pthread -D_THREAD_SAFE |