diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/declarative/declarative.pro | 6 | ||||
-rw-r--r-- | src/declarative/v8/0001-Add-hashing-and-comparison-methods-to-v8-String.patch (renamed from src/v8/0001-Add-hashing-and-comparison-methods-to-v8-String.patch) | 0 | ||||
-rw-r--r-- | src/declarative/v8/0002-Add-a-bit-field-3-to-Map.patch (renamed from src/v8/0002-Add-a-bit-field-3-to-Map.patch) | 0 | ||||
-rw-r--r-- | src/declarative/v8/0003-Add-a-fallback-mode-for-named-property-interceptors.patch (renamed from src/v8/0003-Add-a-fallback-mode-for-named-property-interceptors.patch) | 0 | ||||
-rw-r--r-- | src/declarative/v8/0004-Generalize-external-object-resources.patch (renamed from src/v8/0004-Generalize-external-object-resources.patch) | 0 | ||||
-rw-r--r-- | src/declarative/v8/0005-Introduce-a-QML-compilation-mode.patch (renamed from src/v8/0005-Introduce-a-QML-compilation-mode.patch) | 0 | ||||
-rw-r--r-- | src/declarative/v8/0006-Allow-access-to-the-calling-script-data.patch (renamed from src/v8/0006-Allow-access-to-the-calling-script-data.patch) | 0 | ||||
-rw-r--r-- | src/declarative/v8/0007-Fix-warnings.patch (renamed from src/v8/0007-Fix-warnings.patch) | 0 | ||||
-rw-r--r-- | src/declarative/v8/0008-Add-custom-object-compare-callback.patch (renamed from src/v8/0008-Add-custom-object-compare-callback.patch) | 0 | ||||
-rw-r--r-- | src/declarative/v8/README (renamed from src/v8/README) | 0 | ||||
-rw-r--r-- | src/declarative/v8/v8.pri (renamed from src/v8/v8.pro) | 14 | ||||
-rw-r--r-- | src/declarative/v8/v8base.pri (renamed from src/v8/v8base.pri) | 2 | ||||
-rwxr-xr-x | src/declarative/v8/wrapcc.pl (renamed from src/v8/wrapcc.pl) | 0 | ||||
-rw-r--r-- | src/src.pro | 2 |
14 files changed, 5 insertions, 19 deletions
diff --git a/src/declarative/declarative.pro b/src/declarative/declarative.pro index a4aab3821e..aa638e468e 100644 --- a/src/declarative/declarative.pro +++ b/src/declarative/declarative.pro @@ -33,6 +33,7 @@ include(debugger/debugger.pri) include(scenegraph/scenegraph.pri) include(items/items.pri) include(particles/particles.pri) +include(v8/v8.pri) symbian: { TARGET.UID3=0x2001E623 @@ -52,8 +53,3 @@ DEFINES += QT_NO_OPENTYPE INCLUDEPATH += $$QT_SOURCE_TREE/src/3rdparty/harfbuzz/src -macx:CONFIG(debug, debug|release) { - QMAKE_LIBS_PRIVATE += -L../v8/ -lv8_debug -} else { - QMAKE_LIBS_PRIVATE += -L../v8/ -lv8 -} diff --git a/src/v8/0001-Add-hashing-and-comparison-methods-to-v8-String.patch b/src/declarative/v8/0001-Add-hashing-and-comparison-methods-to-v8-String.patch index 4596202944..4596202944 100644 --- a/src/v8/0001-Add-hashing-and-comparison-methods-to-v8-String.patch +++ b/src/declarative/v8/0001-Add-hashing-and-comparison-methods-to-v8-String.patch diff --git a/src/v8/0002-Add-a-bit-field-3-to-Map.patch b/src/declarative/v8/0002-Add-a-bit-field-3-to-Map.patch index cb578c0f96..cb578c0f96 100644 --- a/src/v8/0002-Add-a-bit-field-3-to-Map.patch +++ b/src/declarative/v8/0002-Add-a-bit-field-3-to-Map.patch diff --git a/src/v8/0003-Add-a-fallback-mode-for-named-property-interceptors.patch b/src/declarative/v8/0003-Add-a-fallback-mode-for-named-property-interceptors.patch index daa2250a25..daa2250a25 100644 --- a/src/v8/0003-Add-a-fallback-mode-for-named-property-interceptors.patch +++ b/src/declarative/v8/0003-Add-a-fallback-mode-for-named-property-interceptors.patch diff --git a/src/v8/0004-Generalize-external-object-resources.patch b/src/declarative/v8/0004-Generalize-external-object-resources.patch index 56e5e371fd..56e5e371fd 100644 --- a/src/v8/0004-Generalize-external-object-resources.patch +++ b/src/declarative/v8/0004-Generalize-external-object-resources.patch diff --git a/src/v8/0005-Introduce-a-QML-compilation-mode.patch b/src/declarative/v8/0005-Introduce-a-QML-compilation-mode.patch index 7ec10e9448..7ec10e9448 100644 --- a/src/v8/0005-Introduce-a-QML-compilation-mode.patch +++ b/src/declarative/v8/0005-Introduce-a-QML-compilation-mode.patch diff --git a/src/v8/0006-Allow-access-to-the-calling-script-data.patch b/src/declarative/v8/0006-Allow-access-to-the-calling-script-data.patch index 7af81c3f69..7af81c3f69 100644 --- a/src/v8/0006-Allow-access-to-the-calling-script-data.patch +++ b/src/declarative/v8/0006-Allow-access-to-the-calling-script-data.patch diff --git a/src/v8/0007-Fix-warnings.patch b/src/declarative/v8/0007-Fix-warnings.patch index 2efc8331aa..2efc8331aa 100644 --- a/src/v8/0007-Fix-warnings.patch +++ b/src/declarative/v8/0007-Fix-warnings.patch diff --git a/src/v8/0008-Add-custom-object-compare-callback.patch b/src/declarative/v8/0008-Add-custom-object-compare-callback.patch index 659cf4c167..659cf4c167 100644 --- a/src/v8/0008-Add-custom-object-compare-callback.patch +++ b/src/declarative/v8/0008-Add-custom-object-compare-callback.patch diff --git a/src/v8/README b/src/declarative/v8/README index 2dc39705aa..2dc39705aa 100644 --- a/src/v8/README +++ b/src/declarative/v8/README diff --git a/src/v8/v8.pro b/src/declarative/v8/v8.pri index bc1837a1c2..c526fccbe6 100644 --- a/src/v8/v8.pro +++ b/src/declarative/v8/v8.pri @@ -1,15 +1,3 @@ -TEMPLATE = lib -CONFIG += staticlib - -CONFIG += building-libs - -QT = - -win32|mac:!macx-xcode:CONFIG += debug_and_release -macx:CONFIG(debug, debug|release) { - TARGET = v8_debug -} - equals(QT_ARCH, x86_64)|contains(CONFIG, x86_64):CONFIG += arch_x86_64 else:equals(QT_ARCH, "i386"):CONFIG += arch_i386 else:equals(QT_ARCH, "arm"):CONFIG += arch_arm @@ -18,6 +6,8 @@ include($$PWD/v8base.pri) V8_GENERATED_SOURCES_DIR = generated +DEFINES += V8_SHARED BUILDING_V8_SHARED + # this maybe removed in future DEFINES += ENABLE_DEBUGGER_SUPPORT diff --git a/src/v8/v8base.pri b/src/declarative/v8/v8base.pri index f57663ed3e..209e4d5127 100644 --- a/src/v8/v8base.pri +++ b/src/declarative/v8/v8base.pri @@ -1,6 +1,6 @@ V8DIR = $$(V8DIR) isEmpty(V8DIR) { - V8DIR = $$PWD/../3rdparty/v8 + V8DIR = $$PWD/../../3rdparty/v8 } else { message(using external V8 from $$V8DIR) } diff --git a/src/v8/wrapcc.pl b/src/declarative/v8/wrapcc.pl index 463ab059ba..463ab059ba 100755 --- a/src/v8/wrapcc.pl +++ b/src/declarative/v8/wrapcc.pl diff --git a/src/src.pro b/src/src.pro index 1fa93c5b34..a8a33a7fd6 100644 --- a/src/src.pro +++ b/src/src.pro @@ -1,5 +1,5 @@ TEMPLATE = subdirs CONFIG += ordered -SUBDIRS += v8 declarative qtquick1 plugins +SUBDIRS += declarative qtquick1 plugins contains(QT_CONFIG, qmltest): SUBDIRS += qmltest SUBDIRS += imports |