diff options
author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2012-04-12 12:44:43 +0200 |
---|---|---|
committer | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2012-06-27 08:32:14 +0200 |
commit | 41ce17eb1486996d8357d268050a18bc9ac38ad9 (patch) | |
tree | 048d01f1f5d8f7b158b530dd55ee4c099b0b9675 | |
parent | 5d7e56377d3330eb9afacd3bac95573a4c6f3716 (diff) |
build system cleanups
- load(qt_module) => load(qt_build_config)
- remove:
- CONFIG+=module (obsolete)
- code relating to module version headers (automated now)
- %mastercontent assignment (automated now)
- QT_BUILD_*_LIB defines (automated now)
- pointless QPRO_PWD assignments
- qmake -project boilerplate
- dead code
Change-Id: Ia515c3cc40170e3b99b0bfd04c10637d49f9b99f
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
-rw-r--r-- | config.tests/brcm_egl/brcm_egl.pro | 3 | ||||
-rw-r--r-- | config.tests/xkbcommon/xkbcommon.pro | 3 | ||||
-rw-r--r-- | examples/qwidget-compositor/qwidget-compositor.pro | 7 | ||||
-rw-r--r-- | src/compositor/compositor.pri | 6 | ||||
-rw-r--r-- | src/compositor/compositor.pro | 4 | ||||
-rw-r--r-- | src/plugins/platforms/wayland/wayland.pro | 2 | ||||
-rw-r--r-- | sync.profile | 3 |
7 files changed, 3 insertions, 25 deletions
diff --git a/config.tests/brcm_egl/brcm_egl.pro b/config.tests/brcm_egl/brcm_egl.pro index 7ad4dcf7e..78175ed82 100644 --- a/config.tests/brcm_egl/brcm_egl.pro +++ b/config.tests/brcm_egl/brcm_egl.pro @@ -1,8 +1,5 @@ -TEMPLATE = app TARGET = brcm_egl QT = core gui -DEPENDPATH += . -INCLUDEPATH += . LIBS += -lEGL -lGLESv2 diff --git a/config.tests/xkbcommon/xkbcommon.pro b/config.tests/xkbcommon/xkbcommon.pro index e21015b4b..1fc353431 100644 --- a/config.tests/xkbcommon/xkbcommon.pro +++ b/config.tests/xkbcommon/xkbcommon.pro @@ -1,8 +1,5 @@ -TEMPLATE = app TARGET = xkbcommon QT = core -DEPENDPATH += . -INCLUDEPATH += . CONFIG += link_pkgconfig diff --git a/examples/qwidget-compositor/qwidget-compositor.pro b/examples/qwidget-compositor/qwidget-compositor.pro index 20dce5a62..369affbe6 100644 --- a/examples/qwidget-compositor/qwidget-compositor.pro +++ b/examples/qwidget-compositor/qwidget-compositor.pro @@ -6,13 +6,6 @@ # to make QtCompositor/... style includes working without installing INCLUDEPATH += $$PWD/../../include -# Touch support -isEmpty(QT_SOURCE_TREE) { - QTBASE = $$[QT_INSTALL_DATA] -} else { - QTBASE = $$QT_SOURCE_TREE -} - HEADERS += \ textureblitter.h diff --git a/src/compositor/compositor.pri b/src/compositor/compositor.pri index fa8adfb14..595bbf7c7 100644 --- a/src/compositor/compositor.pri +++ b/src/compositor/compositor.pri @@ -1,8 +1,6 @@ -CONFIG += module link_pkgconfig +CONFIG += link_pkgconfig -INCLUDEPATH += $$PWD DEFINES += QT_WAYLAND_WINDOWMANAGER_SUPPORT -DEFINES += QT_BUILD_COMPOSITOR_LIB !contains(QT_CONFIG, no-pkg-config) { PKGCONFIG += wayland-server @@ -10,8 +8,6 @@ DEFINES += QT_BUILD_COMPOSITOR_LIB LIBS += -lwayland-server } -HEADERS += qtcompositorversion.h - include ($$PWD/global/global.pri) include ($$PWD/wayland_wrapper/wayland_wrapper.pri) include ($$PWD/hardware_integration/hardware_integration.pri) diff --git a/src/compositor/compositor.pro b/src/compositor/compositor.pro index 0f2303610..52edb4c69 100644 --- a/src/compositor/compositor.pro +++ b/src/compositor/compositor.pro @@ -1,8 +1,6 @@ -load(qt_module) +load(qt_build_config) TARGET = QtCompositor -QPRO_PWD = $$PWD - QT = core gui-private contains(QT_CONFIG, opengl):MODULE_DEFINES = QT_COMPOSITOR_WAYLAND_GL diff --git a/src/plugins/platforms/wayland/wayland.pro b/src/plugins/platforms/wayland/wayland.pro index c8673b92a..3e7c1948b 100644 --- a/src/plugins/platforms/wayland/wayland.pro +++ b/src/plugins/platforms/wayland/wayland.pro @@ -1,6 +1,6 @@ TARGET = qwayland load(qt_plugin) -load(qt_module) +load(qt_build_config) CONFIG += link_pkgconfig qpa/genericunixfontdatabase diff --git a/sync.profile b/sync.profile index 72c22011c..74cb44638 100644 --- a/sync.profile +++ b/sync.profile @@ -5,9 +5,6 @@ ); %classnames = ( ); -%mastercontent = ( - "gui" => "#include <QtGui/QtGui>\n", -); %deprecatedheaders = ( ); # Module dependencies. |