diff options
| author | Samuel Rødal <samuel.rodal@nokia.com> | 2011-08-30 11:51:17 +0200 |
|---|---|---|
| committer | Samuel Rødal <samuel.rodal@nokia.com> | 2011-08-30 11:51:20 +0200 |
| commit | 42f2da5e6b543e698fc4f036c45ebb15078409c8 (patch) | |
| tree | 2d688b1a812d8410d4ae85283d5e413957000e11 /sync.profile | |
| parent | e9962cc300a805ce09a02ce0c9ae23ceaf8073bb (diff) | |
| parent | 009f3d14045e2e2a6eff8c87a8da9eaa621c5249 (diff) | |
Merge remote branch 'gerrit/master' into refactor
Conflicts:
src/src.pro
Change-Id: Ic04fb170b82e86dc3cef6fe979f8fb709db10daf
Diffstat (limited to 'sync.profile')
| -rw-r--r-- | sync.profile | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/sync.profile b/sync.profile index c830612cd3..e0d23ac3bf 100644 --- a/sync.profile +++ b/sync.profile @@ -4,6 +4,7 @@ "QtPrintSupport" => "$basedir/src/printsupport", "QtOpenGL" => "$basedir/src/opengl", "QtCore" => "$basedir/src/corelib", + "QtV8" => "$basedir/src/v8", "QtXml" => "$basedir/src/xml", "QtSql" => "$basedir/src/sql", "QtNetwork" => "$basedir/src/network", @@ -14,6 +15,10 @@ "QtPlatformSupport" => "$basedir/src/platformsupport", ); %moduleheaders = ( # restrict the module headers to those found in relative path + "QtV8" => "../3rdparty/v8/include", +); +@allmoduleheadersprivate = ( + "QtV8" ); %classnames = ( "qglobal.h" => "QtGlobal", @@ -38,6 +43,7 @@ "qtopenvgversion.h" => "QtOpenVGVersion", "qtsqlversion.h" => "QtSqlVersion", "qttestversion.h" => "QtTestVersion", + "qtv8version.h" => "QtV8Version", "qtxmlversion.h" => "QtXmlVersion", ); %mastercontent = ( @@ -61,6 +67,7 @@ "QtOpenGL" => "$basedir/src/modules/qt_opengl.pri", "QtSql" => "$basedir/src/modules/qt_sql.pri", "QtTest" => "$basedir/src/modules/qt_testlib.pri", + "QtV8" => "$basedir/src/modules/qt_v8.pri", "QtXml" => "$basedir/src/modules/qt_xml.pri", "QtUiTools" => "$basedir/src/modules/qt_uitools.pri", "QtDesigner" => "$basedir/src/modules/qt_uilib.pri", |