DEPENDPATH += .
INCLUDEPATH += .
+CONFIG += link_pkgconfig
+
!contains(QT_CONFIG, no-pkg-config) {
- QMAKE_CFLAGS_XKBCOMMON=$$system(pkg-config --cflags xkbcommon 2>/dev/null)
- QMAKE_LIBS_XKBCOMMON=$$system(pkg-config --libs xkbcommon 2>/dev/null)
+ PKGCONFIG += xkbcommon
+} else {
+ LIBS += -lxkbcommon
}
-QMAKE_CXXFLAGS += $$QMAKE_CFLAGS_XKBCOMMON
-QMAKE_CFLAGS += $$QMAKE_CFLAGS_XKBCOMMON
-LIBS += $$QMAKE_LIBS_XKBCOMMON
-
# Input
SOURCES += main.cpp
DEFINES += QT_COMPOSITOR_QUICK
-# comment out the following to not use pkg-config in the pri files
-CONFIG += use_pkgconfig
-
LIBS += -L ../../lib
QT += quick qml v8
-# comment out the following to not use pkg-config in the pri files
-CONFIG += use_pkgconfig
-
# if you want to compile QtCompositor as part of the application
# instead of linking to it, remove the QT += compositor and uncomment
# the following line
QT += gui gui-private core-private compositor
-# comment out the following to not use pkg-config in the pri files
-CONFIG += use_pkgconfig
-
LIBS += -L ../../lib
#include (../../src/qt-compositor/qt-compositor.pri)
-CONFIG += module
+CONFIG += module link_pkgconfig
load(qt_module)
MODULE_PRI += $$PWD/../../modules/qt_compositor.pri
DEFINES += QT_BUILD_COMPOSITOR_LIB
!contains(QT_CONFIG, no-pkg-config) {
- #If Qt uses pkg-config then override pkgconfig from mkspec
- QMAKE_CFLAGS_WAYLAND=$$system(pkg-config --cflags wayland-server 2>/dev/null)
- QMAKE_LIBS_WAYLAND_SERVER=$$system(pkg-config --libs-only-l wayland-server 2>/dev/null)
- QMAKE_INCDIR_WAYLAND=$$system("pkg-config --cflags-only-I wayland-server 2>/dev/null | sed -e 's,^-I,,g' -e 's, -I, ,g'")
- QMAKE_LIBDIR_WAYLAND=$$system("pkg-config --libs-only-L wayland-server 2>/dev/null | sed -e 's,^-L,,g' -e 's, -L, ,g'")
- QMAKE_DEFINES_WAYLAND=""
-}
-
-QMAKE_CXXFLAGS += $$QMAKE_CFLAGS_WAYLAND
-QMAKE_CFLAGS += $$QMAKE_CFLAGS_WAYLAND
-DEFINES += $$QMAKE_DEFINES_WAYLAND
-LIBS += $$QMAKE_LIBS_WAYLAND_SERVER
-!isEmpty(QMAKE_LIBDIR_WAYLAND) {
- LIBS += -L$$QMAKE_LIBDIR_WAYLAND
-}
-
-!isEmpty(QMAKE_LFLAGS_RPATH) {
- !isEmpty(QMAKE_LIBDIR_WAYLAND) {
- QMAKE_LFLAGS += $${QMAKE_LFLAGS_RPATH}$${QMAKE_LIBS_WAYLAND}
- }
+ PKGCONFIG += wayland-server
+} else {
+ LIBS += -lwayland-server
}
HEADERS += qtcompositorversion.h
TARGET = QtCompositor
QPRO_PWD = $$PWD
-# comment out the following to not use pkg-config in the pri files
-CONFIG += use_pkgconfig
-
include (compositor.pri)
load(qt_module_config)
load(qt_plugin)
load(qt_module)
-CONFIG += qpa/genericunixfontdatabase
+CONFIG += link_pkgconfig qpa/genericunixfontdatabase
DESTDIR = $$QT.gui.plugins/platforms
contains(config_test_xkbcommon,yes) {
!contains(QT_CONFIG, no-pkg-config) {
- QMAKE_CFLAGS_XKBCOMMON=$$system(pkg-config --cflags xkbcommon 2>/dev/null)
- QMAKE_LIBS_XKBCOMMON=$$system(pkg-config --libs xkbcommon 2>/dev/null)
+ PKGCONFIG += xkbcommon
+ } else {
+ LIBS += -lxkbcommon
}
-
- QMAKE_CXXFLAGS += $$QMAKE_CFLAGS_XKBCOMMON
- QMAKE_CFLAGS += $$QMAKE_CFLAGS_XKBCOMMON
- LIBS += $$QMAKE_LIBS_XKBCOMMON
} else {
DEFINES += QT_NO_WAYLAND_XKB
}
INCLUDEPATH += $$PWD/../../../shared
!contains(QT_CONFIG, no-pkg-config) {
- #If Qt uses pkg-config then override pkgconfig from mkspec
- QMAKE_CFLAGS_WAYLAND=$$system(pkg-config --cflags wayland-client 2>/dev/null)
- QMAKE_LIBS_WAYLAND_CLIENT=$$system(pkg-config --libs-only-l wayland-client 2>/dev/null)
- QMAKE_INCDIR_WAYLAND=$$system("pkg-config --cflags-only-I wayland-client 2>/dev/null | sed -e 's,^-I,,g' -e 's, -I, ,g'")
- QMAKE_LIBDIR_WAYLAND=$$system("pkg-config --libs-only-L wayland-client 2>/dev/null | sed -e 's,^-L,,g' -e 's, -L, ,g'")
- QMAKE_DEFINES_WAYLAND=""
-}
-
-QMAKE_CXXFLAGS += $$QMAKE_CFLAGS_WAYLAND
-QMAKE_CFLAGS += $$QMAKE_CFLAGS_WAYLAND
-DEFINES += $$QMAKE_DEFINES_WAYLAND
-LIBS += $$QMAKE_LIBS_WAYLAND_CLIENT
-!isEmpty(QMAKE_LIBDIR_WAYLAND) {
- LIBS += -L$$QMAKE_LIBDIR_WAYLAND
-}
-
-!isEmpty(QMAKE_LFLAGS_RPATH) {
- !isEmpty(QMAKE_LIBDIR_WAYLAND) {
- QMAKE_LFLAGS += $${QMAKE_LFLAGS_RPATH}$${QMAKE_LIBS_WAYLAND}
- }
+ PKGCONFIG += wayland-client
+} else {
+ LIBS += -lwayland-client
}
target.path += $$[QT_INSTALL_PLUGINS]/platforms
-CONFIG += testcase
+CONFIG += testcase link_pkgconfig
TARGET = tst_client
QT += testlib
QT += core-private gui-private
!contains(QT_CONFIG, no-pkg-config) {
- #If Qt uses pkg-config then override pkgconfig from mkspec
- QMAKE_CFLAGS_WAYLAND=$$system(pkg-config --cflags wayland-client 2>/dev/null)
- QMAKE_LIBS_WAYLAND_CLIENT=$$system(pkg-config --libs-only-l wayland-client 2>/dev/null)
- QMAKE_LIBS_WAYLAND_SERVER=$$system(pkg-config --libs-only-l wayland-server 2>/dev/null)
- QMAKE_INCDIR_WAYLAND=$$system("pkg-config --cflags-only-I wayland-client 2>/dev/null | sed -e 's,^-I,,g' -e 's, -I, ,g'")
- QMAKE_LIBDIR_WAYLAND=$$system("pkg-config --libs-only-L wayland-client 2>/dev/null | sed -e 's,^-L,,g' -e 's, -L, ,g'")
- QMAKE_DEFINES_WAYLAND=""
-}
-
-QMAKE_CXXFLAGS += $$QMAKE_CFLAGS_WAYLAND
-QMAKE_CFLAGS += $$QMAKE_CFLAGS_WAYLAND
-DEFINES += $$QMAKE_DEFINES_WAYLAND
-LIBS += $$QMAKE_LIBS_WAYLAND_CLIENT
-LIBS += $$QMAKE_LIBS_WAYLAND_SERVER
-!isEmpty(QMAKE_LIBDIR_WAYLAND) {
- LIBS += -L$$QMAKE_LIBDIR_WAYLAND
-}
-
-!isEmpty(QMAKE_LFLAGS_RPATH) {
- !isEmpty(QMAKE_LIBDIR_WAYLAND) {
- QMAKE_LFLAGS += $${QMAKE_LFLAGS_RPATH}$${QMAKE_LIBS_WAYLAND}
- }
+ PKGCONFIG += wayland-client wayland-server
+} else {
+ LIBS += -lwayland-client -lwayland-server
}
SOURCES += tst_client.cpp \
-CONFIG += testcase
+CONFIG += testcase link_pkgconfig
TARGET = tst_compositor
QT += testlib
QT += core-private gui-private compositor
!contains(QT_CONFIG, no-pkg-config) {
- #If Qt uses pkg-config then override pkgconfig from mkspec
- QMAKE_CFLAGS_WAYLAND=$$system(pkg-config --cflags wayland-server 2>/dev/null)
- QMAKE_LIBS_WAYLAND_SERVER=$$system(pkg-config --libs-only-l wayland-server 2>/dev/null)
- QMAKE_LIBS_WAYLAND_CLIENT=$$system(pkg-config --libs-only-l wayland-client 2>/dev/null)
- QMAKE_INCDIR_WAYLAND=$$system("pkg-config --cflags-only-I wayland-server 2>/dev/null | sed -e 's,^-I,,g' -e 's, -I, ,g'")
- QMAKE_LIBDIR_WAYLAND=$$system("pkg-config --libs-only-L wayland-server 2>/dev/null | sed -e 's,^-L,,g' -e 's, -L, ,g'")
- QMAKE_DEFINES_WAYLAND=""
+ PKGCONFIG += wayland-client wayland-server
+} else {
+ LIBS += -lwayland-client -lwayland-server
}
-QMAKE_CXXFLAGS += $$QMAKE_CFLAGS_WAYLAND
-QMAKE_CFLAGS += $$QMAKE_CFLAGS_WAYLAND
-DEFINES += $$QMAKE_DEFINES_WAYLAND
-LIBS += $$QMAKE_LIBS_WAYLAND_SERVER
-LIBS += $$QMAKE_LIBS_WAYLAND_CLIENT
-!isEmpty(QMAKE_LIBDIR_WAYLAND) {
- LIBS += -L$$QMAKE_LIBDIR_WAYLAND
-}
-
-!isEmpty(QMAKE_LFLAGS_RPATH) {
- !isEmpty(QMAKE_LIBDIR_WAYLAND) {
- QMAKE_LFLAGS += $${QMAKE_LFLAGS_RPATH}$${QMAKE_LIBS_WAYLAND}
- }
-}
-
-QMAKE_CXXFLAGS += $$QMAKE_CFLAGS_WAYLAND
-
SOURCES += tst_compositor.cpp testcompositor.cpp mockclient.cpp
HEADERS += testcompositor.h mockclient.h