diff options
author | Gunnar Sletta <gunnar.sletta@nokia.com> | 2011-09-13 08:54:45 +0200 |
---|---|---|
committer | Gunnar Sletta <gunnar.sletta@nokia.com> | 2011-09-13 08:54:45 +0200 |
commit | b62bd0584a7872b6917917009b707785b3abd077 (patch) | |
tree | 9981f274712c098cabbff0c4667672a3934e5393 /tests/auto/corelib/io/qfile/dosfile.txt | |
parent | 5e10745dca1d10025404a9f268f03ae697fb10cc (diff) | |
parent | 97baad65f65783d2b5ff938f6217aec9434f2e5f (diff) |
Merge branch 'refactor'
Conflicts:
mkspecs/qws/linux-lsb-g++/qmake.conf
src/gui/image/qpixmap_mac.cpp
src/gui/painting/qpaintengine_x11.cpp
src/gui/painting/qtessellator.cpp
src/gui/text/qfontengine_qws.cpp
src/gui/text/qfontengine_x11.cpp
src/gui/widgets/qlinecontrol.cpp
src/opengl/qgl.h
src/opengl/qgl_x11egl.cpp
src/plugins/plugins.pro
Change-Id: If52dcd55cd55f2983a756c2f843967702b60a310
Diffstat (limited to 'tests/auto/corelib/io/qfile/dosfile.txt')
-rw-r--r-- | tests/auto/corelib/io/qfile/dosfile.txt | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/tests/auto/corelib/io/qfile/dosfile.txt b/tests/auto/corelib/io/qfile/dosfile.txt new file mode 100644 index 0000000000..47205062e1 --- /dev/null +++ b/tests/auto/corelib/io/qfile/dosfile.txt @@ -0,0 +1,14 @@ +/dev/system/root / reiserfs acl,user_xattr 1 1
+/dev/sda1 /boot ext3 acl,user_xattr 1 2
+/dev/system/home /home reiserfs acl,user_xattr 1 2
+/dev/system/temp /tmp reiserfs acl,user_xattr 1 2
+/dev/sda2 swap swap pri=42 0 0
+devpts /dev/pts devpts mode=0620,gid=5 0 0
+proc /proc proc defaults 0 0
+usbfs /proc/bus/usb usbfs noauto 0 0
+sysfs /sys sysfs noauto 0 0
+/dev/dvd /media/dvd subfs noauto,fs=cdfss,ro,procuid,nosuid,nodev,exec,iocharset=utf8 0 0
+/dev/fd0 /media/floppy subfs noauto,fs=floppyfss,procuid,nodev,nosuid,sync 0 0
+/dev/sdb2 /media/ipod subfs noauto,rw,noexec,nosuid,nodev,sync,procuid,user,iocharset=utf8 1 2
+/dev/sdc1 /media/usbkey vfat rw,nosuid,nodev,sync,procuid,user 1 2
+
|