Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mumble-voip/mumble.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan Klass <kissaki@posteo.de>2017-08-05 21:37:19 +0300
committerJan Klass <kissaki@posteo.de>2017-08-05 21:37:19 +0300
commit27a983d09443c7c9f41d46ba640106acb3423734 (patch)
treefcd94c93abde34927e6ded58c29a89f897ef6daf /src/murmur/murmur.pro
parenta3f0eb680e0a83451111e6115f1b6b1aa16c4f2a (diff)
Fix indentation in pro files
Make them consistently two spaces indentation. In two places a wrong indentation level was fixed.
Diffstat (limited to 'src/murmur/murmur.pro')
-rw-r--r--src/murmur/murmur.pro254
1 files changed, 127 insertions, 127 deletions
diff --git a/src/murmur/murmur.pro b/src/murmur/murmur.pro
index 7ed20d6e8..d686a66a7 100644
--- a/src/murmur/murmur.pro
+++ b/src/murmur/murmur.pro
@@ -23,15 +23,15 @@ DIST = DBus.h ServerDB.h ../../icons/murmur.ico Murmur.ice MurmurI.h MurmurIceWr
PRECOMPILED_HEADER = murmur_pch.h
!CONFIG(no-ice) {
- CONFIG *= ice
+ CONFIG *= ice
}
!CONFIG(no-dbus):!win32:!macx {
- CONFIG *= dbus
+ CONFIG *= dbus
}
!CONFIG(no-bonjour) {
- CONFIG *= bonjour
+ CONFIG *= bonjour
}
win32 {
@@ -75,138 +75,138 @@ macx {
}
dbus {
- DEFINES *= USE_DBUS
- QT *= dbus
- HEADERS *= DBus.h
- SOURCES *= DBus.cpp
+ DEFINES *= USE_DBUS
+ QT *= dbus
+ HEADERS *= DBus.h
+ SOURCES *= DBus.cpp
}
ice {
- SOURCES *= MurmurIce.cpp
- HEADERS *= MurmurIce.h
-
- win32:CONFIG(debug, debug|release) {
- LIBS *= -lIceD -lIceUtilD
- } else {
- # check Ice version, 3.7 merged IceUtil into Ice
- ICE_VERSION = $$system(slice2cpp --version 2>&1)
- ICE_MAJOR_VERSION = $$section(ICE_VERSION, ., 0, 0)
- ICE_MINOR_VERSION = $$section(ICE_VERSION, ., 1, 1)
-
- !equals(ICE_MAJOR_VERSION, 3) {
- error("Unsupported Ice version")
- }
- lessThan(ICE_MINOR_VERSION, 7) {
- # Ice < 3.7
- LIBS *= -lIce -lIceUtil
- } else {
- # Ice 3.7+
- LIBS *= -lIce
- }
- }
-
- DEFINES *= USE_ICE
-
- win32 {
- INCLUDEPATH *= "$$ICE_PATH/include"
- !CONFIG(static) {
- QMAKE_LIBDIR *= "$$ICE_PATH/lib/vc100"
- } else {
- DEFINES *= ICE_STATIC_LIBS
- QMAKE_LIBDIR *= $$BZIP2_PATH/lib
- equals(MUMBLE_ARCH, x86) {
- QMAKE_LIBDIR *= $$ICE_PATH/lib
- }
- equals(MUMBLE_ARCH, x86_64) {
- QMAKE_LIBDIR *= $$ICE_PATH/lib/x64
- }
- CONFIG(release, debug|release): LIBS *= -llibbz2
- CONFIG(debug, debug|release): LIBS *= -llibbz2d
- LIBS *= -ldbghelp -liphlpapi -lrpcrt4
- }
- }
-
- macx {
- INCLUDEPATH *= $$(MUMBLE_PREFIX)/Ice-3.4.2/include/
- QMAKE_LIBDIR *= $$(MUMBLE_PREFIX)/Ice-3.4.2/lib/
- }
-
- unix:!macx:CONFIG(buildenv) {
- INCLUDEPATH *= $$(MUMBLE_ICE_PREFIX)/include/
- QMAKE_LIBDIR *= $$(MUMBLE_ICE_PREFIX)/lib/
- }
-
- unix:!macx:CONFIG(static) {
- INCLUDEPATH *= /opt/Ice-3.3/include
- QMAKE_LIBDIR *= /opt/Ice-3.3/lib
- LIBS *= -lbz2
- QMAKE_CXXFLAGS *= -fPIC
- }
-
- macx:CONFIG(static) {
- LIBS *= -lbz2 -liconv
- QMAKE_CXXFLAGS *= -fPIC
- }
-
- LIBS *= -lmurmur_ice
- INCLUDEPATH *= murmur_ice
-
- unix {
- QMAKE_CFLAGS *= "-isystem murmur_ice"
- QMAKE_CXXFLAGS *= "-isystem murmur_ice"
- }
+ SOURCES *= MurmurIce.cpp
+ HEADERS *= MurmurIce.h
+
+ win32:CONFIG(debug, debug|release) {
+ LIBS *= -lIceD -lIceUtilD
+ } else {
+ # check Ice version, 3.7 merged IceUtil into Ice
+ ICE_VERSION = $$system(slice2cpp --version 2>&1)
+ ICE_MAJOR_VERSION = $$section(ICE_VERSION, ., 0, 0)
+ ICE_MINOR_VERSION = $$section(ICE_VERSION, ., 1, 1)
+
+ !equals(ICE_MAJOR_VERSION, 3) {
+ error("Unsupported Ice version")
+ }
+ lessThan(ICE_MINOR_VERSION, 7) {
+ # Ice < 3.7
+ LIBS *= -lIce -lIceUtil
+ } else {
+ # Ice 3.7+
+ LIBS *= -lIce
+ }
+ }
+
+ DEFINES *= USE_ICE
+
+ win32 {
+ INCLUDEPATH *= "$$ICE_PATH/include"
+ !CONFIG(static) {
+ QMAKE_LIBDIR *= "$$ICE_PATH/lib/vc100"
+ } else {
+ DEFINES *= ICE_STATIC_LIBS
+ QMAKE_LIBDIR *= $$BZIP2_PATH/lib
+ equals(MUMBLE_ARCH, x86) {
+ QMAKE_LIBDIR *= $$ICE_PATH/lib
+ }
+ equals(MUMBLE_ARCH, x86_64) {
+ QMAKE_LIBDIR *= $$ICE_PATH/lib/x64
+ }
+ CONFIG(release, debug|release): LIBS *= -llibbz2
+ CONFIG(debug, debug|release): LIBS *= -llibbz2d
+ LIBS *= -ldbghelp -liphlpapi -lrpcrt4
+ }
+ }
+
+ macx {
+ INCLUDEPATH *= $$(MUMBLE_PREFIX)/Ice-3.4.2/include/
+ QMAKE_LIBDIR *= $$(MUMBLE_PREFIX)/Ice-3.4.2/lib/
+ }
+
+ unix:!macx:CONFIG(buildenv) {
+ INCLUDEPATH *= $$(MUMBLE_ICE_PREFIX)/include/
+ QMAKE_LIBDIR *= $$(MUMBLE_ICE_PREFIX)/lib/
+ }
+
+ unix:!macx:CONFIG(static) {
+ INCLUDEPATH *= /opt/Ice-3.3/include
+ QMAKE_LIBDIR *= /opt/Ice-3.3/lib
+ LIBS *= -lbz2
+ QMAKE_CXXFLAGS *= -fPIC
+ }
+
+ macx:CONFIG(static) {
+ LIBS *= -lbz2 -liconv
+ QMAKE_CXXFLAGS *= -fPIC
+ }
+
+ LIBS *= -lmurmur_ice
+ INCLUDEPATH *= murmur_ice
+
+ unix {
+ QMAKE_CFLAGS *= "-isystem murmur_ice"
+ QMAKE_CXXFLAGS *= "-isystem murmur_ice"
+ }
}
grpc {
- isEqual(QT_MAJOR_VERSION, 4) {
- error("Murmur's gRPC support requires Qt 5")
- }
-
- DEFINES *= USE_GRPC
- INCLUDEPATH *= murmur_grpc
- LIBS *= -lmurmur_grpc
-
- HEADERS *= MurmurGRPCImpl.h
- SOURCES *= MurmurGRPCImpl.cpp
-
- GRPC_WRAPPER = MurmurRPC.proto
- grpc_wrapper.output = MurmurRPC.proto.Wrapper.cpp
- grpc_wrapper.commands = $${PROTOC} --plugin=${DESTDIR}protoc-gen-murmur-grpcwrapper -I. --murmur-grpcwrapper_out=. MurmurRPC.proto
- grpc_wrapper.input = GRPC_WRAPPER
- grpc_wrapper.variable_out =
- QMAKE_EXTRA_COMPILERS += grpc_wrapper
-
- unix {
- QMAKE_CXXFLAGS *= -std=c++11
- must_pkgconfig(grpc)
- must_pkgconfig(grpc++)
- }
+ isEqual(QT_MAJOR_VERSION, 4) {
+ error("Murmur's gRPC support requires Qt 5")
+ }
+
+ DEFINES *= USE_GRPC
+ INCLUDEPATH *= murmur_grpc
+ LIBS *= -lmurmur_grpc
+
+ HEADERS *= MurmurGRPCImpl.h
+ SOURCES *= MurmurGRPCImpl.cpp
+
+ GRPC_WRAPPER = MurmurRPC.proto
+ grpc_wrapper.output = MurmurRPC.proto.Wrapper.cpp
+ grpc_wrapper.commands = $${PROTOC} --plugin=${DESTDIR}protoc-gen-murmur-grpcwrapper -I. --murmur-grpcwrapper_out=. MurmurRPC.proto
+ grpc_wrapper.input = GRPC_WRAPPER
+ grpc_wrapper.variable_out =
+ QMAKE_EXTRA_COMPILERS += grpc_wrapper
+
+ unix {
+ QMAKE_CXXFLAGS *= -std=c++11
+ must_pkgconfig(grpc)
+ must_pkgconfig(grpc++)
+ }
}
bonjour {
- DEFINES *= USE_BONJOUR
-
- HEADERS *= \
- ../../3rdparty/qqbonjour-src/BonjourRecord.h \
- ../../3rdparty/qqbonjour-src/BonjourServiceRegister.h \
- BonjourServer.h
- SOURCES *= \
- ../../3rdparty/qqbonjour-src/BonjourServiceRegister.cpp \
- BonjourServer.cpp
- INCLUDEPATH *= ../../3rdparty/qqbonjour-src
- win32 {
- INCLUDEPATH *= "$$BONJOUR_PATH/include"
- QMAKE_LIBDIR *= "$$BONJOUR_PATH/lib/win32"
- LIBS *= -lDNSSD
- }
- unix:!macx {
- system(pkg-config --exists avahi-compat-libdns_sd avahi-client) {
- must_pkgconfig(avahi-compat-libdns_sd)
- must_pkgconfig(avahi-client)
- } else {
- LIBS *= -ldns_sd
- }
- }
+ DEFINES *= USE_BONJOUR
+
+ HEADERS *= \
+ ../../3rdparty/qqbonjour-src/BonjourRecord.h \
+ ../../3rdparty/qqbonjour-src/BonjourServiceRegister.h \
+ BonjourServer.h
+ SOURCES *= \
+ ../../3rdparty/qqbonjour-src/BonjourServiceRegister.cpp \
+ BonjourServer.cpp
+ INCLUDEPATH *= ../../3rdparty/qqbonjour-src
+ win32 {
+ INCLUDEPATH *= "$$BONJOUR_PATH/include"
+ QMAKE_LIBDIR *= "$$BONJOUR_PATH/lib/win32"
+ LIBS *= -lDNSSD
+ }
+ unix:!macx {
+ system(pkg-config --exists avahi-compat-libdns_sd avahi-client) {
+ must_pkgconfig(avahi-compat-libdns_sd)
+ must_pkgconfig(avahi-client)
+ } else {
+ LIBS *= -ldns_sd
+ }
+ }
}
# Check for QSslDiffieHellmanParameters availability, and define
@@ -214,7 +214,7 @@ bonjour {
#
# Can be disabled with no-qssldiffiehellmanparameters.
!CONFIG(no-qssldiffiehellmanparameters):exists($$[QT_INSTALL_HEADERS]/QtNetwork/QSslDiffieHellmanParameters) {
- DEFINES += USE_QSSLDIFFIEHELLMANPARAMETERS
+ DEFINES += USE_QSSLDIFFIEHELLMANPARAMETERS
}
include(../../qmake/symbols.pri)