Skip to content

Commit

Permalink
Fix indentation in pro files
Browse files Browse the repository at this point in the history
Make them consistently two spaces indentation.

In two places a wrong indentation level was fixed.
  • Loading branch information
Kissaki committed Aug 5, 2017
1 parent a3f0eb6 commit 27a983d
Show file tree
Hide file tree
Showing 22 changed files with 436 additions and 436 deletions.
24 changes: 12 additions & 12 deletions 3rdparty/celt-0.11.0-build/celt-0.11.0-build.pro
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ VERSION=$$replace(BUILDDIR,-build,)
VERSION=$$replace(VERSION,celt-,)

!exists(../$$SOURCEDIR/COPYING) {
message("The $$SOURCEDIR/ directory was not found. Please update your submodules (git submodule update --init) or build with CONFIG+=no-bundled-celt.")
error("Aborting configuration")
message("The $$SOURCEDIR/ directory was not found. Please update your submodules (git submodule update --init) or build with CONFIG+=no-bundled-celt.")
error("Aborting configuration")
}

TEMPLATE = lib
Expand All @@ -21,15 +21,15 @@ DEFINES += HAVE_CONFIG_H
TARGET_VERSION_EXT = .$$VERSION

CONFIG(static) {
CONFIG -= static
CONFIG += shared
CONFIG -= static
CONFIG += shared
}

!CONFIG(third-party-warnings) {
# We ignore warnings in third party builds. We won't actually look
# at them and they clutter out our warnings.
CONFIG -= warn_on
CONFIG += warn_off
# We ignore warnings in third party builds. We won't actually look
# at them and they clutter out our warnings.
CONFIG -= warn_on
CONFIG += warn_off
}

QMAKE_CFLAGS -= -fPIE -pie
Expand All @@ -55,11 +55,11 @@ win32 {
}

unix {
contains(QMAKE_CFLAGS, -ffast-math) {
DEFINES += FLOAT_APPROX
}
contains(QMAKE_CFLAGS, -ffast-math) {
DEFINES += FLOAT_APPROX
}

INCLUDEPATH += ../$$BUILDDIR
INCLUDEPATH += ../$$BUILDDIR
}

DIST = config.h
Expand Down
32 changes: 16 additions & 16 deletions 3rdparty/celt-0.7.0-build/celt-0.7.0-build.pro
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ VERSION=$$replace(BUILDDIR,-build,)
VERSION=$$replace(VERSION,celt-,)

!exists(../$$SOURCEDIR/COPYING) {
message("The $$SOURCEDIR/ directory was not found. Please update your submodules (git submodule update --init) or build with CONFIG+=no-bundled-celt.")
error("Aborting configuration")
message("The $$SOURCEDIR/ directory was not found. Please update your submodules (git submodule update --init) or build with CONFIG+=no-bundled-celt.")
error("Aborting configuration")
}

TEMPLATE = lib
Expand All @@ -23,20 +23,20 @@ DEFINES += HAVE_CONFIG_H
TARGET_VERSION_EXT = .$$VERSION

CONFIG(sbcelt) {
TARGET = celt
CONFIG += static
TARGET = celt
CONFIG += static
} else {
CONFIG(static) {
CONFIG -= static
CONFIG += shared
}
CONFIG(static) {
CONFIG -= static
CONFIG += shared
}
}

!CONFIG(third-party-warnings) {
# We ignore warnings in third party builds. We won't actually look
# at them and they clutter out our warnings.
CONFIG -= warn_on
CONFIG += warn_off
# We ignore warnings in third party builds. We won't actually look
# at them and they clutter out our warnings.
CONFIG -= warn_on
CONFIG += warn_off
}

QMAKE_CFLAGS -= -fPIE -pie
Expand All @@ -62,11 +62,11 @@ win32 {
}

