From f061136f333da509eefd9f4d7201066cd793f243 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Thu, 12 Apr 2012 12:15:23 +0200 Subject: [PATCH] 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) - pointless QPRO_PWD assignments - qmake -project boilerplate Change-Id: I7b2cd36920a2b56bf745965a8a682d85af3ed48e Reviewed-by: Oswald Buddenhagen --- src/tools/mkv8snapshot/mkv8snapshot.pro | 2 -- src/v8/v8.pro | 6 +----- sync.profile | 4 ---- 3 files changed, 1 insertion(+), 11 deletions(-) diff --git a/src/tools/mkv8snapshot/mkv8snapshot.pro b/src/tools/mkv8snapshot/mkv8snapshot.pro index 41fa5df..0ccf5ec 100644 --- a/src/tools/mkv8snapshot/mkv8snapshot.pro +++ b/src/tools/mkv8snapshot/mkv8snapshot.pro @@ -7,8 +7,6 @@ CONFIG += console CONFIG += warn_off DESTDIR = ../../../bin -INCLUDEPATH += . -DEPENDPATH += . LIBS = OBJECTS_DIR = . diff --git a/src/v8/v8.pro b/src/v8/v8.pro index 3eec82e..e75d42c 100644 --- a/src/v8/v8.pro +++ b/src/v8/v8.pro @@ -1,10 +1,8 @@ -load(qt_module) +load(qt_build_config) TARGET = QtV8 -QPRO_PWD = $$PWD QT = -CONFIG += module !contains(QT_CONFIG, static): MODULE_DEFINES += V8_SHARED USING_V8_SHARED win32-msvc*|win32-icc:QMAKE_LFLAGS += /BASE:0x66000000 @@ -20,8 +18,6 @@ INCLUDEPATH -= $$MODULE_PRIVATE_INCLUDES INCLUDEPATH -= $$MODULE_PRIVATE_INCLUDES/$$TARGET INCLUDEPATH -= $$MODULE_INCLUDES $$MODULE_INCLUDES/.. -HEADERS += qtv8version.h - !contains(QT_CONFIG, static): DEFINES += V8_SHARED BUILDING_V8_SHARED include(v8.pri) diff --git a/sync.profile b/sync.profile index 111ce7d..05b86d2 100644 --- a/sync.profile +++ b/sync.profile @@ -7,10 +7,6 @@ @allmoduleheadersprivate = ( "QtV8" ); -%classnames = ( - "qtv8version.h" => "QtV8Version", -); -%mastercontent = (); # Module dependencies. # Every module that is required to build this module should have one entry. -- 2.7.4