diff options
| author | axis <qt-info@nokia.com> | 2010-02-16 12:53:07 +0100 |
|---|---|---|
| committer | axis <qt-info@nokia.com> | 2010-02-16 12:53:07 +0100 |
| commit | 15b08dffc1354bc816b04901a7442679382b0935 (patch) | |
| tree | 783af85b75f9de3ab10902c5ba66cf5e22b2fe61 /.gitignore | |
| parent | 9f5b02406f38fe02a27de7843b9f8a11232d2064 (diff) | |
| parent | 9d174f13e48730ac06aa429e0f011a02b333025e (diff) | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public
Conflicts:
configure
mkspecs/common/symbian/symbian.conf
mkspecs/features/symbian/application_icon.prf
qmake/generators/makefile.cpp
qmake/generators/symbian/initprojectdeploy_symbian.cpp
qmake/generators/symbian/symmake.cpp
tools/assistant/tools/assistant/assistant.pro
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore index 6eeb8c6622..c232a0d01a 100644 --- a/.gitignore +++ b/.gitignore @@ -5,15 +5,20 @@ examples/*/*/* !examples/*/*/*[.]* !examples/*/*/README examples/*/*/*[.]app +!examples/declarative/* demos/*/* !demos/*/*[.]* demos/*/*[.]app +!demos/declarative/* config.tests/*/*/* !config.tests/*/*/*[.]* config.tests/*/*/*[.]app +callgrind.out.* +pcviewer.cfg *~ *.a +*.la *.core *.moc *.o @@ -42,10 +47,12 @@ Makefile* *.prl *.app *.pro.user +*.gcov bin/Qt*.dll bin/assistant* bin/designer* bin/dumpcpp* +bin/duiviewer* bin/idc* bin/linguist* bin/lrelease* @@ -72,6 +79,12 @@ bin/cetest* bin/collectiongenerator bin/helpconverter bin/helpgenerator +bin/kmap2qmap* +bin/qlalr* +bin/qmlconv* +bin/qmldebugger* +bin/qmlviewer* +bin/qttracereplay* configure.cache config.status mkspecs/default @@ -94,6 +107,7 @@ tests/auto/qprocess/fileWriterProcess.txt .com.apple.timemachine.supported tests/auto/qlibrary/libmylib.so* tests/auto/qresourceengine/runtime_resource.rcc +tools/qtestlib/chart/chart* tools/qtestlib/updater/updater* tools/activeqt/testcon/testcon.tlb translations/*.qm |