unix {
contains(QMAKE_CFLAGS, -ffast-math) {
DEFINES += FLOAT_APPROX
}
contains(QMAKE_CFLAGS, -ffast-math) {
DEFINES += FLOAT_APPROX
}

INCLUDEPATH += ../$$BUILDDIR
INCLUDEPATH += ../$$BUILDDIR
}

DIST = config.h
Expand Down
20 changes: 10 additions & 10 deletions 3rdparty/opus-build/opus-build.pro
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@ BUILDDIR=$$basename(PWD)
SOURCEDIR=$$replace(BUILDDIR,-build,-src)

!win32 {
VERSION=0 #$$ Fool packaging script
VERSION=0 #$$ Fool packaging script
}

!exists(../$$SOURCEDIR/COPYING) {
message("The $$SOURCEDIR/ directory was not found. Please update your submodules (git submodule update --init).")
error("Aborting configuration")
message("The $$SOURCEDIR/ directory was not found. Please update your submodules (git submodule update --init).")
error("Aborting configuration")
}

TEMPLATE = lib
Expand All @@ -21,10 +21,10 @@ TARGET = opus
DEFINES += HAVE_CONFIG_H

!CONFIG(third-party-warnings) {
# We ignore warnings in third party builds. We won't actually look
# at them and they clutter out our warnings.
CONFIG -= warn_on
CONFIG += warn_off
# We ignore warnings in third party builds. We won't actually look
# at them and they clutter out our warnings.
CONFIG -= warn_on
CONFIG += warn_off
}

QMAKE_CFLAGS -= -fPIE -pie
Expand Down Expand Up @@ -263,12 +263,12 @@ src/mlp_data.c


CONFIG(debug, debug|release) {
CONFIG += console
DESTDIR = ../../debug
CONFIG += console
DESTDIR = ../../debug
}

CONFIG(release, debug|release) {
DESTDIR = ../../release
DESTDIR = ../../release
}

include(../../qmake/symbols.pri)
22 changes: 11 additions & 11 deletions 3rdparty/sbcelt-helper-build/sbcelt-helper-build.pro
Original file line number Diff line number Diff line change
Expand Up @@ -49,22 +49,22 @@ SOURCES = \
$$CELTDIR/rangeenc.c \
$$CELTDIR/rate.c \
$$CELTDIR/vq.c \
sbcelt-helper.c \
alloc.c
sbcelt-helper.c \
alloc.c

unix:!macx {
UNAME=$$system(uname -s)
contains(UNAME, Linux) {
SOURCES *= ../lib/futex-linux.c seccomp-sandbox.c sbcelt-sandbox-linux.c pdeath-linux.c
LIBS += -lrt
}
contains(UNAME, FreeBSD) {
SOURCES *= ../lib/futex-freebsd.c sbcelt-sandbox-freebsd.c pdeath-kqueue.c
}
UNAME=$$system(uname -s)
contains(UNAME, Linux) {
SOURCES *= ../lib/futex-linux.c seccomp-sandbox.c sbcelt-sandbox-linux.c pdeath-linux.c
LIBS += -lrt
}
contains(UNAME, FreeBSD) {
SOURCES *= ../lib/futex-freebsd.c sbcelt-sandbox-freebsd.c pdeath-kqueue.c
}
}

macx {
SOURCES *= ../lib/futex-stub.c sbcelt-sandbox-darwin.c pdeath-kqueue.c
SOURCES *= ../lib/futex-stub.c sbcelt-sandbox-darwin.c pdeath-kqueue.c
}

CONFIG(release, debug|release) {
Expand Down
32 changes: 16 additions & 16 deletions 3rdparty/sbcelt-lib-build/sbcelt-lib-build.pro
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,13 @@ CELTDIR=../celt-0.7.0-src
}

!exists(../$$SOURCEDIR/LICENSE) {
message("The $$SOURCEDIR/ directory was not found. You need to do the following:")
message("")
message("Use SBCELT Git:")
message("git submodule init")
message("git submodule update")
message("")
error("Aborting configuration")
message("The $$SOURCEDIR/ directory was not found. You need to do the following:")
message("")
message("Use SBCELT Git:")
message("git submodule init")
message("git submodule update")
message("")
error("Aborting configuration")
}

