qiurui
/
qtdeclarative
mirror of https://github.com/qt/qtdeclarative.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtdeclarative-staging 

* 'master' of git://scm.dev.nokia.troll.no/qt/qtdeclarative-staging:
  Add QTDECLARATIVE_VERSION macro for qtdeclarative
This commit is contained in:
Qt Continuous Integration System 2011-05-11 23:09:23 +10:00
parent 6c6cf86e7d 14b8b7d3de
commit da66235392
3 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -119,6 +119,8 @@ translations/*.qm
translations/*_untranslated.ts translations/*_untranslated.ts
qrc_*.cpp qrc_*.cpp
src/declarative/qtdeclarativeversion.h
# Test generated files # Test generated files
QObject.log QObject.log
tst_* tst_*

2
src/declarative/declarative.pro
View File

@ -21,6 +21,8 @@ exists("qdeclarative_enable_gcov") {
include($$QT_SOURCE_TREE/src/qbase.pri) include($$QT_SOURCE_TREE/src/qbase.pri)
HEADERS += qtdeclarativeversion.h
#INCLUDEPATH -= $$QMAKE_INCDIR_QT/$$TARGET #INCLUDEPATH -= $$QMAKE_INCDIR_QT/$$TARGET
#DESTDIR=. #DESTDIR=.

1
sync.profile
View File

@ -4,6 +4,7 @@
%moduleheaders = ( # restrict the module headers to those found in relative path %moduleheaders = ( # restrict the module headers to those found in relative path
); );
%classnames = ( %classnames = (
"qtdeclarativeversion.h" => "QtDeclarativeVersion",
); );
%mastercontent = ( %mastercontent = (
"gui" => "#include <QtGui/QtGui>\n", "gui" => "#include <QtGui/QtGui>\n",