diff options
| author | Michael Brasser <michael.brasser@nokia.com> | 2009-08-26 09:06:36 +1000 |
|---|---|---|
| committer | Michael Brasser <michael.brasser@nokia.com> | 2009-08-26 09:06:36 +1000 |
| commit | 8484fc497f9d02b708cb23adb8ab6102d63a7753 (patch) | |
| tree | eb6aacda7fda551bcfbcfd6b0d192b2389bd094e /.gitignore | |
| parent | 314c6ec54e4cb4e2ec936ada7e0a112a60b87832 (diff) | |
| parent | 1470504e15662acf37bacc58359527f88efc43ab (diff) | |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declarativeui
Conflicts:
configure
configure.exe
mkspecs/features/qt.prf
tools/configure/configureapp.cpp
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 29 |
1 files changed, 29 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore index 2fdd27a361..9e9898eea5 100644 --- a/.gitignore +++ b/.gitignore @@ -40,6 +40,8 @@ tags .DS_Store *.debug Makefile* +!qmake/Makefile.win32* +!qmake/Makefile.unix *.prl *.app *.pro.user @@ -56,6 +58,7 @@ bin/lconvert* bin/moc* bin/pixeltool* bin/qmake* +bin/qdoc3* bin/qt3to4* bin/qtdemo* bin/rcc* @@ -68,6 +71,7 @@ bin/qhelpconverter* bin/qhelpgenerator* bin/qtconfig* bin/xmlpatterns* +bin/cetest* bin/collectiongenerator bin/helpconverter bin/helpgenerator @@ -174,6 +178,31 @@ doc/qch doc-build .rcc .pch + +# Symbian build system generated files +# --------------------- + +ABLD.BAT +bld.inf +*.mmp +*.mk +*.rss +*.loc +!s60main.rss +*.pkg +plugin_commonU.def +*.qtplugin +*.sis +*.sisx + +# Generated by abldfast.bat from devtools. +.abldsteps.* + +# Carbide project files +# --------------------- +.project +.cproject + qtc-debugging-helper src/corelib/lib src/network/lib |