TEMPLATE = lib
Expand All @@ -33,23 +33,23 @@ DEFINES += SBCELT_PREFIX_API
QMAKE_CFLAGS -= -fPIE -pie

unix {
INCLUDEPATH += ../$$BUILDDIR
INCLUDEPATH += ../$$BUILDDIR
}

SOURCES *= libsbcelt.c mtime.c stub.c

unix:!macx {
UNAME=$$system(uname -s)
contains(UNAME, Linux) {
SOURCES *= futex-linux.c closefrom.c
}
contains(UNAME, FreeBSD) {
SOURCES *= futex-freebsd.c closefrom-sys.c
}
UNAME=$$system(uname -s)
contains(UNAME, Linux) {
SOURCES *= futex-linux.c closefrom.c
}
contains(UNAME, FreeBSD) {
SOURCES *= futex-freebsd.c closefrom-sys.c
}
}

macx {
SOURCES *= futex-stub.c closefrom.c
SOURCES *= futex-stub.c closefrom.c
}

CONFIG(debug, debug|release) {
Expand Down
20 changes: 10 additions & 10 deletions 3rdparty/speex-build/speex-build.pro
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
include(../../qmake/compiler.pri)

!exists(../speex-src/COPYING) | !exists(../speexdsp-src/COPYING) {
message("The speex-src/ or speexdsp-src/ directories were not found. You need to do one of the following:")
message("")
message("Option 1: Use Speex Git:")
message("git submodule init")
message("git submodule update")
message("")
message("Option 2: Use system speex and speex-dsp (v 1.2 or later):")
message("qmake CONFIG+=no-bundled-speex -recursive")
message("")
error("Aborting configuration")
message("The speex-src/ or speexdsp-src/ directories were not found. You need to do one of the following:")
message("")
message("Option 1: Use Speex Git:")
message("git submodule init")
message("git submodule update")
message("")
message("Option 2: Use system speex and speex-dsp (v 1.2 or later):")
message("qmake CONFIG+=no-bundled-speex -recursive")
message("")
error("Aborting configuration")
}

CONFIG(debug, debug|release) {
Expand Down
14 changes: 7 additions & 7 deletions macx/compat/compat.pro
Original file line number Diff line number Diff line change
Expand Up @@ -14,17 +14,17 @@ CONFIG -= qt app_bundle
CONFIG += debug_and_release

isEqual(QT_MAJOR_VERSION, 5) {
QMAKE_CFLAGS += -arch i386
QMAKE_OBJECTIVE_CFLAGS += -arch i386
QMAKE_CXXFLAGS += -arch i386
QMAKE_LFLAGS += -arch i386
QMAKE_CFLAGS += -arch i386
QMAKE_OBJECTIVE_CFLAGS += -arch i386
QMAKE_CXXFLAGS += -arch i386
QMAKE_LFLAGS += -arch i386
} else {
CONFIG -= x86_64
CONFIG += x86
CONFIG -= x86_64
CONFIG += x86
}

CONFIG(universal) {
CONFIG += ppc
CONFIG += ppc
}

TARGET = Mumble.compat
Expand Down
4 changes: 2 additions & 2 deletions macx/osax/osax.pro
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,15 @@ include(../../qmake/compiler.pri)

CONFIG += x86_64 x86 debug_and_release
CONFIG(universal) {
CONFIG += ppc
CONFIG += ppc
}

TEMPLATE = lib
CONFIG += plugin plugin_bundle
CONFIG -= gui qt

CONFIG(static) {
CONFIG -= static
CONFIG -= static
}

TARGET = MumbleOverlay
Expand Down
Loading

0 comments on commit 27a983d

Please sign in to comment.