diff options
| author | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-11-08 18:18:03 +0100 |
|---|---|---|
| committer | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-11-08 18:18:04 +0100 |
| commit | 9520f82e00f26d7d217f7d2777ba2f3cd958d012 (patch) | |
| tree | f892162ab33e9b1b7ffa9819fbec49af86196802 /src/script/script.pro | |
| parent | 9b5cc9e6082366cbe6e76c29d493448ef496b43e (diff) | |
| parent | 78985c5c2c4ec8c7d06bf0c59c5534f968d62f07 (diff) | |
| download | qtscript-9520f82e00f26d7d217f7d2777ba2f3cd958d012.tar.gz | |
Merge remote-tracking branch 'origin/stable' into dev
Change-Id: I1f7bde2c0f17d6cdb2914ef2b3aff271ad584321
Diffstat (limited to 'src/script/script.pro')
| -rw-r--r-- | src/script/script.pro | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/script/script.pro b/src/script/script.pro index 49b6ded..8cb2f62 100644 --- a/src/script/script.pro +++ b/src/script/script.pro @@ -26,7 +26,7 @@ win32-msvc*: QMAKE_CXXFLAGS += -wd4396 -wd4099 wince* { INCLUDEPATH += $$WEBKITDIR/JavaScriptCore/os-wince INCLUDEPATH += $$WEBKITDIR/JavaScriptCore/os-win32 - LIBS += -lmmtimer + LIBS_PRIVATE += -lmmtimer } mac { |