Merge branch 'buildsystem'

Change-Id: I1c898c399cab02bcaeeb2bdf6c86e06aa96c5fe9
meta-qt5 · Jun 19, 2012 · 5572a18 · 5572a18
2 parents 96bf621 + daab0ec
commit 5572a18
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 52 deletions.
diff --git a/qtjsbackend.pro b/qtjsbackend.pro
@@ -1,3 +1,6 @@
+load(configure)
+qtCompileTest(hardfloat)
+
 TEMPLATE = subdirs
 
 module_qtjsbackend_src.subdir = src

diff --git a/src/modules/qt_v8.pri b/src/modules/qt_v8.pri
diff --git a/src/tools/mkv8snapshot/mkv8snapshot.pro b/src/tools/mkv8snapshot/mkv8snapshot.pro
@@ -1,26 +1,15 @@
-TEMPLATE        = app
-TARGET          = mkv8snapshot
-QT              =
-CONFIG          -= app_bundle
-CONFIG          -= qt
-CONFIG          += console
-CONFIG          += warn_off
+option(host_build)
+TARGET          = mkv8snapshot$$qtPlatformTargetSuffix()
+CONFIG          -= qt app_bundle
+CONFIG          += console warn_off
 
 DESTDIR         = ../../../bin
-INCLUDEPATH     += .
-DEPENDPATH      += .
 LIBS            =
 OBJECTS_DIR     = .
 
 contains(QT_CONFIG, build_all): CONFIG += build_all
 win32|mac:!macx-xcode: CONFIG += debug_and_release
 
-TARGET = $$TARGET$$qtPlatformTargetSuffix()
-
-cross_compile {
-    equals(QT_ARCH, arm): V8_TARGET_ARCH = arm
-}
-
 include(../../v8/v8.pri)
 
 cross_compile {

diff --git a/src/tools/tools.pro b/src/tools/tools.pro
@@ -1,3 +1,3 @@
 TEMPLATE = subdirs
 SUBDIRS =
-!cross_compile:contains(QT_CONFIG, v8snapshot): SUBDIRS += mkv8snapshot
+contains(QT_CONFIG, v8snapshot): SUBDIRS += mkv8snapshot
diff --git a/src/v8/v8.pri b/src/v8/v8.pri
@@ -151,7 +151,7 @@ SOURCES += \
 
 equals(V8_TARGET_ARCH, arm) {
 DEFINES += V8_TARGET_ARCH_ARM
-contains(config_test_hardfloat, yes) {
+config_hardfloat {
     DEFINES += USE_EABI_HARDFLOAT=1
 } else {
     DEFINES += USE_EABI_HARDFLOAT=0

diff --git a/src/v8/v8.pro b/src/v8/v8.pro
@@ -1,11 +1,9 @@
-load(qt_module)
+load(qt_build_config)
 
 TARGET     = QtV8
-QPRO_PWD   = $$PWD
 QT         =
 
-CONFIG += module
-MODULE_PRI = ../modules/qt_v8.pri
+!contains(QT_CONFIG, static): MODULE_DEFINES += V8_SHARED USING_V8_SHARED
 
 win32-msvc*|win32-icc:QMAKE_LFLAGS += /BASE:0x66000000
 
@@ -20,13 +18,11 @@ 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)
 
-!cross_compile:contains(QT_CONFIG, v8snapshot) {
+contains(QT_CONFIG, v8snapshot) {
     mkv8snapshot.commands = ../../bin/mkv8snapshot$$qtPlatformTargetSuffix() ${QMAKE_FILE_OUT}
     DUMMY_FILE = v8.pro
     mkv8snapshot.input = DUMMY_FILE

diff --git a/sync.profile b/sync.profile
@@ -7,13 +7,6 @@
 @allmoduleheadersprivate = (
     "QtV8"
 );
-%classnames = (
-    "qtv8version.h" => "QtV8Version",
-);
-%mastercontent = ();
-%modulepris = (
-    "QtV8" => "$basedir/src/modules/qt_v8.pri",
-);
 
 # Module dependencies.
 # Every module that is required to build this module should have one entry.
@@ -24,8 +17,3 @@
 %dependencies = (
         "qtbase" => "refs/heads/master",
 );
-
-# compile tests
-%configtests = (
-    "hardfloat" => {},
-);