Skip to content

Commit

Permalink
build system cleanups
Browse files Browse the repository at this point in the history
- 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 <[email protected]>
  • Loading branch information
ossilator committed Jun 13, 2012
1 parent 572d090 commit f061136
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 11 deletions.
2 changes: 0 additions & 2 deletions src/tools/mkv8snapshot/mkv8snapshot.pro
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,6 @@ CONFIG += console
CONFIG += warn_off

DESTDIR = ../../../bin
INCLUDEPATH += .
DEPENDPATH += .
LIBS =
OBJECTS_DIR = .

Expand Down
6 changes: 1 addition & 5 deletions src/v8/v8.pro
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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)
Expand Down
4 changes: 0 additions & 4 deletions sync.profile
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down

0 comments on commit f061136

Please sign in to comment.