diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-05-23 13:14:13 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-05-23 13:14:14 +0200 |
| commit | a5b43f4f03d88d0fca8fb4531f49d1fecff582b7 (patch) | |
| tree | 59c92f012966a40ee7087e8817726cadcb73d9ea /Source/JavaScriptCore/JavaScriptCore.pri | |
| parent | 276fb8ee82394b8fe414196677ce6af4028c5652 (diff) | |
| parent | d7fff220c897ab0eebcd6ca8087efd4b9477beb9 (diff) | |
| download | qtwebkit-a5b43f4f03d88d0fca8fb4531f49d1fecff582b7.tar.gz | |
Merge remote-tracking branch 'origin/stable' into dev
Change-Id: Ibe8c6167bf9d9b6bd689b93ed7f5b94cdbd73ba7
Diffstat (limited to 'Source/JavaScriptCore/JavaScriptCore.pri')
| -rw-r--r-- | Source/JavaScriptCore/JavaScriptCore.pri | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/JavaScriptCore/JavaScriptCore.pri b/Source/JavaScriptCore/JavaScriptCore.pri index 859f4a20d..629a4838c 100644 --- a/Source/JavaScriptCore/JavaScriptCore.pri +++ b/Source/JavaScriptCore/JavaScriptCore.pri @@ -33,7 +33,7 @@ INCLUDEPATH += \ $$JAVASCRIPTCORE_GENERATED_SOURCES_DIR # Pick up the right version of LLIntAssembly.h -macx:INCLUDEPATH+=$$JAVASCRIPTCORE_GENERATED_SOURCES_DIR/$$activeBuildConfig() +macx:INCLUDEPATH+=$$JAVASCRIPTCORE_GENERATED_SOURCES_DIR/$$targetSubDir() win32-*: LIBS += -lwinmm |