summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xbin/syncqt3
-rw-r--r--config.tests/arch/arch.cpp1
-rw-r--r--config.tests/unix/directfb/directfb.cpp51
-rw-r--r--config.tests/unix/directfb/directfb.pro3
-rwxr-xr-xconfigure110
-rw-r--r--dist/changes-5.0.033
-rw-r--r--doc/global/qt-cpp-ignore.qdocconf54
-rw-r--r--doc/global/style/offline.css622
-rw-r--r--doc/src/snippets/code/doc_src_examples_textfinder.pro40
-rw-r--r--doc/src/snippets/code/doc_src_qplugin.pro44
-rw-r--r--doc/src/snippets/code/doc_src_qtgui.pro40
-rw-r--r--doc/src/snippets/code/doc_src_qtnetwork.pro40
-rw-r--r--doc/src/snippets/code/doc_src_qtsql.pro43
-rw-r--r--doc/src/snippets/code/doc_src_qtxml.pro43
-rw-r--r--examples/dbus/complexpingpong/complexping.cpp2
-rw-r--r--examples/dbus/complexpingpong/complexpong.h2
-rw-r--r--examples/dbus/complexpingpong/ping-common.h2
-rw-r--r--examples/dbus/dbus-chat/chat.cpp4
-rw-r--r--examples/dbus/dbus-chat/chat_adaptor.cpp2
-rw-r--r--examples/dbus/dbus-chat/chat_adaptor.h8
-rw-r--r--examples/dbus/dbus-chat/chat_interface.cpp2
-rw-r--r--examples/dbus/dbus-chat/chat_interface.h6
-rw-r--r--examples/dbus/dbus-chat/com.trolltech.chat.xml2
-rw-r--r--examples/dbus/dbus-chat/dbus-chat.pro4
-rw-r--r--examples/dbus/pingpong/ping-common.h2
-rw-r--r--examples/dbus/remotecontrolledcar/car/car.xml2
-rw-r--r--examples/dbus/remotecontrolledcar/car/car_adaptor.cpp8
-rw-r--r--examples/dbus/remotecontrolledcar/car/car_adaptor.h6
-rw-r--r--examples/dbus/remotecontrolledcar/car/main.cpp2
-rw-r--r--examples/dbus/remotecontrolledcar/controller/car.xml2
-rw-r--r--examples/dbus/remotecontrolledcar/controller/car_interface.h4
-rw-r--r--examples/dbus/remotecontrolledcar/controller/controller.cpp2
-rw-r--r--examples/dialogs/findfiles/window.cpp2
-rw-r--r--examples/graphicsview/elasticnodes/graphwidget.cpp2
-rw-r--r--examples/itemviews/chart/pieview.cpp2
-rw-r--r--examples/itemviews/fetchmore/filelistmodel.cpp3
-rw-r--r--examples/itemviews/interview/main.cpp4
-rw-r--r--examples/itemviews/pixelator/imagemodel.cpp3
-rw-r--r--examples/mainwindows/mdi/mainwindow.cpp14
-rw-r--r--examples/mainwindows/mdi/mainwindow.h4
-rw-r--r--examples/opengl/hellowindow/hellowindow.cpp13
-rw-r--r--examples/opengl/hellowindow/hellowindow.h2
-rw-r--r--examples/sql/masterdetail/mainwindow.cpp2
-rw-r--r--examples/tools/completer/mainwindow.cpp4
-rw-r--r--examples/tools/plugandpaint/mainwindow.cpp8
-rw-r--r--examples/tools/plugandpaintplugins/extrafilters/extrafiltersplugin.cpp4
-rw-r--r--examples/tools/settingseditor/locationdialog.cpp2
-rw-r--r--examples/tools/settingseditor/settingstree.cpp4
-rw-r--r--examples/widgets/charactermap/mainwindow.cpp9
-rw-r--r--examples/widgets/charactermap/mainwindow.h4
-rw-r--r--examples/widgets/icons/mainwindow.cpp6
-rw-r--r--examples/widgets/scribble/mainwindow.cpp8
-rw-r--r--mkspecs/cmake/Qt5BasicConfig.cmake.in23
-rw-r--r--mkspecs/common/gcc-base-ios.conf33
-rw-r--r--mkspecs/common/gcc-base.conf1
-rw-r--r--mkspecs/common/ios.conf21
-rw-r--r--mkspecs/common/ios/GLES/gl.h (renamed from src/plugins/platforms/openkode/shaders/frag.glslf)12
-rw-r--r--mkspecs/common/ios/GLES2/gl2.h43
-rw-r--r--mkspecs/common/ios/arch.conf84
-rw-r--r--mkspecs/common/ios/clang.conf47
-rw-r--r--mkspecs/common/ios/g++.conf21
-rw-r--r--mkspecs/common/ios/llvm.conf31
-rw-r--r--mkspecs/common/ios/qmake.conf66
-rw-r--r--mkspecs/common/ios/qplatformdefs.h (renamed from src/plugins/platforms/openvglite/qgraphicssystem_vglite.h)85
-rw-r--r--mkspecs/common/ios/versions.conf184
-rw-r--r--mkspecs/common/qcc-base-qnx-armv7le.conf25
-rw-r--r--mkspecs/common/qcc-base-qnx-x86.conf25
-rw-r--r--mkspecs/common/qcc-base-qnx.conf4
-rw-r--r--mkspecs/devices/linux-archos-gen8-g++/qmake.conf63
-rw-r--r--mkspecs/devices/linux-archos-gen8-g++/qplatformdefs.h (renamed from mkspecs/freebsd-g++40/qplatformdefs.h)2
-rw-r--r--mkspecs/devices/linux-arm-amlogic-8726M-g++/qeglfshooks_8726m.cpp3
-rw-r--r--mkspecs/devices/linux-arm-amlogic-8726M-g++/qmake.conf2
-rw-r--r--mkspecs/devices/linux-arm-trident-pnx8473-g++/qmake.conf2
-rw-r--r--mkspecs/devices/linux-beagleboard-g++/qmake.conf59
-rw-r--r--mkspecs/devices/linux-beagleboard-g++/qplatformdefs.h42
-rw-r--r--mkspecs/devices/linux-mipsel-broadcom-97425-g++/qdirectfbeglhooks_bcm97425.cpp3
-rw-r--r--mkspecs/devices/linux-mipsel-broadcom-97425-g++/qmake.conf2
-rw-r--r--mkspecs/devices/linux-n9-g++/qmake.conf34
-rw-r--r--mkspecs/devices/linux-n9-g++/qplatformdefs.h42
-rw-r--r--mkspecs/devices/linux-rasp-pi-g++/qeglfshooks_pi.cpp4
-rw-r--r--mkspecs/devices/linux-rasp-pi-g++/qmake.conf2
-rw-r--r--mkspecs/devices/linux-rasp-pi-g++/qplatformdefs.h2
-rw-r--r--mkspecs/devices/linux-sh4-stmicro-ST7108-g++/qmake.conf2
-rw-r--r--mkspecs/devices/linux-sh4-stmicro-ST7540-g++/qmake.conf2
-rw-r--r--mkspecs/features/create_cmake.prf18
-rw-r--r--mkspecs/features/declarative_debug.prf2
-rw-r--r--mkspecs/features/device_config.prf5
-rw-r--r--mkspecs/features/qt.prf27
-rw-r--r--mkspecs/features/qt_module_config.prf1
-rw-r--r--mkspecs/features/quick1_debug.prf1
-rw-r--r--mkspecs/freebsd-g++/qplatformdefs.h20
-rw-r--r--mkspecs/freebsd-g++34/qmake.conf84
-rw-r--r--mkspecs/freebsd-g++40/qmake.conf84
-rw-r--r--mkspecs/freebsd-g++46/qmake.conf61
-rw-r--r--mkspecs/freebsd-g++46/qplatformdefs.h (renamed from mkspecs/freebsd-g++34/qplatformdefs.h)0
-rw-r--r--mkspecs/unsupported/blackberry-armv7le-qcc/qmake.conf4
-rw-r--r--mkspecs/unsupported/blackberry-x86-qcc/qmake.conf2
-rw-r--r--mkspecs/unsupported/integrity-ghs/qplatformdefs.h4
-rw-r--r--mkspecs/unsupported/macx-iosdevice-clang-legacy/qmake.conf35
-rw-r--r--mkspecs/unsupported/macx-iosdevice-clang-legacy/qplatformdefs.h42
-rw-r--r--mkspecs/unsupported/macx-iosdevice-clang/qmake.conf35
-rw-r--r--mkspecs/unsupported/macx-iosdevice-clang/qplatformdefs.h42
-rw-r--r--mkspecs/unsupported/macx-iosdevice-g++-legacy/qmake.conf35
-rw-r--r--mkspecs/unsupported/macx-iosdevice-g++-legacy/qplatformdefs.h42
-rw-r--r--mkspecs/unsupported/macx-iosdevice-g++/qmake.conf35
-rw-r--r--mkspecs/unsupported/macx-iosdevice-g++/qplatformdefs.h42
-rw-r--r--mkspecs/unsupported/macx-iosdevice-llvm-legacy/qmake.conf35
-rw-r--r--mkspecs/unsupported/macx-iosdevice-llvm-legacy/qplatformdefs.h42
-rw-r--r--mkspecs/unsupported/macx-iosdevice-llvm/qmake.conf35
-rw-r--r--mkspecs/unsupported/macx-iosdevice-llvm/qplatformdefs.h42
-rw-r--r--mkspecs/unsupported/macx-iossimulator-clang-legacy/qmake.conf6
-rw-r--r--mkspecs/unsupported/macx-iossimulator-clang-legacy/qplatformdefs.h42
-rw-r--r--mkspecs/unsupported/macx-iossimulator-clang/qmake.conf6
-rw-r--r--mkspecs/unsupported/macx-iossimulator-clang/qplatformdefs.h42
-rw-r--r--mkspecs/unsupported/macx-iossimulator-g++-legacy/qmake.conf33
-rw-r--r--mkspecs/unsupported/macx-iossimulator-g++-legacy/qplatformdefs.h42
-rw-r--r--mkspecs/unsupported/macx-iossimulator-g++/qmake.conf33
-rw-r--r--mkspecs/unsupported/macx-iossimulator-g++/qplatformdefs.h42
-rw-r--r--mkspecs/unsupported/macx-iossimulator-llvm-legacy/qmake.conf33
-rw-r--r--mkspecs/unsupported/macx-iossimulator-llvm-legacy/qplatformdefs.h42
-rw-r--r--mkspecs/unsupported/macx-iossimulator-llvm/qmake.conf33
-rw-r--r--mkspecs/unsupported/macx-iossimulator-llvm/qplatformdefs.h42
-rw-r--r--mkspecs/unsupported/qnx-armv7le-qcc/qmake.conf22
-rw-r--r--mkspecs/unsupported/qnx-x86-qcc/qmake.conf22
-rw-r--r--qmake/generators/makefile.cpp3
-rw-r--r--qmake/generators/win32/msbuild_objectmodel.cpp7
-rw-r--r--qmake/generators/win32/msvc_objectmodel.cpp1
-rw-r--r--qmake/generators/win32/msvc_vcproj.cpp3
-rw-r--r--qmake/generators/win32/winmakefile.cpp12
-rw-r--r--qmake/project.cpp2
-rw-r--r--qmake/project.h13
-rw-r--r--src/3rdparty/harfbuzz/src/harfbuzz-shaper.cpp48
-rw-r--r--src/3rdparty/libjpeg/jinclude.h2
-rw-r--r--src/3rdparty/libpng/ANNOUNCE112
-rw-r--r--src/3rdparty/libpng/CHANGES647
-rw-r--r--src/3rdparty/libpng/CMakeLists.txt406
-rw-r--r--src/3rdparty/libpng/INSTALL20
-rw-r--r--src/3rdparty/libpng/LICENSE4
-rw-r--r--src/3rdparty/libpng/README13
-rw-r--r--src/3rdparty/libpng/TODO27
-rw-r--r--src/3rdparty/libpng/config.guess1501
-rw-r--r--src/3rdparty/libpng/config.h.in86
-rw-r--r--src/3rdparty/libpng/config.sub1705
-rw-r--r--src/3rdparty/libpng/configure.ac167
-rw-r--r--src/3rdparty/libpng/example.c843
-rw-r--r--src/3rdparty/libpng/libpng-manual.txt1022
-rw-r--r--src/3rdparty/libpng/libpng.35376
-rw-r--r--src/3rdparty/libpng/libpng.pc.in11
-rw-r--r--src/3rdparty/libpng/libpngpf.330
-rw-r--r--src/3rdparty/libpng/png.574
-rw-r--r--src/3rdparty/libpng/png.c922
-rw-r--r--src/3rdparty/libpng/png.h898
-rw-r--r--src/3rdparty/libpng/pngconf.h174
-rw-r--r--src/3rdparty/libpng/pngdebug.h6
-rw-r--r--src/3rdparty/libpng/pngerror.c278
-rw-r--r--src/3rdparty/libpng/pngget.c120
-rw-r--r--src/3rdparty/libpng/pnginfo.h1
-rw-r--r--src/3rdparty/libpng/pnglibconf.h269
-rw-r--r--src/3rdparty/libpng/pngmem.c37
-rw-r--r--src/3rdparty/libpng/pngpread.c778
-rw-r--r--src/3rdparty/libpng/pngpriv.h755
-rw-r--r--src/3rdparty/libpng/pngread.c527
-rw-r--r--src/3rdparty/libpng/pngrtran.c2508
-rw-r--r--src/3rdparty/libpng/pngrutil.c1531
-rw-r--r--src/3rdparty/libpng/pngset.c144
-rw-r--r--src/3rdparty/libpng/pngstruct.h103
-rw-r--r--src/3rdparty/libpng/pngtest.c1787
-rw-r--r--src/3rdparty/libpng/pngtrans.c352
-rw-r--r--src/3rdparty/libpng/pngvalid.c6658
-rw-r--r--src/3rdparty/libpng/pngwrite.c256
-rw-r--r--src/3rdparty/libpng/pngwtran.c30
-rw-r--r--src/3rdparty/libpng/pngwutil.c581
-rw-r--r--src/3rdparty/zlib/gzguts.h8
-rw-r--r--src/concurrent/qfuturewatcher.cpp14
-rw-r--r--src/concurrent/qfuturewatcher.h4
-rw-r--r--src/corelib/arch/qatomic_sparc.h16
-rw-r--r--src/corelib/codecs/codecs.qdoc14
-rw-r--r--src/corelib/codecs/qtextcodec.cpp6
-rw-r--r--src/corelib/corelib.pro3
-rw-r--r--src/corelib/doc/doc.pri3
-rw-r--r--src/corelib/doc/images/abstract-connections.png (renamed from doc/src/images/abstract-connections.png)bin19849 -> 19849 bytes
-rw-r--r--src/corelib/doc/images/brush-styles.png (renamed from doc/src/images/brush-styles.png)bin13980 -> 13980 bytes
-rw-r--r--src/corelib/doc/images/cursor-arrow.png (renamed from doc/src/images/cursor-arrow.png)bin171 -> 171 bytes
-rw-r--r--src/corelib/doc/images/cursor-busy.png (renamed from doc/src/images/cursor-busy.png)bin201 -> 201 bytes
-rw-r--r--src/corelib/doc/images/cursor-closedhand.png (renamed from doc/src/images/cursor-closedhand.png)bin147 -> 147 bytes
-rw-r--r--src/corelib/doc/images/cursor-cross.png (renamed from doc/src/images/cursor-cross.png)bin130 -> 130 bytes
-rw-r--r--src/corelib/doc/images/cursor-forbidden.png (renamed from doc/src/images/cursor-forbidden.png)bin199 -> 199 bytes
-rw-r--r--src/corelib/doc/images/cursor-hand.png (renamed from doc/src/images/cursor-hand.png)bin159 -> 159 bytes
-rw-r--r--src/corelib/doc/images/cursor-hsplit.png (renamed from doc/src/images/cursor-hsplit.png)bin155 -> 155 bytes
-rw-r--r--src/corelib/doc/images/cursor-ibeam.png (renamed from doc/src/images/cursor-ibeam.png)bin124 -> 124 bytes
-rw-r--r--src/corelib/doc/images/cursor-openhand.png (renamed from doc/src/images/cursor-openhand.png)bin160 -> 160 bytes
-rw-r--r--src/corelib/doc/images/cursor-sizeall.png (renamed from doc/src/images/cursor-sizeall.png)bin174 -> 174 bytes
-rw-r--r--src/corelib/doc/images/cursor-sizeb.png (renamed from doc/src/images/cursor-sizeb.png)bin161 -> 161 bytes
-rw-r--r--src/corelib/doc/images/cursor-sizef.png (renamed from doc/src/images/cursor-sizef.png)bin161 -> 161 bytes
-rw-r--r--src/corelib/doc/images/cursor-sizeh.png (renamed from doc/src/images/cursor-sizeh.png)bin145 -> 145 bytes
-rw-r--r--src/corelib/doc/images/cursor-sizev.png (renamed from doc/src/images/cursor-sizev.png)bin141 -> 141 bytes
-rw-r--r--src/corelib/doc/images/cursor-uparrow.png (renamed from doc/src/images/cursor-uparrow.png)bin132 -> 132 bytes
-rw-r--r--src/corelib/doc/images/cursor-vsplit.png (renamed from doc/src/images/cursor-vsplit.png)bin161 -> 161 bytes
-rw-r--r--src/corelib/doc/images/cursor-wait.png (renamed from doc/src/images/cursor-wait.png)bin172 -> 172 bytes
-rw-r--r--src/corelib/doc/images/cursor-whatsthis.png (renamed from doc/src/images/cursor-whatsthis.png)bin191 -> 191 bytes
-rw-r--r--src/corelib/doc/images/javaiterators1.png (renamed from doc/src/images/javaiterators1.png)bin1062 -> 1062 bytes
-rw-r--r--src/corelib/doc/images/javaiterators2.png (renamed from doc/src/images/javaiterators2.png)bin2011 -> 2011 bytes
-rw-r--r--src/corelib/doc/images/modelindex-no-parent.png (renamed from doc/src/images/modelindex-no-parent.png)bin7407 -> 7407 bytes
-rw-r--r--src/corelib/doc/images/modelview-begin-append-columns.png (renamed from doc/src/images/modelview-begin-append-columns.png)bin12798 -> 12798 bytes
-rw-r--r--src/corelib/doc/images/modelview-begin-append-rows.png (renamed from doc/src/images/modelview-begin-append-rows.png)bin8967 -> 8967 bytes
-rw-r--r--src/corelib/doc/images/modelview-begin-insert-columns.png (renamed from doc/src/images/modelview-begin-insert-columns.png)bin14476 -> 14476 bytes
-rw-r--r--src/corelib/doc/images/modelview-begin-insert-rows.png (renamed from doc/src/images/modelview-begin-insert-rows.png)bin12565 -> 12565 bytes
-rw-r--r--src/corelib/doc/images/modelview-begin-remove-columns.png (renamed from doc/src/images/modelview-begin-remove-columns.png)bin14518 -> 14518 bytes
-rw-r--r--src/corelib/doc/images/modelview-begin-remove-rows.png (renamed from doc/src/images/modelview-begin-remove-rows.png)bin10896 -> 10896 bytes
-rw-r--r--src/corelib/doc/images/modelview-move-rows-1.png (renamed from doc/src/images/modelview-move-rows-1.png)bin19709 -> 19709 bytes
-rw-r--r--src/corelib/doc/images/modelview-move-rows-2.png (renamed from doc/src/images/modelview-move-rows-2.png)bin19385 -> 19385 bytes
-rw-r--r--src/corelib/doc/images/modelview-move-rows-3.png (renamed from doc/src/images/modelview-move-rows-3.png)bin9281 -> 9281 bytes
-rw-r--r--src/corelib/doc/images/modelview-move-rows-4.png (renamed from doc/src/images/modelview-move-rows-4.png)bin9381 -> 9381 bytes
-rw-r--r--src/corelib/doc/images/qeasingcurve-inback.png (renamed from doc/src/images/qeasingcurve-inback.png)bin2808 -> 2808 bytes
-rw-r--r--src/corelib/doc/images/qeasingcurve-inbounce.png (renamed from doc/src/images/qeasingcurve-inbounce.png)bin3154 -> 3154 bytes
-rw-r--r--src/corelib/doc/images/qeasingcurve-incirc.png (renamed from doc/src/images/qeasingcurve-incirc.png)bin2605 -> 2605 bytes
-rw-r--r--src/corelib/doc/images/qeasingcurve-incubic.png (renamed from doc/src/images/qeasingcurve-incubic.png)bin2722 -> 2722 bytes
-rw-r--r--src/corelib/doc/images/qeasingcurve-inelastic.png (renamed from doc/src/images/qeasingcurve-inelastic.png)bin3304 -> 3304 bytes
-rw-r--r--src/corelib/doc/images/qeasingcurve-inexpo.png (renamed from doc/src/images/qeasingcurve-inexpo.png)bin2675 -> 2675 bytes
-rw-r--r--src/corelib/doc/images/qeasingcurve-inoutback.png (renamed from doc/src/images/qeasingcurve-inoutback.png)bin3241 -> 3241 bytes
-rw-r--r--src/corelib/doc/images/qeasingcurve-inoutbounce.png (renamed from doc/src/images/qeasingcurve-inoutbounce.png)bin3386 -> 3386 bytes
-rw-r--r--src/corelib/doc/images/qeasingcurve-inoutcirc.png (renamed from doc/src/images/qeasingcurve-inoutcirc.png)bin2843 -> 2843 bytes
-rw-r--r--src/corelib/doc/images/qeasingcurve-inoutcubic.png (renamed from doc/src/images/qeasingcurve-inoutcubic.png)bin2931 -> 2931 bytes
-rw-r--r--src/corelib/doc/images/qeasingcurve-inoutelastic.png (renamed from doc/src/images/qeasingcurve-inoutelastic.png)bin3461 -> 3461 bytes
-rw-r--r--src/corelib/doc/images/qeasingcurve-inoutexpo.png (renamed from doc/src/images/qeasingcurve-inoutexpo.png)bin3004 -> 3004 bytes
-rw-r--r--src/corelib/doc/images/qeasingcurve-inoutquad.png (renamed from doc/src/images/qeasingcurve-inoutquad.png)bin2893 -> 2893 bytes
-rw-r--r--src/corelib/doc/images/qeasingcurve-inoutquart.png (renamed from doc/src/images/qeasingcurve-inoutquart.png)bin2925 -> 2925 bytes
-rw-r--r--src/corelib/doc/images/qeasingcurve-inoutquint.png (renamed from doc/src/images/qeasingcurve-inoutquint.png)bin2823 -> 2823 bytes
-rw-r--r--src/corelib/doc/images/qeasingcurve-inoutsine.png (renamed from doc/src/images/qeasingcurve-inoutsine.png)bin2891 -> 2891 bytes
-rw-r--r--src/corelib/doc/images/qeasingcurve-inquad.png (renamed from doc/src/images/qeasingcurve-inquad.png)bin2733 -> 2733 bytes
-rw-r--r--src/corelib/doc/images/qeasingcurve-inquart.png (renamed from doc/src/images/qeasingcurve-inquart.png)bin2727 -> 2727 bytes
-rw-r--r--src/corelib/doc/images/qeasingcurve-inquint.png (renamed from doc/src/images/qeasingcurve-inquint.png)bin2630 -> 2630 bytes
-rw-r--r--src/corelib/doc/images/qeasingcurve-insine.png (renamed from doc/src/images/qeasingcurve-insine.png)bin2567 -> 2567 bytes
-rw-r--r--src/corelib/doc/images/qeasingcurve-linear.png (renamed from doc/src/images/qeasingcurve-linear.png)bin2318 -> 2318 bytes
-rw-r--r--src/corelib/doc/images/qeasingcurve-outback.png (renamed from doc/src/images/qeasingcurve-outback.png)bin2852 -> 2852 bytes
-rw-r--r--src/corelib/doc/images/qeasingcurve-outbounce.png (renamed from doc/src/images/qeasingcurve-outbounce.png)bin3360 -> 3360 bytes
-rw-r--r--src/corelib/doc/images/qeasingcurve-outcirc.png (renamed from doc/src/images/qeasingcurve-outcirc.png)bin2796 -> 2796 bytes
-rw-r--r--src/corelib/doc/images/qeasingcurve-outcubic.png (renamed from doc/src/images/qeasingcurve-outcubic.png)bin2792 -> 2792 bytes
-rw-r--r--src/corelib/doc/images/qeasingcurve-outelastic.png (renamed from doc/src/images/qeasingcurve-outelastic.png)bin3423 -> 3423 bytes
-rw-r--r--src/corelib/doc/images/qeasingcurve-outexpo.png (renamed from doc/src/images/qeasingcurve-outexpo.png)bin2803 -> 2803 bytes
-rw-r--r--src/corelib/doc/images/qeasingcurve-outinback.png (renamed from doc/src/images/qeasingcurve-outinback.png)bin3026 -> 3026 bytes
-rw-r--r--src/corelib/doc/images/qeasingcurve-outinbounce.png (renamed from doc/src/images/qeasingcurve-outinbounce.png)bin3629 -> 3629 bytes
-rw-r--r--src/corelib/doc/images/qeasingcurve-outincirc.png (renamed from doc/src/images/qeasingcurve-outincirc.png)bin2822 -> 2822 bytes
-rw-r--r--src/corelib/doc/images/qeasingcurve-outincubic.png (renamed from doc/src/images/qeasingcurve-outincubic.png)bin2872 -> 2872 bytes
-rw-r--r--src/corelib/doc/images/qeasingcurve-outinelastic.png (renamed from doc/src/images/qeasingcurve-outinelastic.png)bin3941 -> 3941 bytes
-rw-r--r--src/corelib/doc/images/qeasingcurve-outinexpo.png (renamed from doc/src/images/qeasingcurve-outinexpo.png)bin2923 -> 2923 bytes
-rw-r--r--src/corelib/doc/images/qeasingcurve-outinquad.png (renamed from doc/src/images/qeasingcurve-outinquad.png)bin2858 -> 2858 bytes
-rw-r--r--src/corelib/doc/images/qeasingcurve-outinquart.png (renamed from doc/src/images/qeasingcurve-outinquart.png)bin2830 -> 2830 bytes
-rw-r--r--src/corelib/doc/images/qeasingcurve-outinquint.png (renamed from doc/src/images/qeasingcurve-outinquint.png)bin2724 -> 2724 bytes
-rw-r--r--src/corelib/doc/images/qeasingcurve-outinsine.png (renamed from doc/src/images/qeasingcurve-outinsine.png)bin2817 -> 2817 bytes
-rw-r--r--src/corelib/doc/images/qeasingcurve-outquad.png (renamed from doc/src/images/qeasingcurve-outquad.png)bin2760 -> 2760 bytes
-rw-r--r--src/corelib/doc/images/qeasingcurve-outquart.png (renamed from doc/src/images/qeasingcurve-outquart.png)bin2764 -> 2764 bytes
-rw-r--r--src/corelib/doc/images/qeasingcurve-outquint.png (renamed from doc/src/images/qeasingcurve-outquint.png)bin2687 -> 2687 bytes
-rw-r--r--src/corelib/doc/images/qeasingcurve-outsine.png (renamed from doc/src/images/qeasingcurve-outsine.png)bin2773 -> 2773 bytes
-rw-r--r--src/corelib/doc/images/qimage-scaling.png (renamed from doc/src/images/qimage-scaling.png)bin34785 -> 34785 bytes
-rw-r--r--src/corelib/doc/images/qline-coordinates.png (renamed from doc/src/images/qline-coordinates.png)bin9459 -> 9459 bytes
-rw-r--r--src/corelib/doc/images/qline-point.png (renamed from doc/src/images/qline-point.png)bin8484 -> 8484 bytes
-rw-r--r--src/corelib/doc/images/qlinef-angle-identicaldirection.png (renamed from doc/src/images/qlinef-angle-identicaldirection.png)bin6004 -> 6004 bytes
-rw-r--r--src/corelib/doc/images/qlinef-angle-oppositedirection.png (renamed from doc/src/images/qlinef-angle-oppositedirection.png)bin5834 -> 5834 bytes
-rw-r--r--src/corelib/doc/images/qlinef-bounded.png (renamed from doc/src/images/qlinef-bounded.png)bin4183 -> 4183 bytes
-rw-r--r--src/corelib/doc/images/qlinef-normalvector.png (renamed from doc/src/images/qlinef-normalvector.png)bin9432 -> 9432 bytes
-rw-r--r--src/corelib/doc/images/qlinef-unbounded.png (renamed from doc/src/images/qlinef-unbounded.png)bin3992 -> 3992 bytes
-rw-r--r--src/corelib/doc/images/qpen-bevel.png (renamed from doc/src/images/qpen-bevel.png)bin11527 -> 11527 bytes
-rw-r--r--src/corelib/doc/images/qpen-custom.png (renamed from doc/src/images/qpen-custom.png)bin6254 -> 6254 bytes
-rw-r--r--src/corelib/doc/images/qpen-dash.png (renamed from doc/src/images/qpen-dash.png)bin8221 -> 8221 bytes
-rw-r--r--src/corelib/doc/images/qpen-dashdot.png (renamed from doc/src/images/qpen-dashdot.png)bin5961 -> 5961 bytes
-rw-r--r--src/corelib/doc/images/qpen-dashdotdot.png (renamed from doc/src/images/qpen-dashdotdot.png)bin5999 -> 5999 bytes
-rw-r--r--src/corelib/doc/images/qpen-dot.png (renamed from doc/src/images/qpen-dot.png)bin5386 -> 5386 bytes
-rw-r--r--src/corelib/doc/images/qpen-flat.png (renamed from doc/src/images/qpen-flat.png)bin1885 -> 1885 bytes
-rw-r--r--src/corelib/doc/images/qpen-miter.png (renamed from doc/src/images/qpen-miter.png)bin11734 -> 11734 bytes
-rw-r--r--src/corelib/doc/images/qpen-roundcap.png (renamed from doc/src/images/qpen-roundcap.png)bin1920 -> 1920 bytes
-rw-r--r--src/corelib/doc/images/qpen-roundjoin.png (renamed from doc/src/images/qpen-roundjoin.png)bin11878 -> 11878 bytes
-rw-r--r--src/corelib/doc/images/qpen-solid.png (renamed from doc/src/images/qpen-solid.png)bin7416 -> 7416 bytes
-rw-r--r--src/corelib/doc/images/qpen-square.png (renamed from doc/src/images/qpen-square.png)bin2651 -> 2651 bytes
-rw-r--r--src/corelib/doc/images/qrect-coordinates.png (renamed from doc/src/images/qrect-coordinates.png)bin22218 -> 22218 bytes
-rw-r--r--src/corelib/doc/images/qrect-diagram-one.png (renamed from doc/src/images/qrect-diagram-one.png)bin9616 -> 9616 bytes
-rw-r--r--src/corelib/doc/images/qrect-diagram-three.png (renamed from doc/src/images/qrect-diagram-three.png)bin9458 -> 9458 bytes
-rw-r--r--src/corelib/doc/images/qrect-diagram-two.png (renamed from doc/src/images/qrect-diagram-two.png)bin9378 -> 9378 bytes
-rw-r--r--src/corelib/doc/images/qrect-diagram-zero.png (renamed from doc/src/images/qrect-diagram-zero.png)bin5198 -> 5198 bytes
-rw-r--r--src/corelib/doc/images/qrect-intersect.png (renamed from doc/src/images/qrect-intersect.png)bin8742 -> 8742 bytes
-rw-r--r--src/corelib/doc/images/qrect-unite.png (renamed from doc/src/images/qrect-unite.png)bin4626 -> 4626 bytes
-rw-r--r--src/corelib/doc/images/qrectf-coordinates.png (renamed from doc/src/images/qrectf-coordinates.png)bin21749 -> 21749 bytes
-rw-r--r--src/corelib/doc/images/qrectf-diagram-one.png (renamed from doc/src/images/qrectf-diagram-one.png)bin9594 -> 9594 bytes
-rw-r--r--src/corelib/doc/images/qrectf-diagram-three.png (renamed from doc/src/images/qrectf-diagram-three.png)bin9392 -> 9392 bytes
-rw-r--r--src/corelib/doc/images/qrectf-diagram-two.png (renamed from doc/src/images/qrectf-diagram-two.png)bin9387 -> 9387 bytes
-rw-r--r--src/corelib/doc/images/qsortfilterproxymodel-sorting.png (renamed from doc/src/images/qsortfilterproxymodel-sorting.png)bin11005 -> 11005 bytes
-rw-r--r--src/corelib/doc/images/qurl-authority.png (renamed from doc/src/images/qurl-authority.png)bin5099 -> 5099 bytes
-rw-r--r--src/corelib/doc/images/qurl-authority2.png (renamed from doc/src/images/qurl-authority2.png)bin2350 -> 2350 bytes
-rw-r--r--src/corelib/doc/images/qurl-authority3.png (renamed from doc/src/images/qurl-authority3.png)bin3552 -> 3552 bytes
-rw-r--r--src/corelib/doc/images/qurl-fragment.png (renamed from doc/src/images/qurl-fragment.png)bin2333 -> 2333 bytes
-rw-r--r--src/corelib/doc/images/qurl-ftppath.png (renamed from doc/src/images/qurl-ftppath.png)bin1974 -> 1974 bytes
-rw-r--r--src/corelib/doc/images/qurl-mailtopath.png (renamed from doc/src/images/qurl-mailtopath.png)bin1679 -> 1679 bytes
-rw-r--r--src/corelib/doc/images/qurl-querystring.png (renamed from doc/src/images/qurl-querystring.png)bin2955 -> 2955 bytes
-rw-r--r--src/corelib/doc/images/stliterators1.png (renamed from doc/src/images/stliterators1.png)bin1671 -> 1671 bytes
-rw-r--r--src/corelib/doc/images/thread_clock.png (renamed from doc/src/images/thread_clock.png)bin5964 -> 5964 bytes
-rw-r--r--src/corelib/doc/images/threadsandobjects.png (renamed from doc/src/images/threadsandobjects.png)bin66096 -> 66096 bytes
-rw-r--r--src/corelib/doc/images/threadvisual-example.png (renamed from doc/src/images/threadvisual-example.png)bin16823 -> 16823 bytes
-rw-r--r--src/corelib/doc/qtcore.qdocconf90
-rw-r--r--src/corelib/doc/snippets/buffer/buffer.cpp (renamed from doc/src/snippets/buffer/buffer.cpp)0
-rw-r--r--src/corelib/doc/snippets/code/doc_src_containers.cpp (renamed from doc/src/snippets/code/doc_src_containers.cpp)0
-rw-r--r--src/corelib/doc/snippets/code/doc_src_groups.cpp (renamed from doc/src/snippets/code/doc_src_groups.cpp)0
-rw-r--r--src/corelib/doc/snippets/code/doc_src_objecttrees.cpp (renamed from doc/src/snippets/code/doc_src_objecttrees.cpp)0
-rw-r--r--src/corelib/doc/snippets/code/doc_src_properties.cpp (renamed from doc/src/snippets/code/doc_src_properties.cpp)0
-rw-r--r--src/corelib/doc/snippets/code/doc_src_qalgorithms.cpp (renamed from doc/src/snippets/code/doc_src_qalgorithms.cpp)0
-rw-r--r--src/corelib/doc/snippets/code/doc_src_qcache.cpp (renamed from doc/src/snippets/code/doc_src_qcache.cpp)0
-rw-r--r--src/corelib/doc/snippets/code/doc_src_qiterator.cpp (renamed from doc/src/snippets/code/doc_src_qiterator.cpp)0
-rw-r--r--src/corelib/doc/snippets/code/doc_src_qnamespace.cpp (renamed from doc/src/snippets/code/doc_src_qnamespace.cpp)0
-rw-r--r--src/corelib/doc/snippets/code/doc_src_qnamespace.qdoc (renamed from doc/src/snippets/code/doc_src_qnamespace.qdoc)0
-rw-r--r--src/corelib/doc/snippets/code/doc_src_qpair.cpp (renamed from doc/src/snippets/code/doc_src_qpair.cpp)0
-rw-r--r--src/corelib/doc/snippets/code/doc_src_qplugin.cpp (renamed from doc/src/snippets/code/doc_src_qplugin.cpp)0
-rw-r--r--src/corelib/doc/snippets/code/doc_src_qplugin.pro4
-rw-r--r--src/corelib/doc/snippets/code/doc_src_qset.cpp (renamed from doc/src/snippets/code/doc_src_qset.cpp)0
-rw-r--r--src/corelib/doc/snippets/code/doc_src_qtcore.cpp (renamed from doc/src/snippets/code/doc_src_qtcore.cpp)0
-rw-r--r--src/corelib/doc/snippets/code/doc_src_qvarlengtharray.cpp (renamed from doc/src/snippets/code/doc_src_qvarlengtharray.cpp)0
-rw-r--r--src/corelib/doc/snippets/code/qlogging/qlogging.cpp (renamed from doc/src/snippets/qlogging/qloggingsnippet.cpp)0
-rw-r--r--src/corelib/doc/snippets/code/src_corelib_codecs_qtextcodec.cpp (renamed from doc/src/snippets/code/src_corelib_codecs_qtextcodec.cpp)0
-rw-r--r--src/corelib/doc/snippets/code/src_corelib_concurrent_qthreadpool.cpp (renamed from doc/src/snippets/code/src_corelib_concurrent_qthreadpool.cpp)0
-rw-r--r--src/corelib/doc/snippets/code/src_corelib_global_qglobal.cpp (renamed from doc/src/snippets/code/src_corelib_global_qglobal.cpp)0
-rw-r--r--src/corelib/doc/snippets/code/src_corelib_io_qabstractfileengine.cpp (renamed from doc/src/snippets/code/src_corelib_io_qabstractfileengine.cpp)0
-rw-r--r--src/corelib/doc/snippets/code/src_corelib_io_qdatastream.cpp (renamed from doc/src/snippets/code/src_corelib_io_qdatastream.cpp)0
-rw-r--r--src/corelib/doc/snippets/code/src_corelib_io_qdir.cpp (renamed from doc/src/snippets/code/src_corelib_io_qdir.cpp)0
-rw-r--r--src/corelib/doc/snippets/code/src_corelib_io_qdiriterator.cpp (renamed from doc/src/snippets/code/src_corelib_io_qdiriterator.cpp)0
-rw-r--r--src/corelib/doc/snippets/code/src_corelib_io_qfile.cpp (renamed from doc/src/snippets/code/src_corelib_io_qfile.cpp)0
-rw-r--r--src/corelib/doc/snippets/code/src_corelib_io_qfileinfo.cpp (renamed from doc/src/snippets/code/src_corelib_io_qfileinfo.cpp)0
-rw-r--r--src/corelib/doc/snippets/code/src_corelib_io_qiodevice.cpp (renamed from doc/src/snippets/code/src_corelib_io_qiodevice.cpp)0
-rw-r--r--src/corelib/doc/snippets/code/src_corelib_io_qprocess.cpp (renamed from doc/src/snippets/code/src_corelib_io_qprocess.cpp)0
-rw-r--r--src/corelib/doc/snippets/code/src_corelib_io_qsettings.cpp (renamed from doc/src/snippets/code/src_corelib_io_qsettings.cpp)0
-rw-r--r--src/corelib/doc/snippets/code/src_corelib_io_qtemporarydir.cpp (renamed from doc/src/snippets/code/src_corelib_io_qtemporarydir.cpp)0
-rw-r--r--src/corelib/doc/snippets/code/src_corelib_io_qtemporaryfile.cpp (renamed from doc/src/snippets/code/src_corelib_io_qtemporaryfile.cpp)0
-rw-r--r--src/corelib/doc/snippets/code/src_corelib_io_qtextstream.cpp (renamed from doc/src/snippets/code/src_corelib_io_qtextstream.cpp)0
-rw-r--r--src/corelib/doc/snippets/code/src_corelib_io_qurl.cpp (renamed from doc/src/snippets/code/src_corelib_io_qurl.cpp)0
-rw-r--r--src/corelib/doc/snippets/code/src_corelib_kernel_qabstracteventdispatcher.cpp (renamed from doc/src/snippets/code/src_corelib_kernel_qabstracteventdispatcher.cpp)0
-rw-r--r--src/corelib/doc/snippets/code/src_corelib_kernel_qabstractitemmodel.cpp (renamed from doc/src/snippets/code/src_corelib_kernel_qabstractitemmodel.cpp)0
-rw-r--r--src/corelib/doc/snippets/code/src_corelib_kernel_qcoreapplication.cpp (renamed from doc/src/snippets/code/src_corelib_kernel_qcoreapplication.cpp)0
-rw-r--r--src/corelib/doc/snippets/code/src_corelib_kernel_qmetaobject.cpp (renamed from doc/src/snippets/code/src_corelib_kernel_qmetaobject.cpp)4
-rw-r--r--src/corelib/doc/snippets/code/src_corelib_kernel_qmetatype.cpp (renamed from doc/src/snippets/code/src_corelib_kernel_qmetatype.cpp)0
-rw-r--r--src/corelib/doc/snippets/code/src_corelib_kernel_qmimedata.cpp (renamed from doc/src/snippets/code/src_corelib_kernel_qmimedata.cpp)0
-rw-r--r--src/corelib/doc/snippets/code/src_corelib_kernel_qobject.cpp (renamed from doc/src/snippets/code/src_corelib_kernel_qobject.cpp)12
-rw-r--r--src/corelib/doc/snippets/code/src_corelib_kernel_qsystemsemaphore.cpp (renamed from doc/src/snippets/code/src_corelib_kernel_qsystemsemaphore.cpp)0
-rw-r--r--src/corelib/doc/snippets/code/src_corelib_kernel_qtimer.cpp (renamed from doc/src/snippets/code/src_corelib_kernel_qtimer.cpp)0
-rw-r--r--src/corelib/doc/snippets/code/src_corelib_kernel_qvariant.cpp (renamed from doc/src/snippets/code/src_corelib_kernel_qvariant.cpp)0
-rw-r--r--src/corelib/doc/snippets/code/src_corelib_mimetype_qmimedatabase.cpp (renamed from doc/src/snippets/code/src_corelib_mimetype_qmimedatabase.cpp)0
-rw-r--r--src/corelib/doc/snippets/code/src_corelib_plugin_qlibrary.cpp (renamed from doc/src/snippets/code/src_corelib_plugin_qlibrary.cpp)0
-rw-r--r--src/corelib/doc/snippets/code/src_corelib_plugin_quuid.cpp (renamed from doc/src/snippets/code/src_corelib_plugin_quuid.cpp)0
-rw-r--r--src/corelib/doc/snippets/code/src_corelib_statemachine_qstatemachine.cpp (renamed from doc/src/snippets/code/src_corelib_statemachine_qstatemachine.cpp)0
-rw-r--r--src/corelib/doc/snippets/code/src_corelib_thread_qatomic.cpp (renamed from doc/src/snippets/code/src_corelib_thread_qatomic.cpp)0
-rw-r--r--src/corelib/doc/snippets/code/src_corelib_thread_qmutex.cpp (renamed from doc/src/snippets/code/src_corelib_thread_qmutex.cpp)0
-rw-r--r--src/corelib/doc/snippets/code/src_corelib_thread_qmutexpool.cpp (renamed from doc/src/snippets/code/src_corelib_thread_qmutexpool.cpp)0
-rw-r--r--src/corelib/doc/snippets/code/src_corelib_thread_qreadwritelock.cpp (renamed from doc/src/snippets/code/src_corelib_thread_qreadwritelock.cpp)0
-rw-r--r--src/corelib/doc/snippets/code/src_corelib_thread_qsemaphore.cpp (renamed from doc/src/snippets/code/src_corelib_thread_qsemaphore.cpp)0
-rw-r--r--src/corelib/doc/snippets/code/src_corelib_thread_qthread.cpp (renamed from doc/src/snippets/code/src_corelib_thread_qthread.cpp)0
-rw-r--r--src/corelib/doc/snippets/code/src_corelib_thread_qwaitcondition_unix.cpp (renamed from doc/src/snippets/code/src_corelib_thread_qwaitcondition_unix.cpp)0
-rw-r--r--src/corelib/doc/snippets/code/src_corelib_tools_qbitarray.cpp (renamed from doc/src/snippets/code/src_corelib_tools_qbitarray.cpp)0
-rw-r--r--src/corelib/doc/snippets/code/src_corelib_tools_qbytearray.cpp (renamed from doc/src/snippets/code/src_corelib_tools_qbytearray.cpp)0
-rw-r--r--src/corelib/doc/snippets/code/src_corelib_tools_qdatetime.cpp (renamed from doc/src/snippets/code/src_corelib_tools_qdatetime.cpp)0
-rw-r--r--src/corelib/doc/snippets/code/src_corelib_tools_qeasingcurve.cpp (renamed from doc/src/snippets/code/src_corelib_tools_qeasingcurve.cpp)0
-rw-r--r--src/corelib/doc/snippets/code/src_corelib_tools_qhash.cpp (renamed from doc/src/snippets/code/src_corelib_tools_qhash.cpp)0
-rw-r--r--src/corelib/doc/snippets/code/src_corelib_tools_qlinkedlist.cpp (renamed from doc/src/snippets/code/src_corelib_tools_qlinkedlist.cpp)0
-rw-r--r--src/corelib/doc/snippets/code/src_corelib_tools_qlistdata.cpp (renamed from doc/src/snippets/code/src_corelib_tools_qlistdata.cpp)0
-rw-r--r--src/corelib/doc/snippets/code/src_corelib_tools_qlocale.cpp (renamed from doc/src/snippets/code/src_corelib_tools_qlocale.cpp)0
-rw-r--r--src/corelib/doc/snippets/code/src_corelib_tools_qmap.cpp (renamed from doc/src/snippets/code/src_corelib_tools_qmap.cpp)0
-rw-r--r--src/corelib/doc/snippets/code/src_corelib_tools_qpoint.cpp (renamed from doc/src/snippets/code/src_corelib_tools_qpoint.cpp)0
-rw-r--r--src/corelib/doc/snippets/code/src_corelib_tools_qqueue.cpp48
-rw-r--r--src/corelib/doc/snippets/code/src_corelib_tools_qrect.cpp (renamed from doc/src/snippets/code/src_corelib_tools_qrect.cpp)0
-rw-r--r--src/corelib/doc/snippets/code/src_corelib_tools_qregexp.cpp (renamed from doc/src/snippets/code/src_corelib_tools_qregexp.cpp)0
-rw-r--r--src/corelib/doc/snippets/code/src_corelib_tools_qregularexpression.cpp (renamed from doc/src/snippets/code/src_corelib_tools_qregularexpression.cpp)0
-rw-r--r--src/corelib/doc/snippets/code/src_corelib_tools_qscopedpointer.cpp (renamed from doc/src/snippets/code/src_corelib_tools_qscopedpointer.cpp)0
-rw-r--r--src/corelib/doc/snippets/code/src_corelib_tools_qsize.cpp (renamed from doc/src/snippets/code/src_corelib_tools_qsize.cpp)0
-rw-r--r--src/corelib/doc/snippets/code/src_corelib_tools_qstring.cpp (renamed from doc/src/snippets/code/src_corelib_tools_qstring.cpp)0
-rw-r--r--src/corelib/doc/snippets/code/src_corelib_tools_qtimeline.cpp (renamed from doc/src/snippets/code/src_corelib_tools_qtimeline.cpp)0
-rw-r--r--src/corelib/doc/snippets/code/src_corelib_tools_qvector.cpp183
-rw-r--r--src/corelib/doc/snippets/code/src_corelib_xml_qxmlstream.cpp (renamed from doc/src/snippets/code/src_corelib_xml_qxmlstream.cpp)0
-rw-r--r--src/corelib/doc/snippets/code/src_gui_dialogs_qmessagebox.cpp (renamed from doc/src/snippets/code/src_gui_dialogs_qmessagebox.cpp)0
-rw-r--r--src/corelib/doc/snippets/code/src_gui_itemviews_qidentityproxymodel.cpp (renamed from doc/src/snippets/code/src_gui_itemviews_qidentityproxymodel.cpp)0
-rw-r--r--src/corelib/doc/snippets/code/src_gui_itemviews_qitemselectionmodel.cpp (renamed from doc/src/snippets/code/src_gui_itemviews_qitemselectionmodel.cpp)0
-rw-r--r--src/corelib/doc/snippets/file/file.cpp (renamed from doc/src/snippets/file/file.cpp)0
-rw-r--r--src/corelib/doc/snippets/fileinfo/main.cpp (renamed from doc/src/snippets/fileinfo/main.cpp)0
-rw-r--r--src/corelib/doc/snippets/ntfsp.cpp (renamed from doc/src/snippets/ntfsp.cpp)0
-rw-r--r--src/corelib/doc/snippets/pointer/pointer.cpp60
-rw-r--r--src/corelib/doc/snippets/process/process.cpp (renamed from doc/src/snippets/process/process.cpp)0
-rw-r--r--src/corelib/doc/snippets/qdebug/qdebugsnippet.cpp (renamed from doc/src/snippets/qdebug/qdebugsnippet.cpp)0
-rw-r--r--src/corelib/doc/snippets/qdir-listfiles/main.cpp (renamed from doc/src/snippets/qdir-listfiles/main.cpp)0
-rw-r--r--src/corelib/doc/snippets/qdir-namefilters/main.cpp (renamed from doc/src/snippets/qdir-namefilters/main.cpp)0
-rw-r--r--src/corelib/doc/snippets/qelapsedtimer/main.cpp (renamed from doc/src/snippets/qelapsedtimer/main.cpp)0
-rw-r--r--src/corelib/doc/snippets/qmetaobject-invokable/main.cpp (renamed from doc/src/snippets/qmetaobject-invokable/main.cpp)0
-rw-r--r--src/corelib/doc/snippets/qmetaobject-invokable/qmetaobject-invokable.pro (renamed from doc/src/snippets/qmetaobject-invokable/qmetaobject-invokable.pro)0
-rw-r--r--src/corelib/doc/snippets/qmetaobject-invokable/window.cpp (renamed from doc/src/snippets/qmetaobject-invokable/window.cpp)0
-rw-r--r--src/corelib/doc/snippets/qmetaobject-invokable/window.h (renamed from doc/src/snippets/qmetaobject-invokable/window.h)0
-rw-r--r--src/corelib/doc/snippets/qprocess-environment/main.cpp (renamed from doc/src/snippets/qprocess-environment/main.cpp)0
-rw-r--r--src/corelib/doc/snippets/qprocess/qprocess-simpleexecution.cpp (renamed from doc/src/snippets/qprocess/qprocess-simpleexecution.cpp)0
-rw-r--r--src/corelib/doc/snippets/qsignalmapper/buttonwidget.cpp (renamed from doc/src/snippets/qsignalmapper/buttonwidget.cpp)0
-rw-r--r--src/corelib/doc/snippets/qsignalmapper/buttonwidget.h (renamed from doc/src/snippets/qsignalmapper/buttonwidget.h)0
-rw-r--r--src/corelib/doc/snippets/qsortfilterproxymodel-details/main.cpp (renamed from doc/src/snippets/qsortfilterproxymodel-details/main.cpp)0
-rw-r--r--src/corelib/doc/snippets/qstack/main.cpp (renamed from doc/src/snippets/qstack/main.cpp)0
-rw-r--r--src/corelib/doc/snippets/qstring/main.cpp (renamed from doc/src/snippets/qstring/main.cpp)0
-rw-r--r--src/corelib/doc/snippets/qstring/stringbuilder.cpp (renamed from doc/src/snippets/qstring/stringbuilder.cpp)0
-rw-r--r--src/corelib/doc/snippets/qstringlist/main.cpp (renamed from doc/src/snippets/qstringlist/main.cpp)0
-rw-r--r--src/corelib/doc/snippets/qstringlistmodel/main.cpp (renamed from doc/src/snippets/qstringlistmodel/main.cpp)0
-rw-r--r--src/corelib/doc/snippets/qtcast/qtcast.cpp (renamed from doc/src/snippets/qtcast/qtcast.cpp)0
-rw-r--r--src/corelib/doc/snippets/qxmlstreamwriter/main.cpp (renamed from doc/src/snippets/qxmlstreamwriter/main.cpp)0
-rw-r--r--src/corelib/doc/snippets/settings/settings.cpp (renamed from doc/src/snippets/settings/settings.cpp)0
-rw-r--r--src/corelib/doc/snippets/sharedemployee/employee.h (renamed from doc/src/snippets/sharedemployee/employee.h)0
-rw-r--r--src/corelib/doc/snippets/sharedemployee/main.cpp (renamed from doc/src/snippets/sharedemployee/main.cpp)0
-rw-r--r--src/corelib/doc/snippets/signalmapper/filereader.cpp (renamed from doc/src/snippets/signalmapper/filereader.cpp)0
-rw-r--r--src/corelib/doc/snippets/signalsandslots/lcdnumber.h (renamed from doc/src/snippets/signalsandslots/lcdnumber.h)0
-rw-r--r--src/corelib/doc/snippets/signalsandslots/signalsandslots.cpp (renamed from doc/src/snippets/signalsandslots/signalsandslots.cpp)0
-rw-r--r--src/corelib/doc/snippets/signalsandslots/signalsandslots.h (renamed from doc/src/snippets/signalsandslots/signalsandslots.h)0
-rw-r--r--src/corelib/doc/snippets/streaming/main.cpp (renamed from doc/src/snippets/streaming/main.cpp)0
-rw-r--r--src/corelib/doc/snippets/streaming/streaming.pro (renamed from doc/src/snippets/streaming/streaming.pro)0
-rw-r--r--src/corelib/doc/snippets/threads/threads.cpp (renamed from doc/src/snippets/threads/threads.cpp)0
-rw-r--r--src/corelib/doc/snippets/threads/threads.h (renamed from doc/src/snippets/threads/threads.h)0
-rw-r--r--src/corelib/doc/snippets/timers/timers.cpp (renamed from doc/src/snippets/timers/timers.cpp)0
-rw-r--r--src/corelib/doc/src/containers.qdoc (renamed from doc/src/corelib/containers.qdoc)60
-rw-r--r--src/corelib/doc/src/datastreamformat.qdoc (renamed from doc/src/network/files-and-resources/datastreamformat.qdoc)0
-rw-r--r--src/corelib/doc/src/implicit-sharing.qdoc (renamed from doc/src/corelib/implicit-sharing.qdoc)4
-rw-r--r--src/corelib/doc/src/json.qdoc (renamed from doc/src/corelib/json.qdoc)2
-rw-r--r--src/corelib/doc/src/objectmodel/metaobjects.qdoc (renamed from doc/src/corelib/objectmodel/metaobjects.qdoc)14
-rw-r--r--src/corelib/doc/src/objectmodel/object.qdoc (renamed from doc/src/corelib/objectmodel/object.qdoc)0
-rw-r--r--src/corelib/doc/src/objectmodel/objecttrees.qdoc (renamed from doc/src/corelib/objectmodel/objecttrees.qdoc)4
-rw-r--r--src/corelib/doc/src/objectmodel/properties.qdoc (renamed from doc/src/corelib/objectmodel/properties.qdoc)16
-rw-r--r--src/corelib/doc/src/objectmodel/signalsandslots.qdoc (renamed from doc/src/corelib/objectmodel/signalsandslots.qdoc)62
-rw-r--r--src/corelib/doc/src/qtcore.qdoc (renamed from doc/src/corelib/qtcore.qdoc)2
-rw-r--r--src/corelib/doc/src/threads-basics.qdoc (renamed from doc/src/corelib/threads-basics.qdoc)20
-rw-r--r--src/corelib/doc/src/threads.qdoc (renamed from doc/src/corelib/threads.qdoc)16
-rw-r--r--src/corelib/global/qcompilerdetection.h157
-rw-r--r--src/corelib/global/qconfig-medium.h3
-rw-r--r--src/corelib/global/qconfig-minimal.h3
-rw-r--r--src/corelib/global/qconfig-nacl.h3
-rw-r--r--src/corelib/global/qconfig-small.h3
-rw-r--r--src/corelib/global/qfeatures.h3
-rw-r--r--src/corelib/global/qglobal.cpp244
-rw-r--r--src/corelib/global/qglobal.h222
-rw-r--r--src/corelib/global/qlogging.cpp114
-rw-r--r--src/corelib/global/qlogging.h4
-rw-r--r--src/corelib/global/qnamespace.h10
-rw-r--r--src/corelib/global/qnamespace.qdoc18
-rw-r--r--src/corelib/global/qprocessordetection.h4
-rw-r--r--src/corelib/global/qsystemdetection.h4
-rw-r--r--src/corelib/io/io.pri2
-rw-r--r--src/corelib/io/qabstractfileengine.cpp20
-rw-r--r--src/corelib/io/qbuffer.cpp29
-rw-r--r--src/corelib/io/qbuffer.h4
-rw-r--r--src/corelib/io/qdatastream.cpp31
-rw-r--r--src/corelib/io/qdebug.cpp6
-rw-r--r--src/corelib/io/qdir.cpp62
-rw-r--r--src/corelib/io/qdiriterator.cpp5
-rw-r--r--src/corelib/io/qfile.cpp22
-rw-r--r--src/corelib/io/qfileinfo.cpp34
-rw-r--r--src/corelib/io/qfilesystemengine.cpp2
-rw-r--r--src/corelib/io/qfilesystemengine_p.h2
-rw-r--r--src/corelib/io/qfilesystemengine_unix.cpp21
-rw-r--r--src/corelib/io/qfilesystemmetadata_p.h4
-rw-r--r--src/corelib/io/qiodevice.cpp56
-rw-r--r--src/corelib/io/qiodevice_p.h5
-rw-r--r--src/corelib/io/qprocess.cpp34
-rw-r--r--src/corelib/io/qprocess_unix.cpp11
-rw-r--r--src/corelib/io/qresource.cpp2
-rw-r--r--src/corelib/io/qsettings.cpp106
-rw-r--r--src/corelib/io/qsettings_mac.cpp2
-rw-r--r--src/corelib/io/qstandardpaths.cpp2
-rw-r--r--src/corelib/io/qstandardpaths_json.cpp2
-rw-r--r--src/corelib/io/qtemporarydir.cpp6
-rw-r--r--src/corelib/io/qtemporaryfile.cpp2
-rw-r--r--src/corelib/io/qtextstream.cpp42
-rw-r--r--src/corelib/io/qurl.cpp209
-rw-r--r--src/corelib/io/qurl_p.h1
-rw-r--r--src/corelib/itemmodels/qabstractitemmodel.cpp48
-rw-r--r--src/corelib/itemmodels/qidentityproxymodel.cpp2
-rw-r--r--src/corelib/itemmodels/qitemselectionmodel.cpp12
-rw-r--r--src/corelib/itemmodels/qsortfilterproxymodel.cpp16
-rw-r--r--src/corelib/itemmodels/qstringlistmodel.cpp2
-rw-r--r--src/corelib/json/qjsonarray.cpp13
-rw-r--r--src/corelib/json/qjsondocument.cpp16
-rw-r--r--src/corelib/json/qjsonobject.cpp44
-rw-r--r--src/corelib/kernel/kernel.pri8
-rw-r--r--src/corelib/kernel/qabstracteventdispatcher.cpp4
-rw-r--r--src/corelib/kernel/qbasictimer.cpp8
-rw-r--r--src/corelib/kernel/qcore_mac_p.h2
-rw-r--r--src/corelib/kernel/qcoreapplication.cpp42
-rw-r--r--src/corelib/kernel/qeventdispatcher_blackberry.cpp262
-rw-r--r--src/corelib/kernel/qeventdispatcher_blackberry_p.h (renamed from src/plugins/platforms/openvglite/qwindowsurface_vglite.h)55
-rw-r--r--src/corelib/kernel/qeventloop.cpp2
-rw-r--r--src/corelib/kernel/qmetaobject.cpp153
-rw-r--r--src/corelib/kernel/qmetaobject.h22
-rw-r--r--src/corelib/kernel/qmetaobject_p.h7
-rw-r--r--src/corelib/kernel/qmetaobjectbuilder.cpp49
-rw-r--r--src/corelib/kernel/qmetaobjectbuilder_p.h2
-rw-r--r--src/corelib/kernel/qmetatype.cpp118
-rw-r--r--src/corelib/kernel/qmetatype.h69
-rw-r--r--src/corelib/kernel/qmetatype_p.h2
-rw-r--r--src/corelib/kernel/qmimedata.cpp16
-rw-r--r--src/corelib/kernel/qobject.cpp329
-rw-r--r--src/corelib/kernel/qobject.h5
-rw-r--r--src/corelib/kernel/qobject_impl.h425
-rw-r--r--src/corelib/kernel/qobject_p.h3
-rw-r--r--src/corelib/kernel/qobjectcleanuphandler.cpp2
-rw-r--r--src/corelib/kernel/qobjectdefs.h21
-rw-r--r--src/corelib/kernel/qobjectdefs_impl.h485
-rw-r--r--src/corelib/kernel/qpointer.cpp6
-rw-r--r--src/corelib/kernel/qsharedmemory.cpp14
-rw-r--r--src/corelib/kernel/qsignalmapper.cpp10
-rw-r--r--src/corelib/kernel/qsystemsemaphore.cpp6
-rw-r--r--src/corelib/kernel/qtimer.cpp18
-rw-r--r--src/corelib/kernel/qtranslator.cpp2
-rw-r--r--src/corelib/kernel/qvariant.cpp39
-rw-r--r--src/corelib/kernel/qwineventnotifier.cpp45
-rw-r--r--src/corelib/kernel/qwineventnotifier.h8
-rw-r--r--src/corelib/mimetypes/qmimedatabase.cpp2
-rw-r--r--src/corelib/mimetypes/qmimeglobpattern.cpp2
-rw-r--r--src/corelib/plugin/qfactoryloader.cpp29
-rw-r--r--src/corelib/plugin/qlibrary.cpp16
-rw-r--r--src/corelib/plugin/qlibrary.h3
-rw-r--r--src/corelib/plugin/qlibrary_unix.cpp12
-rw-r--r--src/corelib/plugin/qplugin.qdoc10
-rw-r--r--src/corelib/plugin/qpluginloader.h2
-rw-r--r--src/corelib/plugin/quuid.cpp6
-rw-r--r--src/corelib/statemachine/qstatemachine.cpp10
-rw-r--r--src/corelib/thread/qatomic.cpp77
-rw-r--r--src/corelib/thread/qatomic.h4
-rw-r--r--src/corelib/thread/qmutex.cpp42
-rw-r--r--src/corelib/thread/qmutex.h1
-rw-r--r--src/corelib/thread/qmutex_linux.cpp9
-rw-r--r--src/corelib/thread/qmutexpool.cpp4
-rw-r--r--src/corelib/thread/qreadwritelock.cpp24
-rw-r--r--src/corelib/thread/qsemaphore.cpp8
-rw-r--r--src/corelib/thread/qthread.cpp12
-rw-r--r--src/corelib/thread/qthread_unix.cpp27
-rw-r--r--src/corelib/thread/qthread_win.cpp2
-rw-r--r--src/corelib/thread/qthreadpool.cpp43
-rw-r--r--src/corelib/thread/qthreadpool.h3
-rw-r--r--src/corelib/thread/qthreadpool_p.h2
-rw-r--r--src/corelib/thread/qthreadstorage.cpp6
-rw-r--r--src/corelib/thread/qwaitcondition.qdoc8
-rw-r--r--src/corelib/tools/qalgorithms.qdoc52
-rw-r--r--src/corelib/tools/qarraydata.cpp2
-rw-r--r--src/corelib/tools/qarraydata.h2
-rw-r--r--src/corelib/tools/qbitarray.cpp34
-rw-r--r--src/corelib/tools/qbytearray.cpp125
-rw-r--r--src/corelib/tools/qcache.qdoc6
-rw-r--r--src/corelib/tools/qchar.cpp272
-rw-r--r--src/corelib/tools/qchar.h22
-rw-r--r--src/corelib/tools/qdatetime.cpp56
-rw-r--r--src/corelib/tools/qeasingcurve.cpp186
-rw-r--r--src/corelib/tools/qelapsedtimer.cpp6
-rw-r--r--src/corelib/tools/qelapsedtimer_generic.cpp4
-rw-r--r--src/corelib/tools/qhash.cpp57
-rw-r--r--src/corelib/tools/qhash.h28
-rw-r--r--src/corelib/tools/qiterator.qdoc104
-rw-r--r--src/corelib/tools/qlinkedlist.cpp40
-rw-r--r--src/corelib/tools/qlist.cpp58
-rw-r--r--src/corelib/tools/qlocale.cpp475
-rw-r--r--src/corelib/tools/qlocale.h21
-rw-r--r--src/corelib/tools/qlocale.qdoc8
-rw-r--r--src/corelib/tools/qlocale_data_p.h2
-rw-r--r--src/corelib/tools/qlocale_p.h126
-rw-r--r--src/corelib/tools/qlocale_unix.cpp2
-rw-r--r--src/corelib/tools/qmap.cpp60
-rw-r--r--src/corelib/tools/qpair.qdoc12
-rw-r--r--src/corelib/tools/qpoint.cpp42
-rw-r--r--src/corelib/tools/qpoint.h52
-rw-r--r--src/corelib/tools/qqueue.cpp2
-rw-r--r--src/corelib/tools/qrect.cpp16
-rw-r--r--src/corelib/tools/qrect.h212
-rw-r--r--src/corelib/tools/qregexp.cpp68
-rw-r--r--src/corelib/tools/qregexp.h6
-rw-r--r--src/corelib/tools/qregularexpression.cpp64
-rw-r--r--src/corelib/tools/qscopedpointer.cpp12
-rw-r--r--src/corelib/tools/qset.qdoc30
-rw-r--r--src/corelib/tools/qshareddata.cpp18
-rw-r--r--src/corelib/tools/qsimd.cpp278
-rw-r--r--src/corelib/tools/qsimd_p.h5
-rw-r--r--src/corelib/tools/qsize.cpp24
-rw-r--r--src/corelib/tools/qsize.h74
-rw-r--r--src/corelib/tools/qstack.cpp2
-rw-r--r--src/corelib/tools/qstring.cpp307
-rw-r--r--src/corelib/tools/qstring.h53
-rw-r--r--src/corelib/tools/qstringbuilder.cpp2
-rw-r--r--src/corelib/tools/qstringlist.cpp38
-rw-r--r--src/corelib/tools/qtimeline.cpp2
-rw-r--r--src/corelib/tools/qunicodetables.cpp60
-rw-r--r--src/corelib/tools/qunicodetables_p.h4
-rw-r--r--src/corelib/tools/qvarlengtharray.h3
-rw-r--r--src/corelib/tools/qvarlengtharray.qdoc8
-rw-r--r--src/corelib/tools/qvector.cpp36
-rw-r--r--src/corelib/xml/qxmlstream.cpp12
-rw-r--r--src/corelib/xml/qxmlutils.cpp14
-rw-r--r--src/dbus/qdbus_symbols.cpp2
-rw-r--r--src/dbus/qdbusabstractadaptor.cpp6
-rw-r--r--src/dbus/qdbusabstractinterface.cpp14
-rw-r--r--src/dbus/qdbusabstractinterface.h4
-rw-r--r--src/dbus/qdbusconnection_p.h4
-rw-r--r--src/dbus/qdbusconnectioninterface.cpp49
-rw-r--r--src/dbus/qdbusconnectioninterface.h4
-rw-r--r--src/dbus/qdbusdemarshaller.cpp2
-rw-r--r--src/dbus/qdbusintegrator.cpp14
-rw-r--r--src/dbus/qdbusmetaobject.cpp4
-rw-r--r--src/gui/accessible/qaccessible.cpp25
-rw-r--r--src/gui/accessible/qaccessible.h25
-rw-r--r--src/gui/accessible/qaccessibleobject.cpp2
-rw-r--r--src/gui/accessible/qplatformaccessibility_qpa.cpp9
-rw-r--r--src/gui/accessible/qplatformaccessibility_qpa.h11
-rw-r--r--src/gui/image/qimage.cpp15
-rw-r--r--src/gui/image/qimage.h21
-rw-r--r--src/gui/image/qimage_p.h10
-rw-r--r--src/gui/image/qimagepixmapcleanuphooks.cpp18
-rw-r--r--src/gui/image/qimagereader.cpp6
-rw-r--r--src/gui/image/qpixmap.cpp4
-rw-r--r--src/gui/image/qpixmap.h6
-rw-r--r--src/gui/image/qplatformpixmap.cpp9
-rw-r--r--src/gui/image/qpnghandler.cpp228
-rw-r--r--src/gui/kernel/kernel.pri2
-rw-r--r--src/gui/kernel/qclipboard.cpp11
-rw-r--r--src/gui/kernel/qclipboard.h5
-rw-r--r--src/gui/kernel/qclipboard_qpa.cpp14
-rw-r--r--src/gui/kernel/qevent.cpp32
-rw-r--r--src/gui/kernel/qevent.h24
-rw-r--r--src/gui/kernel/qguiapplication.cpp63
-rw-r--r--src/gui/kernel/qguiapplication.h6
-rw-r--r--src/gui/kernel/qguiapplication_p.h2
-rw-r--r--src/gui/kernel/qinputmethod.cpp14
-rw-r--r--src/gui/kernel/qinputmethod.h2
-rw-r--r--src/gui/kernel/qinputmethod_p.h11
-rw-r--r--src/gui/kernel/qkeysequence.cpp24
-rw-r--r--src/gui/kernel/qplatformclipboard_qpa.cpp10
-rw-r--r--src/gui/kernel/qplatformclipboard_qpa.h11
-rw-r--r--src/gui/kernel/qplatformcursor_qpa.cpp8
-rw-r--r--src/gui/kernel/qplatformcursor_qpa.h11
-rw-r--r--src/gui/kernel/qplatformdialoghelper_qpa.cpp29
-rw-r--r--src/gui/kernel/qplatformdialoghelper_qpa.h20
-rw-r--r--src/gui/kernel/qplatformdrag_qpa.cpp9
-rw-r--r--src/gui/kernel/qplatformdrag_qpa.h11
-rw-r--r--src/gui/kernel/qplatforminputcontext_qpa.cpp4
-rw-r--r--src/gui/kernel/qplatforminputcontext_qpa.h11
-rw-r--r--src/gui/kernel/qplatformintegration_qpa.h11
-rw-r--r--src/gui/kernel/qplatformnativeinterface_qpa.cpp35
-rw-r--r--src/gui/kernel/qplatformnativeinterface_qpa.h20
-rw-r--r--src/gui/kernel/qplatformopenglcontext_qpa.h11
-rw-r--r--src/gui/kernel/qplatformscreen_qpa.h11
-rw-r--r--src/gui/kernel/qplatformscreenpageflipper_qpa.cpp21
-rw-r--r--src/gui/kernel/qplatformscreenpageflipper_qpa.h11
-rw-r--r--src/gui/kernel/qplatformservices_qpa.h11
-rw-r--r--src/gui/kernel/qplatformsharedgraphicscache_qpa.h11
-rw-r--r--src/gui/kernel/qplatformsurface_qpa.cpp9
-rw-r--r--src/gui/kernel/qplatformsurface_qpa.h11
-rw-r--r--src/gui/kernel/qplatformtheme_qpa.h11
-rw-r--r--src/gui/kernel/qplatformthemeplugin_qpa.cpp9
-rw-r--r--src/gui/kernel/qplatformwindow_qpa.cpp24
-rw-r--r--src/gui/kernel/qplatformwindow_qpa.h15
-rw-r--r--src/gui/opengl/opengl.pri2
-rw-r--r--src/gui/opengl/qopenglshaderprogram.cpp7
-rw-r--r--src/gui/opengl/qopengltextureglyphcache.cpp4
-rw-r--r--src/gui/opengl/qtriangulator.cpp2
-rw-r--r--src/gui/painting/qbrush.cpp2
-rw-r--r--src/gui/painting/qdrawhelper.cpp135
-rw-r--r--src/gui/painting/qdrawhelper_p.h8
-rw-r--r--src/gui/painting/qmatrix.h14
-rw-r--r--src/gui/painting/qpainter.cpp2
-rw-r--r--src/gui/painting/qplatformbackingstore_qpa.h11
-rw-r--r--src/gui/painting/qrgb.h18
-rw-r--r--src/gui/painting/qtransform.h26
-rw-r--r--src/gui/text/qcssparser.cpp2
-rw-r--r--src/gui/text/qfont.cpp74
-rw-r--r--src/gui/text/qfont.h5
-rw-r--r--src/gui/text/qplatformfontdatabase_qpa.cpp8
-rw-r--r--src/gui/text/qplatformfontdatabase_qpa.h11
-rw-r--r--src/gui/text/qtextdocument.cpp2
-rw-r--r--src/gui/text/qtextengine.cpp63
-rw-r--r--src/gui/text/qtextlayout.cpp8
-rw-r--r--src/gui/text/qzip.cpp11
-rw-r--r--src/gui/util/qdesktopservices.cpp8
-rw-r--r--src/gui/util/qdesktopservices.h5
-rw-r--r--src/gui/util/qvalidator.cpp11
-rw-r--r--src/modules/qt_platformsupport.pri2
-rw-r--r--src/network/access/qftp.cpp21
-rw-r--r--src/network/access/qhttpmultipart.cpp4
-rw-r--r--src/network/access/qnetworkaccessftpbackend.cpp3
-rw-r--r--src/network/access/qnetworkaccessmanager.cpp4
-rw-r--r--src/network/access/qnetworkreplyhttpimpl.cpp31
-rw-r--r--src/network/access/qnetworkreplyhttpimpl_p.h3
-rw-r--r--src/network/access/qnetworkreplyimpl.cpp35
-rw-r--r--src/network/access/qnetworkreplyimpl_p.h3
-rw-r--r--src/network/bearer/qnetworksession.cpp13
-rw-r--r--src/network/bearer/qnetworksession.h4
-rw-r--r--src/network/doc/doc.pri3
-rw-r--r--src/network/doc/qtnetwork.qdocconf92
-rw-r--r--src/network/kernel/kernel.pri8
-rw-r--r--src/network/kernel/qdnslookup_android.cpp54
-rw-r--r--src/network/kernel/qhostinfo_unix.cpp2
-rw-r--r--src/network/kernel/qnetworkfunctions_wince.h88
-rw-r--r--src/network/kernel/qnetworkinterface_unix.cpp5
-rw-r--r--src/network/kernel/qnetworkproxy_generic.cpp38
-rw-r--r--src/network/kernel/qnetworkproxy_win.cpp22
-rw-r--r--src/network/network.pro1
-rw-r--r--src/network/socket/qnativesocketengine_unix.cpp6
-rw-r--r--src/network/ssl/qsslcertificate.cpp4
-rw-r--r--src/network/ssl/qsslcertificateextension.cpp9
-rw-r--r--src/network/ssl/qsslsocket.cpp51
-rw-r--r--src/network/ssl/qsslsocket_openssl.cpp16
-rw-r--r--src/network/ssl/qsslsocket_openssl_symbols.cpp65
-rw-r--r--src/network/ssl/qsslsocket_openssl_symbols_p.h1
-rw-r--r--src/network/ssl/qsslsocket_p.h23
-rw-r--r--src/opengl/gl2paintengineex/qtextureglyphcache_gl.cpp4
-rw-r--r--src/opengl/gl2paintengineex/qtextureglyphcache_gl_p.h2
-rw-r--r--src/opengl/qgl.cpp7
-rw-r--r--src/opengl/qgl.h2
-rw-r--r--src/platformsupport/cglconvenience/cglconvenience.pri2
-rw-r--r--src/platformsupport/fontdatabases/mac/qcoretextfontdatabase.mm6
-rw-r--r--src/platformsupport/fontdatabases/mac/qcoretextfontdatabase_p.h2
-rw-r--r--src/platformsupport/fontdatabases/mac/qfontengine_coretext.mm2
-rw-r--r--src/platformsupport/fontdatabases/mac/qfontengine_coretext_p.h2
-rw-r--r--src/platformsupport/udev/qudevicehelper.cpp19
-rw-r--r--src/platformsupport/udev/qudevicehelper_p.h5
-rw-r--r--src/plugins/accessible/widgets/complexwidgets.cpp2
-rw-r--r--src/plugins/accessible/widgets/itemviews.cpp4
-rw-r--r--src/plugins/accessible/widgets/qaccessiblemenu.cpp2
-rw-r--r--src/plugins/bearer/connman/qconnmanservice_linux.cpp68
-rw-r--r--src/plugins/bearer/connman/qconnmanservice_linux_p.h20
-rw-r--r--src/plugins/bearer/connman/qofonoservice_linux.cpp274
-rw-r--r--src/plugins/bearer/connman/qofonoservice_linux_p.h32
-rw-r--r--src/plugins/generic/evdevmouse/qevdevmousehandler.cpp24
-rw-r--r--src/plugins/generic/evdevmouse/qevdevmousehandler.h3
-rw-r--r--src/plugins/generic/evdevtouch/qevdevtouch.cpp3
-rw-r--r--src/plugins/platforms/cocoa/qcocoabackingstore.h1
-rw-r--r--src/plugins/platforms/cocoa/qcocoabackingstore.mm10
-rw-r--r--src/plugins/platforms/cocoa/qcocoacolordialoghelper.h4
-rw-r--r--src/plugins/platforms/cocoa/qcocoacolordialoghelper.mm14
-rw-r--r--src/plugins/platforms/cocoa/qcocoaeventdispatcher.h11
-rw-r--r--src/plugins/platforms/cocoa/qcocoaeventdispatcher.mm154
-rw-r--r--src/plugins/platforms/cocoa/qcocoafiledialoghelper.h4
-rw-r--r--src/plugins/platforms/cocoa/qcocoafiledialoghelper.mm20
-rw-r--r--src/plugins/platforms/cocoa/qcocoafontdialoghelper.h4
-rw-r--r--src/plugins/platforms/cocoa/qcocoafontdialoghelper.mm14
-rw-r--r--src/plugins/platforms/cocoa/qcocoaprintersupport.h8
-rw-r--r--src/plugins/platforms/cocoa/qcocoawindow.h7
-rw-r--r--src/plugins/platforms/cocoa/qcocoawindow.mm123
-rw-r--r--src/plugins/platforms/cocoa/qnsview.h5
-rw-r--r--src/plugins/platforms/cocoa/qnsview.mm95
-rw-r--r--src/plugins/platforms/directfb/qdirectfbinput.h4
-rw-r--r--src/plugins/platforms/eglfs/eglfs.pro2
-rw-r--r--src/plugins/platforms/eglfs/qeglfsbackingstore.cpp144
-rw-r--r--src/plugins/platforms/eglfs/qeglfsbackingstore.h17
-rw-r--r--src/plugins/platforms/eglfs/qeglfshooks_stub.cpp4
-rw-r--r--src/plugins/platforms/eglfs/qeglfshooks_x11.cpp3
-rw-r--r--src/plugins/platforms/eglfs/qeglfsscreen.cpp14
-rw-r--r--src/plugins/platforms/eglfs/qeglfswindow.cpp11
-rw-r--r--src/plugins/platforms/eglfs/qeglfswindow.h1
-rw-r--r--src/plugins/platforms/openkode/openkode.pro42
-rw-r--r--src/plugins/platforms/openkode/openkodekeytranslator.h244
-rw-r--r--src/plugins/platforms/openkode/qopenkodeeventloopintegration.cpp128
-rw-r--r--src/plugins/platforms/openkode/qopenkodeintegration.cpp247
-rw-r--r--src/plugins/platforms/openkode/qopenkodeintegration.h120
-rw-r--r--src/plugins/platforms/openkode/qopenkodewindow.cpp315
-rw-r--r--src/plugins/platforms/openkode/qopenkodewindow.h89
-rw-r--r--src/plugins/platforms/openkode/resources.qrc6
-rw-r--r--src/plugins/platforms/openvglite/openvglite.pro12
-rw-r--r--src/plugins/platforms/openvglite/qgraphicssystem_vglite.cpp193
-rw-r--r--src/plugins/platforms/openvglite/qwindowsurface_vglite.cpp131
-rw-r--r--src/plugins/platforms/platforms.pro2
-rw-r--r--src/plugins/platforms/qnx/main.cpp11
-rw-r--r--src/plugins/platforms/qnx/main.h (renamed from src/plugins/platforms/openkode/shaders/vert.glslv)26
-rw-r--r--src/plugins/platforms/qnx/qnx.json3
-rw-r--r--src/plugins/platforms/qnx/qnx.pro107
-rw-r--r--src/plugins/platforms/qnx/qqnxabstractnavigator.cpp74
-rw-r--r--src/plugins/platforms/qnx/qqnxabstractnavigator.h66
-rw-r--r--src/plugins/platforms/qnx/qqnxbpseventfilter.cpp204
-rw-r--r--src/plugins/platforms/qnx/qqnxbpseventfilter.h (renamed from src/plugins/platforms/qvfb/qvfbwindowsurface.h)53
-rw-r--r--src/plugins/platforms/qnx/qqnxclipboard.cpp2
-rw-r--r--src/plugins/platforms/qnx/qqnxeventdispatcher_blackberry.cpp (renamed from src/plugins/platforms/qvfb/main.cpp)47
-rw-r--r--src/plugins/platforms/qnx/qqnxeventdispatcher_blackberry.h66
-rw-r--r--src/plugins/platforms/qnx/qqnxglcontext.cpp1
-rw-r--r--src/plugins/platforms/qnx/qqnxintegration.cpp152
-rw-r--r--src/plugins/platforms/qnx/qqnxintegration.h45
-rw-r--r--src/plugins/platforms/qnx/qqnxnavigatorbps.cpp (renamed from src/plugins/platforms/openvglite/main.cpp)41
-rw-r--r--src/plugins/platforms/qnx/qqnxnavigatorbps.h62
-rw-r--r--src/plugins/platforms/qnx/qqnxnavigatorpps.cpp192
-rw-r--r--src/plugins/platforms/qnx/qqnxnavigatorpps.h (renamed from src/plugins/platforms/openkode/main.cpp)45
-rw-r--r--src/plugins/platforms/qnx/qqnxscreeneventthread.cpp (renamed from src/plugins/platforms/qnx/qqnxeventthread.cpp)45
-rw-r--r--src/plugins/platforms/qnx/qqnxscreeneventthread.h (renamed from src/plugins/platforms/qnx/qqnxeventthread.h)12
-rw-r--r--src/plugins/platforms/qnx/qqnxservices.cpp17
-rw-r--r--src/plugins/platforms/qnx/qqnxservices.h7
-rw-r--r--src/plugins/platforms/qnx/qqnxvirtualkeyboardbps.cpp209
-rw-r--r--src/plugins/platforms/qnx/qqnxvirtualkeyboardbps.h (renamed from src/plugins/platforms/openkode/qopenkodeeventloopintegration.h)39
-rw-r--r--src/plugins/platforms/qnx/qqnxvirtualkeyboardpps.cpp (renamed from src/plugins/platforms/qnx/qqnxvirtualkeyboard.cpp)65
-rw-r--r--src/plugins/platforms/qnx/qqnxvirtualkeyboardpps.h (renamed from src/plugins/platforms/qnx/qqnxvirtualkeyboard.h)13
-rw-r--r--src/plugins/platforms/qnx/qqnxwindow.cpp16
-rw-r--r--src/plugins/platforms/qnx/qqnxwindow.h10
-rw-r--r--src/plugins/platforms/qvfb/qvfb.pro14
-rw-r--r--src/plugins/platforms/qvfb/qvfbintegration.cpp454
-rw-r--r--src/plugins/platforms/qvfb/qvfbintegration.h102
-rw-r--r--src/plugins/platforms/qvfb/qvfbwindowsurface.cpp108
-rw-r--r--src/plugins/platforms/windows/accessible/comutils.cpp4
-rw-r--r--src/plugins/platforms/windows/accessible/comutils.h4
-rw-r--r--src/plugins/platforms/windows/accessible/iaccessible2.cpp27
-rw-r--r--src/plugins/platforms/windows/accessible/qwindowsaccessibility.cpp12
-rw-r--r--src/plugins/platforms/windows/accessible/qwindowsaccessibility.h2
-rw-r--r--src/plugins/platforms/windows/accessible/qwindowsmsaaaccessible.cpp10
-rw-r--r--src/plugins/platforms/windows/accessible/qwindowsmsaaaccessible.h5
-rw-r--r--src/plugins/platforms/windows/main.cpp4
-rw-r--r--src/plugins/platforms/windows/qwindowsbackingstore.cpp5
-rw-r--r--src/plugins/platforms/windows/qwindowsclipboard.cpp2
-rw-r--r--src/plugins/platforms/windows/qwindowscontext.cpp6
-rw-r--r--src/plugins/platforms/windows/qwindowsdialoghelpers.cpp6
-rw-r--r--src/plugins/platforms/windows/qwindowsdialoghelpers.h4
-rw-r--r--src/plugins/platforms/windows/qwindowsfontdatabase.cpp608
-rw-r--r--src/plugins/platforms/windows/qwindowsfontdatabase.h9
-rw-r--r--src/plugins/platforms/windows/qwindowsfontdatabase_ft.cpp4
-rw-r--r--src/plugins/platforms/windows/qwindowsfontengine.cpp17
-rw-r--r--src/plugins/platforms/windows/qwindowsfontengine.h6
-rw-r--r--src/plugins/platforms/windows/qwindowsglcontext.cpp2
-rw-r--r--src/plugins/platforms/windows/qwindowsglcontext.h1
-rw-r--r--src/plugins/platforms/windows/qwindowsintegration.cpp13
-rw-r--r--src/plugins/platforms/windows/qwindowsintegration.h2
-rw-r--r--src/plugins/platforms/windows/qwindowswindow.cpp4
-rw-r--r--src/plugins/platforms/windows/windows.pro3
-rw-r--r--src/plugins/platforms/xcb/qxcbnativeinterface.cpp1
-rw-r--r--src/plugins/platforms/xcb/qxcbwindow.cpp2
-rw-r--r--src/plugins/platforms/xcb/qxcbwindow.h2
-rw-r--r--src/printsupport/dialogs/qabstractpagesetupdialog.h2
-rw-r--r--src/printsupport/dialogs/qabstractprintdialog.h2
-rw-r--r--src/printsupport/dialogs/qprintdialog_unix.cpp2
-rw-r--r--src/printsupport/kernel/qplatformprintersupport_qpa.cpp14
-rw-r--r--src/sql/doc/doc.pri3
-rw-r--r--src/sql/doc/images/foreignkeys.pngbin0 -> 3739 bytes
-rw-r--r--src/sql/doc/images/insertrowinmodelview.png (renamed from doc/src/images/insertrowinmodelview.png)bin3867 -> 3867 bytes
-rw-r--r--src/sql/doc/images/noforeignkeys.pngbin0 -> 3282 bytes
-rw-r--r--src/sql/doc/images/qdatawidgetmapper-simple.png (renamed from doc/src/images/qdatawidgetmapper-simple.png)bin26994 -> 26994 bytes
-rw-r--r--src/sql/doc/images/relationaltable.png (renamed from doc/src/images/relationaltable.png)bin4274 -> 4274 bytes
-rw-r--r--src/sql/doc/qtsql.qdocconf92
-rw-r--r--src/sql/doc/snippets/code/doc_src_qtsql.cpp (renamed from doc/src/snippets/code/doc_src_qtsql.cpp)0
-rw-r--r--src/sql/doc/snippets/code/doc_src_qtsql.pro3
-rw-r--r--src/sql/doc/snippets/code/doc_src_sql-driver.cpp (renamed from doc/src/snippets/code/doc_src_sql-driver.cpp)0
-rw-r--r--src/sql/doc/snippets/code/doc_src_sql-driver.qdoc (renamed from doc/src/snippets/code/doc_src_sql-driver.qdoc)0
-rw-r--r--src/sql/doc/snippets/code/src_sql_kernel_qsqldatabase.cpp (renamed from doc/src/snippets/code/src_sql_kernel_qsqldatabase.cpp)0
-rw-r--r--src/sql/doc/snippets/code/src_sql_kernel_qsqldriver.cpp (renamed from doc/src/snippets/code/src_sql_kernel_qsqldriver.cpp)0
-rw-r--r--src/sql/doc/snippets/code/src_sql_kernel_qsqlerror.cpp (renamed from doc/src/snippets/code/src_sql_kernel_qsqlerror.cpp)0
-rw-r--r--src/sql/doc/snippets/code/src_sql_kernel_qsqlquery.cpp (renamed from doc/src/snippets/code/src_sql_kernel_qsqlquery.cpp)0
-rw-r--r--src/sql/doc/snippets/code/src_sql_kernel_qsqlresult.cpp (renamed from doc/src/snippets/code/src_sql_kernel_qsqlresult.cpp)0
-rw-r--r--src/sql/doc/snippets/code/src_sql_models_qsqlquerymodel.cpp (renamed from doc/src/snippets/code/src_sql_models_qsqlquerymodel.cpp)0
-rw-r--r--src/sql/doc/snippets/sqldatabase/sqldatabase.cpp (renamed from doc/src/snippets/sqldatabase/sqldatabase.cpp)0
-rw-r--r--src/sql/doc/src/qsqldatatype-table.qdoc (renamed from doc/src/sql/sql-programming/qsqldatatype-table.qdoc)0
-rw-r--r--src/sql/doc/src/qtsql.qdoc (renamed from doc/src/sql/qtsql.qdoc)4
-rw-r--r--src/sql/doc/src/sql-driver.qdoc (renamed from doc/src/sql/sql-programming/sql-driver.qdoc)72
-rw-r--r--src/sql/doc/src/sql-programming.qdoc (renamed from doc/src/sql/sql-programming/sql-programming.qdoc)64
-rw-r--r--src/sql/drivers/mysql/qsql_mysql.cpp2
-rw-r--r--src/sql/drivers/odbc/qsql_odbc.cpp16
-rw-r--r--src/sql/kernel/qsql.qdoc2
-rw-r--r--src/sql/kernel/qsqldatabase.cpp60
-rw-r--r--src/sql/kernel/qsqldriver.cpp42
-rw-r--r--src/sql/kernel/qsqlerror.cpp12
-rw-r--r--src/sql/kernel/qsqlfield.cpp59
-rw-r--r--src/sql/kernel/qsqlquery.cpp69
-rw-r--r--src/sql/kernel/qsqlrecord.cpp20
-rw-r--r--src/sql/kernel/qsqlresult.cpp6
-rw-r--r--src/sql/models/qsqlquerymodel.cpp99
-rw-r--r--src/sql/models/qsqlquerymodel.h2
-rw-r--r--src/sql/models/qsqlquerymodel_p.h3
-rw-r--r--src/sql/models/qsqlrelationaldelegate.cpp2
-rw-r--r--src/sql/models/qsqlrelationaltablemodel.cpp12
-rw-r--r--src/sql/models/qsqltablemodel.cpp21
-rw-r--r--src/sql/sql.pro1
-rw-r--r--src/src.pro2
-rw-r--r--src/testlib/qbenchmarkvalgrind.cpp6
-rw-r--r--src/testlib/qtestcase.cpp78
-rw-r--r--src/testlib/qtestkeyboard.h2
-rw-r--r--src/testlib/qtesttouch.h31
-rw-r--r--src/testlib/testlib.pro7
-rw-r--r--src/tools/moc/generator.cpp30
-rw-r--r--src/tools/moc/outputrevision.h2
-rw-r--r--src/tools/qdbusxml2cpp/qdbusxml2cpp.cpp2
-rw-r--r--src/tools/qdoc/config.cpp1
-rw-r--r--src/tools/qdoc/config.h2
-rw-r--r--src/tools/qdoc/ditaxmlgenerator.cpp505
-rw-r--r--src/tools/qdoc/ditaxmlgenerator.h49
-rw-r--r--src/tools/qdoc/generator.cpp180
-rw-r--r--src/tools/qdoc/generator.h13
-rw-r--r--src/tools/qdoc/helpprojectwriter.cpp30
-rw-r--r--src/tools/qdoc/htmlgenerator.cpp182
-rw-r--r--src/tools/qdoc/htmlgenerator.h3
-rw-r--r--src/tools/qdoc/main.cpp62
-rw-r--r--src/tools/qdoc/node.cpp127
-rw-r--r--src/tools/qdoc/node.h25
-rw-r--r--src/tools/qdoc/puredocparser.cpp2
-rw-r--r--src/tools/qdoc/qdoc.pro10
-rw-r--r--src/tools/qdoc/tree.cpp31
-rw-r--r--src/widgets/accessible/qaccessiblewidget.cpp9
-rw-r--r--src/widgets/dialogs/dialogs.pri21
-rw-r--r--src/widgets/dialogs/qcolordialog.cpp5
-rw-r--r--src/widgets/dialogs/qcolordialog_mac.mm505
-rw-r--r--src/widgets/dialogs/qdialog.cpp6
-rw-r--r--src/widgets/dialogs/qfiledialog_mac.mm741
-rw-r--r--src/widgets/dialogs/qfilesystemmodel.cpp3
-rw-r--r--src/widgets/dialogs/qfontdialog.cpp21
-rw-r--r--src/widgets/dialogs/qfontdialog_mac.mm676
-rw-r--r--src/widgets/dialogs/qfontdialog_p.h2
-rw-r--r--src/widgets/dialogs/qmessagebox.cpp2
-rw-r--r--src/widgets/dialogs/qnspanelproxy_mac.mm228
-rw-r--r--src/widgets/graphicsview/qgraph_p.h12
-rw-r--r--src/widgets/graphicsview/qgraphicsanchorlayout_p.cpp22
-rw-r--r--src/widgets/graphicsview/qgraphicsanchorlayout_p.h10
-rw-r--r--src/widgets/graphicsview/qgraphicswidget.cpp2
-rw-r--r--src/widgets/graphicsview/qgridlayoutengine.cpp6
-rw-r--r--src/widgets/graphicsview/qsimplex_p.cpp6
-rw-r--r--src/widgets/graphicsview/qsimplex_p.h10
-rw-r--r--src/widgets/itemviews/qtreeview.cpp52
-rw-r--r--src/widgets/itemviews/qtreeview_p.h2
-rw-r--r--src/widgets/kernel/qapplication.cpp16
-rw-r--r--src/widgets/kernel/qapplication.h14
-rw-r--r--src/widgets/kernel/qapplication_p.h7
-rw-r--r--src/widgets/kernel/qicon.cpp2
-rw-r--r--src/widgets/kernel/qiconloader.cpp2
-rw-r--r--src/widgets/kernel/qlayoutitem.cpp4
-rw-r--r--src/widgets/kernel/qplatformmenu_qpa.cpp36
-rw-r--r--src/widgets/kernel/qwhatsthis.cpp5
-rw-r--r--src/widgets/kernel/qwidget.cpp28
-rw-r--r--src/widgets/kernel/qwidget_p.h2
-rw-r--r--src/widgets/kernel/qwidget_qpa.cpp1
-rw-r--r--src/widgets/kernel/qwidgetsvariant.cpp3
-rw-r--r--src/widgets/kernel/qwidgetwindow_qpa.cpp2
-rw-r--r--src/widgets/styles/qgtkstyle.cpp2
-rw-r--r--src/widgets/styles/qgtkstyle_p.cpp32
-rw-r--r--src/widgets/styles/qgtkstyle_p.h1
-rw-r--r--src/widgets/styles/qplastiquestyle.cpp8
-rw-r--r--src/widgets/styles/qstylesheetstyle.cpp2
-rw-r--r--src/widgets/styles/qwindowsvistastyle.cpp18
-rw-r--r--src/widgets/styles/qwindowsxpstyle.cpp48
-rw-r--r--src/widgets/styles/styles.pri4
-rw-r--r--src/widgets/widgets/qabstractspinbox.cpp14
-rw-r--r--src/widgets/widgets/qdatetimeedit.cpp2
-rw-r--r--src/widgets/widgets/qdialogbuttonbox.cpp4
-rw-r--r--src/widgets/widgets/qprogressbar.cpp6
-rw-r--r--src/widgets/widgets/qsplitter.cpp2
-rw-r--r--src/xml/doc/doc.pri3
-rw-r--r--src/xml/doc/qtxml.qdocconf92
-rw-r--r--src/xml/doc/snippets/code/doc_src_qtxml.cpp (renamed from doc/src/snippets/code/doc_src_qtxml.cpp)0
-rw-r--r--src/xml/doc/snippets/code/doc_src_qtxml.pro3
-rw-r--r--src/xml/doc/snippets/code/doc_src_qtxml.qdoc102
-rw-r--r--src/xml/doc/snippets/code/src_xml_dom_qdom.cpp (renamed from doc/src/snippets/code/src_xml_dom_qdom.cpp)0
-rw-r--r--src/xml/doc/snippets/code/src_xml_sax_qxml.cpp (renamed from doc/src/snippets/code/src_xml_sax_qxml.cpp)0
-rw-r--r--src/xml/doc/snippets/rsslisting/handler.cpp (renamed from doc/src/snippets/xml/rsslisting/handler.cpp)0
-rw-r--r--src/xml/doc/snippets/rsslisting/rsslisting.cpp (renamed from doc/src/snippets/xml/rsslisting/rsslisting.cpp)0
-rw-r--r--src/xml/doc/snippets/simpleparse/main.cpp (renamed from doc/src/snippets/xml/simpleparse/main.cpp)0
-rw-r--r--src/xml/doc/src/external-resources.qdoc36
-rw-r--r--src/xml/doc/src/qtxml.qdoc (renamed from doc/src/xml/qtxml.qdoc)8
-rw-r--r--src/xml/doc/src/xml-processing.qdoc613
-rw-r--r--src/xml/dom/qdom.cpp214
-rw-r--r--src/xml/sax/qxml.cpp25
-rw-r--r--src/xml/xml.pro1
-rw-r--r--tests/auto/auto.pro10
-rw-r--r--tests/auto/cmake/CMakeLists.txt (renamed from tests/manual/cmake/CMakeLists.txt)13
-rw-r--r--tests/auto/cmake/cmake.pro54
-rw-r--r--tests/auto/cmake/fail4/CMakeLists.txt (renamed from tests/manual/cmake/fail4/CMakeLists.txt)0
-rw-r--r--tests/auto/cmake/fail4/myobject.cpp (renamed from tests/manual/cmake/fail4/myobject.cpp)0
-rw-r--r--tests/auto/cmake/fail4/myobject.h (renamed from tests/manual/cmake/fail4/myobject.h)0
-rw-r--r--tests/auto/cmake/fail4/pass4.qrc (renamed from tests/manual/cmake/fail4/pass4.qrc)0
-rw-r--r--tests/auto/cmake/fail4/resource_file.txt (renamed from tests/manual/cmake/fail4/resource_file.txt)0
-rw-r--r--tests/auto/cmake/fail5/CMakeLists.txt (renamed from tests/manual/cmake/fail5/CMakeLists.txt)0
-rw-r--r--tests/auto/cmake/fail5/myobject.cpp (renamed from tests/manual/cmake/fail5/myobject.cpp)0
-rw-r--r--tests/auto/cmake/fail5/myobject.h (renamed from tests/manual/cmake/fail5/myobject.h)0
-rw-r--r--tests/auto/cmake/pass(needsquoting)6/CMakeLists.txt (renamed from tests/manual/cmake/pass(needsquoting)6/CMakeLists.txt)0
-rw-r--r--tests/auto/cmake/pass(needsquoting)6/mywidget.cpp (renamed from tests/manual/cmake/pass(needsquoting)6/mywidget.cpp)0
-rw-r--r--tests/auto/cmake/pass(needsquoting)6/mywidget.h (renamed from tests/manual/cmake/pass(needsquoting)6/mywidget.h)0
-rw-r--r--tests/auto/cmake/pass(needsquoting)6/mywidget.ui (renamed from tests/manual/cmake/pass(needsquoting)6/mywidget.ui)0
-rw-r--r--tests/auto/cmake/pass1/CMakeLists.txt (renamed from tests/manual/cmake/pass1/CMakeLists.txt)0
-rw-r--r--tests/auto/cmake/pass1/three.cpp (renamed from tests/manual/cmake/pass1/three.cpp)0
-rw-r--r--tests/auto/cmake/pass1/two.cpp (renamed from tests/manual/cmake/pass1/two.cpp)0
-rw-r--r--tests/auto/cmake/pass2/CMakeLists.txt (renamed from tests/manual/cmake/pass2/CMakeLists.txt)0
-rw-r--r--tests/auto/cmake/pass2/myobject.cpp (renamed from tests/manual/cmake/pass2/myobject.cpp)0
-rw-r--r--tests/auto/cmake/pass2/myobject.h (renamed from tests/manual/cmake/pass2/myobject.h)0
-rw-r--r--tests/auto/cmake/pass2/pass2.qrc (renamed from tests/manual/cmake/pass2/pass2.qrc)0
-rw-r--r--tests/auto/cmake/pass2/resource_file.txt (renamed from tests/manual/cmake/pass2/resource_file.txt)0
-rw-r--r--tests/auto/cmake/pass3/CMakeLists.txt (renamed from tests/manual/cmake/pass3/CMakeLists.txt)0
-rw-r--r--tests/auto/cmake/pass3/mywidget.cpp (renamed from tests/manual/cmake/pass3/mywidget.cpp)0
-rw-r--r--tests/auto/cmake/pass3/mywidget.h (renamed from tests/manual/cmake/pass3/mywidget.h)0
-rw-r--r--tests/auto/cmake/pass3/mywidget.ui (renamed from tests/manual/cmake/pass3/mywidget.ui)0
-rw-r--r--tests/auto/cmake/pass7/CMakeLists.txt (renamed from tests/manual/cmake/pass7/CMakeLists.txt)0
-rw-r--r--tests/auto/cmake/pass7/main.cpp (renamed from tests/manual/cmake/pass7/main.cpp)0
-rw-r--r--tests/auto/cmake/pass8/CMakeLists.txt (renamed from tests/manual/cmake/pass8/CMakeLists.txt)0
-rw-r--r--tests/auto/cmake/pass8/myobject.cpp (renamed from tests/manual/cmake/pass8/myobject.cpp)0
-rw-r--r--tests/auto/cmake/pass8/myobject.h (renamed from tests/manual/cmake/pass8/myobject.h)0
-rw-r--r--tests/auto/cmake/pass9/CMakeLists.txt (renamed from tests/manual/cmake/pass9/CMakeLists.txt)8
-rw-r--r--tests/auto/cmake/pass9/mydbusobject.cpp (renamed from tests/manual/cmake/pass9/mydbusobject.cpp)0
-rw-r--r--tests/auto/cmake/pass9/mydbusobject.h (renamed from tests/manual/cmake/pass9/mydbusobject.h)0
-rw-r--r--tests/auto/concurrent/qtconcurrentfilter/qtconcurrentfilter.pro2
-rw-r--r--tests/auto/concurrent/qtconcurrentfilter/tst_qtconcurrentfilter.cpp2
-rw-r--r--tests/auto/corelib/animation/qanimationgroup/tst_qanimationgroup.cpp8
-rw-r--r--tests/auto/corelib/animation/qparallelanimationgroup/tst_qparallelanimationgroup.cpp66
-rw-r--r--tests/auto/corelib/animation/qpropertyanimation/tst_qpropertyanimation.cpp22
-rw-r--r--tests/auto/corelib/animation/qsequentialanimationgroup/tst_qsequentialanimationgroup.cpp50
-rw-r--r--tests/auto/corelib/codecs/qtextcodec/tst_qtextcodec.cpp8
-rw-r--r--tests/auto/corelib/io/qprocess/test/test.pro4
-rw-r--r--tests/auto/corelib/io/qprocess/tst_qprocess.cpp16
-rw-r--r--tests/auto/corelib/io/qsettings/tst_qsettings.cpp7
-rw-r--r--tests/auto/corelib/io/qtextstream/tst_qtextstream.cpp46
-rw-r--r--tests/auto/corelib/io/qurl/tst_qurl.cpp22
-rw-r--r--tests/auto/corelib/itemmodels/itemmodels.pro2
-rw-r--r--tests/auto/corelib/itemmodels/qitemmodel/tst_qitemmodel.cpp14
-rw-r--r--tests/auto/corelib/kernel/qmetamethod/tst_qmetamethod.cpp64
-rw-r--r--tests/auto/corelib/kernel/qmetaobjectbuilder/tst_qmetaobjectbuilder.cpp28
-rw-r--r--tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp2
-rw-r--r--tests/auto/corelib/kernel/qobject/tst_qobject.cpp383
-rw-r--r--tests/auto/corelib/kernel/qtimer/tst_qtimer.cpp6
-rw-r--r--tests/auto/corelib/kernel/qvariant/tst_qvariant.cpp290
-rw-r--r--tests/auto/corelib/plugin/qfactoryloader/test/test.pro1
-rw-r--r--tests/auto/corelib/plugin/qpluginloader/tst/tst.pro2
-rw-r--r--tests/auto/corelib/tools/qbytearray/tst_qbytearray.cpp8
-rw-r--r--tests/auto/corelib/tools/qchar/tst_qchar.cpp86
-rw-r--r--tests/auto/corelib/tools/qeasingcurve/tst_qeasingcurve.cpp6
-rw-r--r--tests/auto/corelib/tools/qlocale/test/test.pro1
-rw-r--r--tests/auto/corelib/tools/qstring/tst_qstring.cpp122
-rw-r--r--tests/auto/corelib/tools/qstringbuilder/qstringbuilder1/stringbuilder.cpp10
-rw-r--r--tests/auto/corelib/tools/qtimeline/qtimeline.pro1
-rw-r--r--tests/auto/corelib/tools/qtimeline/tst_qtimeline.cpp28
-rw-r--r--tests/auto/corelib/xml/qxmlstream/tst_qxmlstream.cpp2
-rw-r--r--tests/auto/dbus/qdbusabstractadaptor/tst_qdbusabstractadaptor.cpp26
-rw-r--r--tests/auto/dbus/qdbusabstractinterface/pinger.h8
-rw-r--r--tests/auto/dbus/qdbusabstractinterface/tst_qdbusabstractinterface.cpp22
-rw-r--r--tests/auto/dbus/qdbusinterface/tst_qdbusinterface.cpp14
-rw-r--r--tests/auto/dbus/qdbuslocalcalls/tst_qdbuslocalcalls.cpp4
-rw-r--r--tests/auto/dbus/qdbusmarshall/tst_qdbusmarshall.cpp352
-rw-r--r--tests/auto/gui/image/qimage/tst_qimage.cpp4
-rw-r--r--tests/auto/gui/image/qimagereader/tst_qimagereader.cpp3
-rw-r--r--tests/auto/gui/image/qimagewriter/tst_qimagewriter.cpp3
-rw-r--r--tests/auto/gui/kernel/kernel.pro1
-rw-r--r--tests/auto/gui/kernel/qbackingstore/qbackingstore.pro3
-rw-r--r--tests/auto/gui/kernel/qclipboard/test/test.pro2
-rw-r--r--tests/auto/gui/kernel/qclipboard/tst_qclipboard.cpp6
-rw-r--r--tests/auto/gui/kernel/qguiapplication/qguiapplication.pro2
-rw-r--r--tests/auto/gui/kernel/qguiapplication/tst_qguiapplication.cpp6
-rw-r--r--tests/auto/gui/kernel/qguitimer/qguitimer.pro4
-rw-r--r--tests/auto/gui/kernel/qkeysequence/tst_qkeysequence.cpp34
-rw-r--r--tests/auto/gui/kernel/qwindow/qwindow.pro1
-rw-r--r--tests/auto/gui/kernel/qwindow/tst_qwindow.cpp84
-rw-r--r--tests/auto/gui/math3d/qmatrixnxn/tst_qmatrixnxn.cpp6
-rw-r--r--tests/auto/gui/math3d/qquaternion/tst_qquaternion.cpp6
-rw-r--r--tests/auto/gui/math3d/qvectornd/tst_qvectornd.cpp18
-rw-r--r--tests/auto/gui/qopengl/qopengl.pro1
-rw-r--r--tests/auto/gui/text/qfontdatabase/qfontdatabase.pro2
-rw-r--r--tests/auto/gui/text/qfontdatabase/tst_qfontdatabase.cpp5
-rw-r--r--tests/auto/gui/text/qfontmetrics/tst_qfontmetrics.cpp2
-rw-r--r--tests/auto/gui/text/qrawfont/qrawfont.pro2
-rw-r--r--tests/auto/gui/text/qrawfont/tst_qrawfont.cpp11
-rw-r--r--tests/auto/gui/text/qstatictext/qstatictext.pro2
-rw-r--r--tests/auto/gui/text/qtextlayout/qtextlayout.pro2
-rw-r--r--tests/auto/gui/text/qtextscriptengine/qtextscriptengine.pro2
-rw-r--r--tests/auto/gui/text/qtextscriptengine/tst_qtextscriptengine.cpp6
-rw-r--r--tests/auto/gui/text/text.pro4
-rw-r--r--tests/auto/network/access/qnetworkcookie/tst_qnetworkcookie.cpp10
-rw-r--r--tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp198
-rw-r--r--tests/auto/network/access/qnetworkrequest/tst_qnetworkrequest.cpp22
-rw-r--r--tests/auto/network/kernel/kernel.pro2
-rw-r--r--tests/auto/network/kernel/qdnslookup/tst_qdnslookup.cpp4
-rw-r--r--tests/auto/network/kernel/qnetworkinterface/qnetworkinterface.pro2
-rw-r--r--tests/auto/network/kernel/qnetworkproxyfactory/tst_qnetworkproxyfactory.cpp4
-rw-r--r--tests/auto/network/network.pro6
-rw-r--r--tests/auto/network/socket/qlocalsocket/tst_qlocalsocket.cpp12
-rw-r--r--tests/auto/network/socket/qsocks5socketengine/qsocks5socketengine.pro2
-rw-r--r--tests/auto/network/socket/qsocks5socketengine/tst_qsocks5socketengine.cpp13
-rw-r--r--tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp6
-rw-r--r--tests/auto/network/socket/qudpsocket/test/test.pro2
-rw-r--r--tests/auto/network/ssl/qsslsocket/qsslsocket.pro5
-rw-r--r--tests/auto/network/ssl/qsslsocket/tst_qsslsocket.cpp265
-rw-r--r--tests/auto/network/ssl/qsslsocket_onDemandCertificates_member/qsslsocket_onDemandCertificates_member.pro2
-rw-r--r--tests/auto/network/ssl/qsslsocket_onDemandCertificates_static/qsslsocket_onDemandCertificates_static.pro2
-rw-r--r--tests/auto/opengl/qgl/qgl.pro3
-rw-r--r--tests/auto/opengl/qglthreads/qglthreads.pro2
-rw-r--r--tests/auto/other/headersclean/headersclean.pri2
-rw-r--r--tests/auto/other/lancelot/lancelot.pro2
-rw-r--r--tests/auto/other/lancelot/paintcommands.cpp2
-rw-r--r--tests/auto/other/lancelot/tst_lancelot.cpp3
-rw-r--r--tests/auto/other/modeltest/modeltest.cpp14
-rw-r--r--tests/auto/other/other.pro4
-rw-r--r--tests/auto/other/qaccessibility/qaccessibility.pro2
-rw-r--r--tests/auto/other/qaccessibility/tst_qaccessibility.cpp3
-rw-r--r--tests/auto/other/qfocusevent/qfocusevent.pro1
-rw-r--r--tests/auto/other/qfocusevent/tst_qfocusevent.cpp3
-rw-r--r--tests/auto/printsupport/kernel/qprinter/qprinter.pro2
-rw-r--r--tests/auto/printsupport/kernel/qprinterinfo/qprinterinfo.pro2
-rw-r--r--tests/auto/sql/kernel/qsqldatabase/tst_qsqldatabase.cpp2
-rw-r--r--tests/auto/sql/kernel/qsqlquery/tst_qsqlquery.cpp64
-rw-r--r--tests/auto/sql/models/qsqlquerymodel/tst_qsqlquerymodel.cpp56
-rw-r--r--tests/auto/sql/models/qsqltablemodel/tst_qsqltablemodel.cpp52
-rw-r--r--tests/auto/tools/moc/tst_moc.cpp19
-rw-r--r--tests/auto/widgets/dialogs/dialogs.pro2
-rw-r--r--tests/auto/widgets/dialogs/qdialog/qdialog.pro1
-rw-r--r--tests/auto/widgets/dialogs/qfiledialog/tst_qfiledialog.cpp26
-rw-r--r--tests/auto/widgets/dialogs/qfiledialog2/tst_qfiledialog2.cpp4
-rw-r--r--tests/auto/widgets/dialogs/qfontdialog/tst_qfontdialog.cpp5
-rw-r--r--tests/auto/widgets/dialogs/qinputdialog/tst_qinputdialog.cpp4
-rw-r--r--tests/auto/widgets/effects/qgraphicseffect/qgraphicseffect.pro1
-rw-r--r--tests/auto/widgets/graphicsview/qgraphicsanchorlayout1/tst_qgraphicsanchorlayout1.cpp4
-rw-r--r--tests/auto/widgets/graphicsview/qgraphicsgridlayout/tst_qgraphicsgridlayout.cpp10
-rw-r--r--tests/auto/widgets/graphicsview/qgraphicsitem/tst_qgraphicsitem.cpp80
-rw-r--r--tests/auto/widgets/graphicsview/qgraphicsproxywidget/qgraphicsproxywidget.pro5
-rw-r--r--tests/auto/widgets/graphicsview/qgraphicsproxywidget/tst_qgraphicsproxywidget.cpp14
-rw-r--r--tests/auto/widgets/graphicsview/qgraphicsscene/qgraphicsscene.pro2
-rw-r--r--tests/auto/widgets/graphicsview/qgraphicsscene/tst_qgraphicsscene.cpp2
-rw-r--r--tests/auto/widgets/graphicsview/qgraphicsview/qgraphicsview.pro4
-rw-r--r--tests/auto/widgets/graphicsview/qgraphicsview/tst_qgraphicsview.cpp9
-rw-r--r--tests/auto/widgets/graphicsview/qgraphicswidget/qgraphicswidget.pro2
-rw-r--r--tests/auto/widgets/graphicsview/qgraphicswidget/tst_qgraphicswidget.cpp14
-rw-r--r--tests/auto/widgets/itemviews/qheaderview/tst_qheaderview.cpp2
-rw-r--r--tests/auto/widgets/itemviews/qitemdelegate/qitemdelegate.pro2
-rw-r--r--tests/auto/widgets/itemviews/qlistview/tst_qlistview.cpp8
-rw-r--r--tests/auto/widgets/itemviews/qlistwidget/tst_qlistwidget.cpp2
-rw-r--r--tests/auto/widgets/itemviews/qtreeview/tst_qtreeview.cpp58
-rw-r--r--tests/auto/widgets/kernel/kernel.pro2
-rw-r--r--tests/auto/widgets/kernel/qapplication/tst_qapplication.cpp53
-rw-r--r--tests/auto/widgets/kernel/qgridlayout/tst_qgridlayout.cpp8
-rw-r--r--tests/auto/widgets/kernel/qshortcut/tst_qshortcut.cpp12
-rw-r--r--tests/auto/widgets/kernel/qwidget/qwidget.pro2
-rw-r--r--tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp581
-rw-r--r--tests/auto/widgets/styles/qmacstyle/qmacstyle.pro3
-rw-r--r--tests/auto/widgets/styles/qmacstyle/tst_qmacstyle.cpp3
-rw-r--r--tests/auto/widgets/util/qcompleter/qcompleter.pro2
-rw-r--r--tests/auto/widgets/util/qcompleter/tst_qcompleter.cpp2
-rw-r--r--tests/auto/widgets/widgets/qcombobox/qcombobox.pro2
-rw-r--r--tests/auto/widgets/widgets/qcombobox/tst_qcombobox.cpp30
-rw-r--r--tests/auto/widgets/widgets/qdatetimeedit/qdatetimeedit.pro1
-rw-r--r--tests/auto/widgets/widgets/qdatetimeedit/tst_qdatetimeedit.cpp43
-rw-r--r--tests/auto/widgets/widgets/qdoublespinbox/qdoublespinbox.pro2
-rw-r--r--tests/auto/widgets/widgets/qmdiarea/qmdiarea.pro2
-rw-r--r--tests/auto/widgets/widgets/qmdiarea/tst_qmdiarea.cpp19
-rw-r--r--tests/auto/widgets/widgets/qmdisubwindow/qmdisubwindow.pro3
-rw-r--r--tests/auto/widgets/widgets/qmdisubwindow/tst_qmdisubwindow.cpp12
-rw-r--r--tests/auto/widgets/widgets/qmenubar/qmenubar.pro2
-rw-r--r--tests/auto/widgets/widgets/qmenubar/tst_qmenubar.cpp2
-rw-r--r--tests/auto/widgets/widgets/qplaintextedit/tst_qplaintextedit.cpp2
-rw-r--r--tests/auto/widgets/widgets/qpushbutton/tst_qpushbutton.cpp22
-rw-r--r--tests/auto/widgets/widgets/qsizegrip/qsizegrip.pro2
-rw-r--r--tests/auto/widgets/widgets/qsizegrip/tst_qsizegrip.cpp1
-rw-r--r--tests/auto/widgets/widgets/qstatusbar/tst_qstatusbar.cpp4
-rw-r--r--tests/auto/widgets/widgets/qtextedit/tst_qtextedit.cpp2
-rw-r--r--tests/baselineserver/src/baselineserver.cpp1
-rw-r--r--tests/benchmarks/corelib/kernel/qvariant/tst_qvariant.cpp2
-rw-r--r--tests/benchmarks/dbus/qdbusperformance/server/server.cpp2
-rw-r--r--tests/benchmarks/dbus/qdbusperformance/serverobject.h2
-rw-r--r--tests/benchmarks/dbus/qdbusperformance/tst_qdbusperformance.cpp14
-rw-r--r--tests/manual/bearerex/bearerex.cpp8
-rw-r--r--tests/manual/keypadnavigation/main.cpp2
-rw-r--r--tests/manual/lance/main.cpp8
-rw-r--r--tests/manual/manual.pro1
-rw-r--r--tests/manual/windowflags/controllerwindow.cpp132
-rw-r--r--tests/manual/windowflags/controllerwindow.h37
-rw-r--r--tests/manual/windowflags/controls.cpp314
-rw-r--r--tests/manual/windowflags/controls.h171
-rw-r--r--tests/manual/windowflags/previewwindow.cpp6
-rw-r--r--tests/manual/windowflags/previewwindow.h6
-rw-r--r--tests/manual/windowflags/windowflags.pro9
-rw-r--r--tests/manual/windowgeometry/controllerwidget.cpp483
-rw-r--r--tests/manual/windowgeometry/controllerwidget.h168
-rw-r--r--tests/manual/windowgeometry/main.cpp51
-rw-r--r--tests/manual/windowgeometry/windowgeometry.pro9
-rw-r--r--tools/configure/configureapp.cpp27
-rwxr-xr-xutil/local_database/qlocalexml2cpp.py2
-rw-r--r--util/unicode/main.cpp257
1155 files changed, 26220 insertions, 35508 deletions
diff --git a/bin/syncqt b/bin/syncqt
index 3e77d2001d..bc2ccf38ae 100755
--- a/bin/syncqt
+++ b/bin/syncqt
@@ -959,6 +959,9 @@ foreach my $lib (@modules_to_sync) {
#calc subdirs
my @subdirs = ($headers_dir);
foreach my $subdir (@subdirs) {
+ if ($subdir =~ /\/doc$/) {
+ next;
+ }
opendir DIR, $subdir or next;
foreach my $t (sort readdir(DIR)) {
push @subdirs, "$subdir/$t" if(-d "$subdir/$t" && !($t eq ".") &&
diff --git a/config.tests/arch/arch.cpp b/config.tests/arch/arch.cpp
index 1a96fb982f..b1ec3d7111 100644
--- a/config.tests/arch/arch.cpp
+++ b/config.tests/arch/arch.cpp
@@ -40,6 +40,7 @@
****************************************************************************/
// NOTE: This file is not meant to be compiled, only preprocessed.
+#define QGLOBAL_H
#include "../../src/corelib/global/qprocessordetection.h"
#undef alpha
#undef arm
diff --git a/config.tests/unix/directfb/directfb.cpp b/config.tests/unix/directfb/directfb.cpp
new file mode 100644
index 0000000000..a5a0bd4760
--- /dev/null
+++ b/config.tests/unix/directfb/directfb.cpp
@@ -0,0 +1,51 @@
+/****************************************************************************
+**
+** Copyright (C) 2012 Intel Corporation
+** Contact: http://www.qt-project.org/
+**
+** This file is part of the config.tests of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** This file may be used under the terms of the GNU Lesser General Public
+** License version 2.1 as published by the Free Software Foundation and
+** appearing in the file LICENSE.LGPL included in the packaging of this
+** file. Please review the following information to ensure the GNU Lesser
+** General Public License version 2.1 requirements will be met:
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights. These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU General
+** Public License version 3.0 as published by the Free Software Foundation
+** and appearing in the file LICENSE.GPL included in the packaging of this
+** file. Please review the following information to ensure the GNU General
+** Public License version 3.0 requirements will be met:
+** http://www.gnu.org/copyleft/gpl.html.
+**
+** Other Usage
+** Alternatively, this file may be used in accordance with the terms and
+** conditions contained in a signed written agreement between you and Nokia.
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <directfb.h>
+
+#ifdef __typeof__
+#error DirectFB headers are unclean and cannot compile
+#endif
+
+int main(int, char **)
+{
+ return 0;
+}
diff --git a/config.tests/unix/directfb/directfb.pro b/config.tests/unix/directfb/directfb.pro
new file mode 100644
index 0000000000..958ced7bea
--- /dev/null
+++ b/config.tests/unix/directfb/directfb.pro
@@ -0,0 +1,3 @@
+SOURCES = directfb.cpp
+CONFIG -= qt
+mac:CONFIG -= app_bundle
diff --git a/configure b/configure
index 1da85c5408..a6af39b0cb 100755
--- a/configure
+++ b/configure
@@ -155,7 +155,7 @@ BEGIN {
ovalue = ovalue substr(value, 1, RSTART - 1)
var = substr(value, RSTART + 2, RLENGTH - 2)
value = substr(value, RSTART + RLENGTH)
- if (var ~ /^{/) {
+ if (var ~ /^\{/) {
var = substr(var, 2, length(var) - 2)
}
ovalue = ovalue values[var]
@@ -818,6 +818,9 @@ QT_LIBS_GLIB=
QT_CFLAGS_GSTREAMER=
QT_LIBS_GSTREAMER=
+# default qpa platform
+QT_QPA_DEFAULT_PLATFORM=
+
#-------------------------------------------------------------------------------
# check SQL drivers available in this package
#-------------------------------------------------------------------------------
@@ -900,7 +903,7 @@ while [ "$#" -gt 0 ]; do
shift
VAL=$1
;;
- -prefix|-docdir|-headerdir|-plugindir|-importdir|-datadir|-libdir|-bindir|-translationdir|-sysconfdir|-examplesdir|-testsdir|-depths|-make|-nomake|-platform|-xplatform|-device|-device-option|-sdk|-arch|-host-arch|-mysql_config|-sysroot|-hostdatadir|-hostbindir)
+ -prefix|-docdir|-headerdir|-plugindir|-importdir|-datadir|-libdir|-bindir|-translationdir|-sysconfdir|-examplesdir|-testsdir|-depths|-make|-nomake|-platform|-xplatform|-device|-device-option|-sdk|-arch|-host-arch|-mysql_config|-sysroot|-hostdatadir|-hostbindir|-qpa)
VAR=`echo $1 | sed "s,^-\(.*\),\1,"`
shift
VAL="$1"
@@ -1292,6 +1295,9 @@ while [ "$#" -gt 0 ]; do
DEV_VAL=`echo $VAL | sed "s,^.*=\(.*\),\1,"`
DeviceVar set $DEV_VAR $DEV_VAL
;;
+ qpa)
+ QT_QPA_DEFAULT_PLATFORM="$VAL"
+ ;;
debug-and-release)
if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then
CFG_DEBUG_RELEASE="$VAL"
@@ -2344,6 +2350,7 @@ PLATFORMS=`find "$relpath/mkspecs/" -type f | grep -v qws | sed "s,$relpath/mksp
case `basename "$XPLATFORM"` in win32-g++*) XPLATFORM_MINGW=yes;; esac
case "$XPLATFORM" in linux-g++-maemo) XPLATFORM_MAEMO=yes;; esac
+case "$XPLATFORM" in qnx-*) XPLATFORM_QNX=yes;; esac
if [ -d "$PLATFORM" ]; then
QMAKESPEC="$PLATFORM"
@@ -2428,15 +2435,6 @@ if [ "$CFG_RTOS_ENABLED" = "no" ]; then
fi
#-------------------------------------------------------------------------------
-# write out device config before we run the test.
-#-------------------------------------------------------------------------------
-if cmp -s "$DEVICE_VARS_FILE" "$outpath/mkspecs/qdevice.pri"; then
- rm -f "$DEVICE_VARS_FILE"
-else
- mv -f $DEVICE_VARS_FILE "$outpath/mkspecs/qdevice.pri"
-fi
-
-#-------------------------------------------------------------------------------
# tests that don't need qmake (must be run before displaying help)
#-------------------------------------------------------------------------------
@@ -2816,7 +2814,7 @@ if [ "$OPT_HELP" = "yes" ]; then
EGLFSN=" "
fi
- if [ "$CFG_DIRECTFB" = "no"]; then
+ if [ "$CFG_DIRECTFB" = "no" ]; then
DFBY=" "
DFBN="*"
else
@@ -3112,11 +3110,13 @@ Additional options:
$XCBY -xcb ............... Compile Xcb support.
$EGLFSN -no-eglfs .......... Do not compile EGLFS (EGL Full Screen/Single Surface) support.
- $EGLFSY -eglfs ............. Compile EGLFS support.
+ $EGLFSY -eglfs ............. Compile EGLFS support (Requires OpenGL ES 2 support).
$DFBN -no-directfb ....... Do not compile DirectFB support.
$DFBY -directfb .......... Compile DirectFB support.
+ -qpa <name> ......... Sets the default QPA platform (e.g xcb, cocoa, windows).
+
-xplatform target ... The target platform when cross-compiling.
-sysroot <dir> ...... Sets <dir> as the target compiler's and qmake's sysroot.
@@ -3661,6 +3661,15 @@ if [ -z "$PKG_CONFIG" ]; then
fi
#-------------------------------------------------------------------------------
+# write out device config before we run the test.
+#-------------------------------------------------------------------------------
+if cmp -s "$DEVICE_VARS_FILE" "$outpath/mkspecs/qdevice.pri"; then
+ rm -f "$DEVICE_VARS_FILE"
+else
+ mv -f $DEVICE_VARS_FILE "$outpath/mkspecs/qdevice.pri"
+fi
+
+#-------------------------------------------------------------------------------
# tests that need qmake
#-------------------------------------------------------------------------------
@@ -3873,6 +3882,11 @@ if [ "$CFG_EGLFS" = "yes" ]; then
echo "The EGLFS plugin requires EGL support and cannot be built"
exit 101
fi
+ if [ "$CFG_OPENGL" != "es2" ]; then
+ echo "The EGLFS plugin requires OpenGL ES 2 support and cannot be built"
+ exit 101
+ fi
+ CFG_OPENGL="es2"
CFG_EGL=yes
fi
@@ -4231,6 +4245,32 @@ if [ "$CFG_GLIB" != "no" ]; then
fi
fi
+# auto-detect GTK style support
+if [ "$CFG_GLIB" = "yes" -a "$CFG_QGTKSTYLE" != "no" ]; then
+ if [ -n "$PKG_CONFIG" ]; then
+ QT_CFLAGS_QGTKSTYLE=`$PKG_CONFIG --cflags gtk+-2.0 ">=" 2.10 atk 2>/dev/null`
+ QT_LIBS_QGTKSTYLE=`$PKG_CONFIG --libs gobject-2.0 2>/dev/null`
+ fi
+ if [ -n "$QT_CFLAGS_QGTKSTYLE" ] ; then
+ CFG_QGTKSTYLE=yes
+ QT_CONFIG="$QT_CONFIG gtkstyle"
+ QMakeVar set QT_CFLAGS_QGTKSTYLE "$QT_CFLAGS_QGTKSTYLE"
+ QMakeVar set QT_LIBS_QGTKSTYLE "$QT_LIBS_QGTKSTYLE"
+ else
+ if [ "$CFG_QGTKSTYLE" = "yes" ] && [ "$CFG_CONFIGURE_EXIT_ON_ERROR" = "yes" ]; then
+ echo "Gtk theme support cannot be enabled due to functionality tests!"
+ echo " Turn on verbose messaging (-v) to $0 to see the fin al report."
+ echo " If you believe this message is in error you may use the continue"
+ echo " switch (-continue) to $0 to continue."
+ exit 101
+ else
+ CFG_QGTKSTYLE=no
+ fi
+ fi
+elif [ "$CFG_GLIB" = "no" ]; then
+ CFG_QGTKSTYLE=no
+fi
+
# ### Vestige
if [ "$CFG_GLIB" = "yes" -a "$CFG_GSTREAMER" != "no" ]; then
if [ -n "$PKG_CONFIG" ]; then
@@ -4569,7 +4609,17 @@ if [ "$CFG_DIRECTFB" != "no" ]; then
if [ -n "$PKG_CONFIG" ] && $PKG_CONFIG --exists directfb 2>/dev/null; then
QMAKE_CFLAGS_DIRECTFB=`$PKG_CONFIG --cflags directfb 2>/dev/null`
QMAKE_LIBS_DIRECTFB=`$PKG_CONFIG --libs directfb 2>/dev/null`
- QT_CONFIG="$QT_CONFIG directfb"
+ if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" "config.tests/unix/directfb" "DirectFB" $L_FLAGS $I_FLAGS $l_FLAGS $QMAKE_CFLAGS_DIRECTFB $QMAKE_LIBS_DIRECTFB; then
+ CFG_DIRECTFB=yes
+ elif [ "$CFG_DIRECTFB" = "yes" ] && [ "$CFG_CONFIGURE_EXIT_ON_ERROR" = "yes" ]; then
+ echo " DirectFB support cannot be enabled due to functionality tests!"
+ echo " Turn on verbose messaging (-v) to $0 to see the final report."
+ echo " If you believe this message is in error you may use the continue"
+ echo " switch (-continue) to $0 to continue."
+ exit 101
+ else
+ CFG_DIRECTFB=no
+ fi
else
CFG_DIRECTFB=no
fi
@@ -4614,7 +4664,26 @@ elif [ "$CFG_OPENGL" = "desktop" ]; then
fi
if [ "$CFG_EGLFS" != "no" ]; then
- CFG_EGLFS="$CFG_EGL"
+ if [ "$CFG_OPENGL" = "es2" ]; then
+ CFG_EGLFS="$CFG_EGL"
+ else
+ CFG_EGLFS="no"
+ fi
+fi
+
+# Determine the default QPA platform
+if [ -z "$QT_QPA_DEFAULT_PLATFORM" ]; then
+ # check the mkspec
+ QT_QPA_DEFAULT_PLATFORM=`getXQMakeConf QT_QPA_DEFAULT_PLATFORM`
+ if [ -z "$QT_QPA_DEFAULT_PLATFORM" ]; then
+ if [ "$BUILD_ON_MAC" = "yes" ]; then
+ QT_QPA_DEFAULT_PLATFORM="cocoa"
+ elif [ "$UNAME_SYSTEM" = "QNX" ]; then
+ QT_QPA_DEFAULT_PLATFORM="qnx"
+ else
+ QT_QPA_DEFAULT_PLATFORM="xcb"
+ fi
+ fi
fi
if [ -n "$QMAKE_CFLAGS_XCB" ] || [ -n "$QMAKE_LIBS_XCB" ]; then
@@ -4622,7 +4691,8 @@ if [ -n "$QMAKE_CFLAGS_XCB" ] || [ -n "$QMAKE_LIBS_XCB" ]; then
QMakeVar set QMAKE_LIBS_XCB "$QMAKE_LIBS_XCB"
QMakeVar set QMAKE_DEFINES_XCB "$QMAKE_DEFINES_XCB"
fi
-if [ -n "$QMAKE_CFLAGS_DIRECTFB" ] || [ -n "$QMAKE_LIBS_DIRECTFB" ]; then
+if [ "$CFG_DIRECTFB" = "yes" ]; then
+ QT_CONFIG="$QT_CONFIG directfb"
QMakeVar set QMAKE_CFLAGS_DIRECTFB "$QMAKE_CFLAGS_DIRECTFB"
QMakeVar set QMAKE_LIBS_DIRECTFB "$QMAKE_LIBS_DIRECTFB"
fi
@@ -4635,14 +4705,14 @@ if [ "$BUILD_ON_MAC" = "yes" ]; then
fi
fi
-if [ "$BUILD_ON_MAC" = "no" ] && [ "$XPLATFORM_MINGW" = "no" ]; then
+if [ "$BUILD_ON_MAC" = "no" ] && [ "$XPLATFORM_MINGW" = "no" ] && [ "$XPLATFORM_QNX" = "no" ]; then
if [ "$CFG_XCB" = "no" ] && [ "$CFG_EGLFS" = "no" ] && [ "$CFG_DIRECTFB" = "no" ]; then
if [ "$QPA_PLATFORM_GUARD" = "yes" ] &&
( [ "$ORIG_CFG_XCB" = "auto" ] || [ "$ORIG_CFG_EGLFS" = "auto" ] || [ "$ORIG_CFG_DIRECTFB" = "auto" ] ); then
echo "No QPA platform plugin enabled!"
echo " If you really want to build without a QPA platform plugin you must pass"
- echo " -no-xcb, -no-eglfs and -no-directfb to configure. Doing this will"
- echo " produce a Qt that cannot run GUI applications."
+ echo " -no-qpa-platform-guard to configure. Doing this will"
+ echo " produce a Qt that can not run GUI applications."
echo " The dependencies needed for xcb to build are listed in"
echo " src/plugins/platforms/xcb/README"
exit 1
@@ -5636,6 +5706,8 @@ cat >>"$outpath/src/corelib/global/qconfig.h.new" << EOF
EOF
fi
+echo "#define QT_QPA_DEFAULT_PLATFORM_NAME \"$QT_QPA_DEFAULT_PLATFORM\"" >>"$outpath/src/corelib/global/qconfig.h.new"
+
# avoid unecessary rebuilds by copying only if qconfig.h has changed
if cmp -s "$outpath/src/corelib/global/qconfig.h" "$outpath/src/corelib/global/qconfig.h.new"; then
rm -f "$outpath/src/corelib/global/qconfig.h.new"
diff --git a/dist/changes-5.0.0 b/dist/changes-5.0.0
index 9cef238cff..353c7694d6 100644
--- a/dist/changes-5.0.0
+++ b/dist/changes-5.0.0
@@ -353,6 +353,13 @@ QtCore
QRegularExpressionMatchIterator. They aim to replace QRegExp with a more
powerful and flexible regular expression engine.
+* Certain methods in QRegExp that modified the object's internals are no longer marked
+ const. They were accidentally marked const in Qt 4 but the problem could not be
+ fixed. The following are suggestions to adapt code to this change:
+ - make sure the QRegExp object is not const in the given context
+ - create a copy of the QRegExp object before using it
+ - invert the operation and use QString. E.g., rx.indexIn(string) becomes string.indexOf(rx)
+
* QEvent::AccessibilityPrepare, AccessibilityHelp and AccessibilityDescription removed:
* The enum values simply didn't make sense in the first place and should simply be dropped.
@@ -457,7 +464,7 @@ QTestLib
QtSql
-----
-QSqlTableModel/QSqlRelationalTableModel
+QSqlQueryModel/QSqlTableModel/QSqlRelationalTableModel
* The dataChanged() signal is now emitted for changes made to an inserted
record that has not yet been committed. Previously, dataChanged() was
@@ -492,6 +499,10 @@ removed and only if there are no other changed rows.
QSqlTableModel::indexInQuery() as example of how to implement in a
subclass.
+* QSqlQueryMode::setQuery() emits fewer signals. The modelAboutToBeReset()
+and modelReset() signals suffice to inform views that they must reinterrogate
+the model.
+
* QSqlTableModel::selectRow(): This is a new method that refreshes a single
row in the model from the database.
@@ -627,6 +638,26 @@ Qt for Windows CE
cleared). Any QPointers tracking a widget will NOT be cleared before the
QWidget destructor destroys the children for the widget being tracked.
+- QUrl
+
+ * QUrl has been changed to operate only on percent-encoded
+ forms. Fully-decoded forms, where the percent character stands for itself,
+ are no longer possible. For that reason, the getters and setters with
+ "encoded" in the name are deprecated, except for QUrl::toEncoded() and
+ QUrl::fromEncoded().
+
+ QUrl now operates in a mode where it decodes as much as it can of the
+ percent-encoding sequences. In addition, the setter methods possess a mode
+ in which a '%' character not part of a percent-encoding sequence will cause
+ the parser to correct the input. Therefore, most software will not require
+ changes to adapt, since the getter methods will continue returning the
+ components in their most-decoded form as they did before and the setter
+ methods will accept input as they did before..
+
+ The most notable difference is when dealing with
+ QUrl::toString(). Previously, this function would return percent characters
+ in the URL by themselves. Now, it will return "%25", like
+ QUrl::toEncoded().
- QVariant
diff --git a/doc/global/qt-cpp-ignore.qdocconf b/doc/global/qt-cpp-ignore.qdocconf
new file mode 100644
index 0000000000..9dbb7d980e
--- /dev/null
+++ b/doc/global/qt-cpp-ignore.qdocconf
@@ -0,0 +1,54 @@
+Cpp.ignoretokens = QT_ASCII_CAST_WARN \
+ QT_ASCII_CAST_WARN_CONSTRUCTOR \
+ QT_BEGIN_HEADER \
+ QT_BOOTSTRAPPED \
+ QT_DESIGNER_STATIC \
+ QT_END_HEADER \
+ QT_FASTCALL \
+ Q_COMPAT_EXPORT \
+ Q_CORE_EXPORT \
+ Q_CORE_EXPORT_INLINE \
+ Q_EXPORT \
+ Q_EXPORT_PLUGIN \
+ Q_EXPORT_PLUGIN2 \
+ Q_AUTOTEST_EXPORT \
+ Q_GUI_EXPORT \
+ Q_GUI_EXPORT_INLINE \
+ Q_INLINE_TEMPLATE \
+ Q_NETWORK_EXPORT \
+ Q_OPENGL_EXPORT \
+ Q_OPENVG_EXPORT \
+ Q_OUTOFLINE_TEMPLATE \
+ Q_SQL_EXPORT \
+ Q_SVG_EXPORT \
+ Q_SCRIPT_EXPORT \
+ Q_SCRIPTTOOLS_EXPORT \
+ Q_XML_EXPORT \
+ Q_XMLPATTERNS_EXPORT \
+ QDBUS_EXPORT \
+ Q_DBUS_EXPORT \
+ QT_BEGIN_NAMESPACE \
+ QT_BEGIN_INCLUDE_NAMESPACE \
+ QT_END_NAMESPACE \
+ QT_END_INCLUDE_NAMESPACE \
+ Q_GADGET \
+ Q_INVOKABLE \
+ Q_DECL_CONSTEXPR
+Cpp.ignoredirectives = Q_DECLARE_INTERFACE \
+ Q_DECLARE_METATYPE \
+ Q_DECLARE_OPERATORS_FOR_FLAGS \
+ Q_DECLARE_PRIVATE \
+ Q_DECLARE_PUBLIC \
+ Q_DECLARE_SHARED \
+ Q_DECLARE_TR_FUNCTIONS \
+ Q_DECLARE_TYPEINFO \
+ Q_DISABLE_COPY \
+ QT_FORWARD_DECLARE_CLASS \
+ Q_DUMMY_COMPARISON_OPERATOR \
+ Q_ENUMS \
+ Q_FLAGS \
+ Q_INTERFACES \
+ __attribute__ \
+ Q_PRIVATE_PROPERTY \
+ Q_DECLARE_PRIVATE_D \
+ Q_CLASSINFO
diff --git a/doc/global/style/offline.css b/doc/global/style/offline.css
new file mode 100644
index 0000000000..1b430ab904
--- /dev/null
+++ b/doc/global/style/offline.css
@@ -0,0 +1,622 @@
+body{
+font: normal 400 14px/1.2 Arial;
+margin-top:85px;
+font-family: Arial, Helvetica;
+color:#313131;
+text-align:justify;
+margin-left:5px;
+margin-right:5px;
+}
+
+img{
+-moz-box-shadow: 3px 3px 3px #ccc;
+-webkit-box-shadow: 3px 3px 3px #ccc;
+box-shadow: 3px 3px 3px #ccc;
+border:#8E8D8D 2px solid;
+margin-left:0px;
+max-width: 800px;
+height: auto
+}
+
+b{
+font-weight:600;
+}
+
+.content{}
+
+.descr{
+margin-top:35px;
+/*max-width: 75%;*/
+margin-left:5px;
+text-align:justify;
+min-height:700px;
+vertical-align:top;
+}
+
+.name{
+max-width: 75%;
+font-weight:100;
+}
+
+tt{
+text-align:left;}
+
+/*
+-----------
+links
+-----------
+*/
+
+a:link{
+color: #2C418D;
+text-decoration: none;
+text-align:left;
+}
+
+a:hover{
+color: #869CD1;
+text-decoration:underline;
+text-align:left;
+}
+
+a:visited{
+color: #869CD1;
+text-decoration: none;
+text-align:left;
+}
+
+a:visited:hover{
+text-decoration:underline;
+text-align:left;
+}
+
+a[href*="http://"], a[href*="ftp://"],a[href*="https://"]
+{
+text-decoration: none;
+background-image:url(../images/ico_out.png);
+background-repeat:no-repeat;
+background-position:left;
+padding-left:20px;
+text-align:left;
+}
+
+.flags{
+text-decoration:none;
+text-height:24px;
+}
+
+/*
+-------------------------------
+NOTE styles
+-------------------------------
+*/
+.notetitle, .tiptitle, .fastpathtitle{
+font-weight:bold;
+}
+
+.attentiontitle,.cautiontitle,.dangertitle,.importanttitle,.remembertitle,.restrictiontitle{
+font-weight:bold;
+}
+
+.note,.tip,.fastpath{
+background: #F2F2F2 url(../images/ico_note.png);
+background-repeat: no-repeat;
+background-position: top left;
+padding:5px;
+padding-left:40px;
+padding-bottom:10px;
+border:#999 1px dotted;
+color:#666666;
+margin:5px;
+}
+
+.attention,.caution,.danger,.important,.remember,.restriction{
+background: #F2F2F2 url(../images/ico_note_attention.png);
+background-repeat:no-repeat;
+background-position:top left;
+padding:5px;
+padding-left:40px;
+padding-bottom:10px;
+border:#999 1px dotted;
+color:#666666;
+margin:5px;
+}
+
+/*
+-------------------------------
+Top navigation
+-------------------------------
+*/
+
+.header{
+
+height:1px;
+padding:0px;
+margin:0px;
+}
+
+.qtref{
+display: block;
+position: relative;
+top: -76px;
+height:15px;
+z-index: 1;
+font-size:11px;
+padding-right:10px;
+float:right;
+}
+
+.naviNextPrevious{
+display: block;
+position: relative;
+text-align: right;
+top: -53px;
+float:right;
+height:20px;
+z-index:1;
+padding-right:10px;
+padding-top:2px;
+vertical-align:top;
+margin:0px;
+}
+
+
+.naviNextPrevious > a:first-child{
+background-image:url(../images/btn_prev.png);
+background-repeat:no-repeat;
+background-position:left;
+padding-left:20px;
+height:20px;
+padding-left:20px;
+}
+
+.naviNextPrevious > a:last-child{
+background-image:url(../images/btn_next.png);
+background-repeat:no-repeat;
+background-position:right;
+padding-right:20px;
+height:20px;
+margin-left:30px;
+}
+
+.breadcrumb{
+display: block;
+position: relative;
+top:-20px;
+/*border-top:2px solid #ffffff;*/
+border-bottom: 1px solid #cecece;
+background-color:#F2F2F2;
+z-index:1;
+height:20px;
+padding:0px;
+margin:0px;
+padding-left:10px;
+padding-top:2px;
+margin-left:-5px;
+margin-right:-5px;
+}
+
+.breadcrumb ul{
+ margin:0px;
+ padding:0px;
+}
+
+.breadcrumb ul li{
+background-color:#F2F2F2;
+list-style-type:none;
+padding:0;
+margin:0;
+height:20px;
+}
+
+.breadcrumb li{
+float:left;
+}
+
+.breadcrumb .first {
+background:url(../images/home.png);
+background-position:left;
+background-repeat:no-repeat;
+padding-left:20px;
+}
+
+
+.breadcrumb li a{
+color:#2C418D;
+display:block;
+text-decoration:none;
+background:url(../images/arrow.png);
+background-repeat:no-repeat;
+background-position:right;
+padding-right:25px;
+padding-left:10px;
+}
+
+.breadcrumb li a:hover{
+color:#909090;
+display:block;
+text-decoration:none;
+background:url(../images/arrow.png);
+background-repeat:no-repeat;
+background-position:right;
+padding-right:20px;
+padding-left:10px;
+}
+
+
+/* table of content
+no display
+*/
+
+/*
+-----------
+headers
+-----------
+*/
+
+
+@media screen{
+.title{
+color:#313131;
+font-size: 18px;
+font-weight: normal;
+left: 0;
+padding-bottom: 20px;
+padding-left: 10px;
+padding-top: 20px;
+position: absolute;
+right: 0;
+top: 0;
+background-color:#E6E6E6;
+border-bottom: 1px #CCC solid;
+border-top: 2px #CCC solid;
+font-weight:bold;
+margin-left:0px;
+margin-right:0px;
+}
+}
+
+h1 {
+margin: 0;
+}
+
+h2, p.h2 {
+font: 500 16px/1.2 Arial;
+font-weight:100;
+background-color:#F2F3F4;
+padding:4px;
+margin-bottom:30px;
+margin-top:30px;
+border-top:#E0E0DE 1px solid;
+border-bottom: #E0E0DE 1px solid;
+max-width: 99%;
+}
+
+h3{
+
+font: 500 14px/1.2 Arial;
+font-weight:100;
+text-decoration:underline;
+margin-bottom:30px;
+margin-top:30px;
+}
+
+h3.fn,span.fn{
+border-width: 1px;
+border-style: solid;
+border-color: #E6E6E6;
+-moz-border-radius: 7px 7px 7px 7px;
+-webkit-border-radius: 7px 7px 7px 7px;
+border-radius: 7px 7px 7px 7px;
+background-color: #F6F6F6;
+word-spacing: 3px;
+padding: 5px 5px;
+text-decoration:none;
+font-weight:bold;
+max-width:75%;
+font-size:14px;
+margin:0px;
+margin-top:30px;
+
+}
+
+.name{
+color:#1A1A1A;
+}
+.type{
+color:#808080;
+}
+
+
+
+@media print {
+.title {
+color:#0066CB;
+font-family:Arial, Helvetica;
+font-size: 32px;
+font-weight: normal;
+left: 0;
+position: absolute;
+right: 0;
+top: 0;
+}
+}
+
+
+/*
+-----------------
+table styles
+-----------------
+*/
+.table img {
+border:none;
+margin-left:0px;
+-moz-box-shadow:0px 0px 0px #fff;
+-webkit-box-shadow: 0px 0px 0px #fff;
+box-shadow: 0px 0px 0px #fff;
+}
+
+/* table with border alternative colours*/
+
+ table,pre{
+-moz-border-radius: 7px 7px 7px 7px;
+-webkit-border-radius: 7px 7px 7px 7px;
+ border-radius: 7px 7px 7px 7px;
+background-color: #F6F6F6;
+border: 1px solid #E6E6E6;
+border-collapse: separate;
+font-size: 12px;
+line-height: 1.2;
+margin-bottom: 25px;
+margin-left: 15px;
+font-size: 12px;
+line-height: 1.2;
+margin-bottom: 25px;
+margin-left: 15px;
+}
+
+
+table th{
+text-align:left;
+padding-left:20px;
+}
+
+table td {
+padding: 3px 15px 3px 20px;
+border-bottom:#CCC dotted 1px;
+}
+table p { margin:0px;}
+
+table tr.even {
+background-color: white;
+color: #66666E;
+}
+
+table tr.odd {
+background-color: #F6F6F6;
+color: #66666E;
+}
+
+
+table thead {
+text-align:left;
+padding-left:20px;
+background-color:#e1e0e0;
+border-left:none;
+border-right:none;
+}
+
+table thead th {
+padding-top:5px;
+padding-left:10px;
+padding-bottom:5px;
+border-bottom: 2px solid #D1D1D1;
+padding-right:10px;
+}
+
+
+/* table bodless & white*/
+
+.borderless {
+border-radius: 0px 0px 0px 0px;
+background-color: #fff;
+border: 1px solid #fff;
+}
+
+.borderless tr {
+background-color: #FFF;
+color: #66666E;
+}
+
+.borderless td {
+border:none;
+border-bottom:#fff dotted 1px;
+}
+
+/*
+-----------
+List
+-----------
+*/
+
+ul{
+padding-bottom:2px;
+}
+
+li {
+margin-bottom: 10px;
+padding-left: 8px;
+list-style:outside;
+list-style-type:square;
+text-align:left;
+}
+
+
+ol{
+margin:10px;
+padding:0;
+}
+
+ol > li{
+margin-left: 30px;
+padding-left:8px;
+list-style:decimal;
+}
+
+.centerAlign{
+text-align: left;
+}
+
+.cpp{
+display: block;
+margin: 10;
+overflow: hidden;
+overflow-x: hidden;
+overflow-y: hidden;
+padding: 20px 0 20px 0;
+}
+
+.footer{
+margin-top: 50px;
+padding-left:5px;
+margin-bottom: 10px;
+font-size:10px;
+border-top: 1px solid #999;
+padding-top:11px;
+}
+
+.footerNavi{
+width:auto;
+text-align:right;
+margin-top:50px;
+z-index:1;
+}
+
+.memItemLeft{
+padding-right: 3px;
+}
+
+.memItemRight{
+padding: 3px 15px 3px 0;
+}
+
+.qml{
+display: block;
+margin: 10;
+overflow: hidden;
+overflow-x: hidden;
+overflow-y: hidden;
+padding: 20px 0 20px 0;
+}
+
+.qmldefault{
+padding-left: 5px;
+float: right;
+color: red;
+}
+
+.qmlreadonly{
+padding-left: 5px;
+float: right;
+color: #254117;
+}
+
+.rightAlign{
+padding: 3px 5px 3px 10px;
+text-align: right;
+}
+
+/*
+-----------
+Content table
+-----------
+*/
+
+@media print{
+.toc {
+float: right;
+padding-bottom: 10px;
+padding-top: 50px;
+width: 100%;
+background-image:url(../images/bgrContent.png);
+background-position:top;
+background-repeat:no-repeat;
+}
+}
+
+@media screen{
+.toc{
+clear:both;
+float:right;
+vertical-align:top;
+-moz-border-radius: 7px 7px 7px 7px;
+-webkit-border-radius: 7px 7px 7px 7px;
+border-radius: 7px 7px 7px 7px;
+ background:#FFF url(../images/bgrContent.png);
+background-position:top;
+background-repeat:repeat-x;
+border: 1px solid #E6E6E6;
+padding-left:5px;
+padding-bottom:10px;
+height: auto;
+width: 200px;
+text-align:left;
+z-index:2;
+margin-left:20px;
+margin-right:20px;
+margin-top:0px;
+padding-top:0px;
+}
+}
+
+.toc h3{
+text-decoration:none;
+}
+
+.toc h3{font: 500 14px/1.2 Arial;
+font-weight:100;
+padding:0px;
+margin:0px;
+padding-top:5px;
+padding-left:5px;
+}
+
+
+.toc ul{
+width:160px;
+padding-left:10px;
+padding-right:5px;
+padding-bottom:10px;
+padding-top:10px;
+}
+
+.toc ul li{
+margin-left:20px;
+list-style-image:url(../images/blu_dot.png);
+list-style:outside;
+
+}
+
+
+.toc ul li a:link{
+color: #2C418D;
+text-decoration: none;
+}
+
+.toc ul li a:hover{
+color: #869CD1;
+text-decoration:underline;
+
+}
+
+.toc ul li a:visited{
+color: #869CD1;
+font-weight: bold;
+}
+
+.level1{
+border:none;}
+
+.clearfix{
+clear:both;}
+
diff --git a/doc/src/snippets/code/doc_src_examples_textfinder.pro b/doc/src/snippets/code/doc_src_examples_textfinder.pro
index 10616b40a0..ae070f4ac2 100644
--- a/doc/src/snippets/code/doc_src_examples_textfinder.pro
+++ b/doc/src/snippets/code/doc_src_examples_textfinder.pro
@@ -1,43 +1,3 @@
-/****************************************************************************
-**
-** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
-**
-** This file is part of the documentation of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-** * Redistributions of source code must retain the above copyright
-** notice, this list of conditions and the following disclaimer.
-** * Redistributions in binary form must reproduce the above copyright
-** notice, this list of conditions and the following disclaimer in
-** the documentation and/or other materials provided with the
-** distribution.
-** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
-** the names of its contributors may be used to endorse or promote
-** products derived from this software without specific prior written
-** permission.
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
#! [0]
CONFIG += uitools
HEADERS = textfinder.h
diff --git a/doc/src/snippets/code/doc_src_qplugin.pro b/doc/src/snippets/code/doc_src_qplugin.pro
deleted file mode 100644
index e5e5311e5d..0000000000
--- a/doc/src/snippets/code/doc_src_qplugin.pro
+++ /dev/null
@@ -1,44 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
-**
-** This file is part of the documentation of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-** * Redistributions of source code must retain the above copyright
-** notice, this list of conditions and the following disclaimer.
-** * Redistributions in binary form must reproduce the above copyright
-** notice, this list of conditions and the following disclaimer in
-** the documentation and/or other materials provided with the
-** distribution.
-** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
-** the names of its contributors may be used to endorse or promote
-** products derived from this software without specific prior written
-** permission.
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#! [3]
-TEMPLATE = app
-QTPLUGIN += qjpeg qgif # image formats
-#! [3]
diff --git a/doc/src/snippets/code/doc_src_qtgui.pro b/doc/src/snippets/code/doc_src_qtgui.pro
index a4fbc67aeb..51bb6c74ff 100644
--- a/doc/src/snippets/code/doc_src_qtgui.pro
+++ b/doc/src/snippets/code/doc_src_qtgui.pro
@@ -1,43 +1,3 @@
-/****************************************************************************
-**
-** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
-**
-** This file is part of the documentation of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-** * Redistributions of source code must retain the above copyright
-** notice, this list of conditions and the following disclaimer.
-** * Redistributions in binary form must reproduce the above copyright
-** notice, this list of conditions and the following disclaimer in
-** the documentation and/or other materials provided with the
-** distribution.
-** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
-** the names of its contributors may be used to endorse or promote
-** products derived from this software without specific prior written
-** permission.
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
#! [0]
#include <QtGui>
#! [0]
diff --git a/doc/src/snippets/code/doc_src_qtnetwork.pro b/doc/src/snippets/code/doc_src_qtnetwork.pro
index 897229ebc7..a100943e58 100644
--- a/doc/src/snippets/code/doc_src_qtnetwork.pro
+++ b/doc/src/snippets/code/doc_src_qtnetwork.pro
@@ -1,43 +1,3 @@
-/****************************************************************************
-**
-** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
-**
-** This file is part of the documentation of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-** * Redistributions of source code must retain the above copyright
-** notice, this list of conditions and the following disclaimer.
-** * Redistributions in binary form must reproduce the above copyright
-** notice, this list of conditions and the following disclaimer in
-** the documentation and/or other materials provided with the
-** distribution.
-** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
-** the names of its contributors may be used to endorse or promote
-** products derived from this software without specific prior written
-** permission.
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
#! [0]
QT += network
#! [0]
diff --git a/doc/src/snippets/code/doc_src_qtsql.pro b/doc/src/snippets/code/doc_src_qtsql.pro
deleted file mode 100644
index 4cf55433a8..0000000000
--- a/doc/src/snippets/code/doc_src_qtsql.pro
+++ /dev/null
@@ -1,43 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
-**
-** This file is part of the documentation of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-** * Redistributions of source code must retain the above copyright
-** notice, this list of conditions and the following disclaimer.
-** * Redistributions in binary form must reproduce the above copyright
-** notice, this list of conditions and the following disclaimer in
-** the documentation and/or other materials provided with the
-** distribution.
-** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
-** the names of its contributors may be used to endorse or promote
-** products derived from this software without specific prior written
-** permission.
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#! [1]
-QT += sql
-#! [1]
diff --git a/doc/src/snippets/code/doc_src_qtxml.pro b/doc/src/snippets/code/doc_src_qtxml.pro
deleted file mode 100644
index b0a38e3432..0000000000
--- a/doc/src/snippets/code/doc_src_qtxml.pro
+++ /dev/null
@@ -1,43 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
-**
-** This file is part of the documentation of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-** * Redistributions of source code must retain the above copyright
-** notice, this list of conditions and the following disclaimer.
-** * Redistributions in binary form must reproduce the above copyright
-** notice, this list of conditions and the following disclaimer in
-** the documentation and/or other materials provided with the
-** distribution.
-** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
-** the names of its contributors may be used to endorse or promote
-** products derived from this software without specific prior written
-** permission.
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#! [1]
-QT += xml
-#! [1]
diff --git a/examples/dbus/complexpingpong/complexping.cpp b/examples/dbus/complexpingpong/complexping.cpp
index aa39290f8b..97bc5e6103 100644
--- a/examples/dbus/complexpingpong/complexping.cpp
+++ b/examples/dbus/complexpingpong/complexping.cpp
@@ -60,7 +60,7 @@ void Ping::start(const QString &name, const QString &oldValue, const QString &ne
qstdin.open(stdin, QIODevice::ReadOnly);
// find our remote
- iface = new QDBusInterface(SERVICE_NAME, "/", "com.trolltech.QtDBus.ComplexPong.Pong",
+ iface = new QDBusInterface(SERVICE_NAME, "/", "org.example.QtDBus.ComplexPong.Pong",
QDBusConnection::sessionBus(), this);
if (!iface->isValid()) {
fprintf(stderr, "%s\n",
diff --git a/examples/dbus/complexpingpong/complexpong.h b/examples/dbus/complexpingpong/complexpong.h
index e458f9e37f..94a3083bd8 100644
--- a/examples/dbus/complexpingpong/complexpong.h
+++ b/examples/dbus/complexpingpong/complexpong.h
@@ -48,7 +48,7 @@
class Pong: public QDBusAbstractAdaptor
{
Q_OBJECT
- Q_CLASSINFO("D-Bus Interface", "com.trolltech.QtDBus.ComplexPong.Pong")
+ Q_CLASSINFO("D-Bus Interface", "org.example.QtDBus.ComplexPong.Pong")
Q_PROPERTY(QString value READ value WRITE setValue)
public:
QString m_value;
diff --git a/examples/dbus/complexpingpong/ping-common.h b/examples/dbus/complexpingpong/ping-common.h
index 987c8b6d96..0cde67302f 100644
--- a/examples/dbus/complexpingpong/ping-common.h
+++ b/examples/dbus/complexpingpong/ping-common.h
@@ -38,4 +38,4 @@
**
****************************************************************************/
-#define SERVICE_NAME "com.trolltech.QtDBus.PingExample"
+#define SERVICE_NAME "org.example.QtDBus.PingExample"
diff --git a/examples/dbus/dbus-chat/chat.cpp b/examples/dbus/dbus-chat/chat.cpp
index f5d834fea4..beeccb0622 100644
--- a/examples/dbus/dbus-chat/chat.cpp
+++ b/examples/dbus/dbus-chat/chat.cpp
@@ -65,7 +65,7 @@ ChatMainWindow::ChatMainWindow()
com::trolltech::chat *iface;
iface = new com::trolltech::chat(QString(), QString(), QDBusConnection::sessionBus(), this);
//connect(iface, SIGNAL(message(QString,QString)), this, SLOT(messageSlot(QString,QString)));
- QDBusConnection::sessionBus().connect(QString(), QString(), "com.trolltech.chat", "message", this, SLOT(messageSlot(QString,QString)));
+ QDBusConnection::sessionBus().connect(QString(), QString(), "org.example.chat", "message", this, SLOT(messageSlot(QString,QString)));
connect(iface, SIGNAL(action(QString,QString)), this, SLOT(actionSlot(QString,QString)));
NicknameDialog dialog;
@@ -115,7 +115,7 @@ void ChatMainWindow::textChangedSlot(const QString &newText)
void ChatMainWindow::sendClickedSlot()
{
//emit message(m_nickname, messageLineEdit->text());
- QDBusMessage msg = QDBusMessage::createSignal("/", "com.trolltech.chat", "message");
+ QDBusMessage msg = QDBusMessage::createSignal("/", "org.example.chat", "message");
msg << m_nickname << messageLineEdit->text();
QDBusConnection::sessionBus().send(msg);
messageLineEdit->setText(QString());
diff --git a/examples/dbus/dbus-chat/chat_adaptor.cpp b/examples/dbus/dbus-chat/chat_adaptor.cpp
index e088dffaa4..c3a5600390 100644
--- a/examples/dbus/dbus-chat/chat_adaptor.cpp
+++ b/examples/dbus/dbus-chat/chat_adaptor.cpp
@@ -38,7 +38,7 @@
**
**
** This file was generated by qdbusxml2cpp version 0.7
-** Command line was: qdbusxml2cpp -i chat_adaptor.h -a :chat_adaptor.cpp com.trolltech.chat.xml
+** Command line was: qdbusxml2cpp -i chat_adaptor.h -a :chat_adaptor.cpp org.example.chat.xml
**
** qdbusxml2cpp is Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
**
diff --git a/examples/dbus/dbus-chat/chat_adaptor.h b/examples/dbus/dbus-chat/chat_adaptor.h
index e682665cce..2cb576724e 100644
--- a/examples/dbus/dbus-chat/chat_adaptor.h
+++ b/examples/dbus/dbus-chat/chat_adaptor.h
@@ -38,7 +38,7 @@
**
**
** This file was generated by qdbusxml2cpp version 0.7
-** Command line was: qdbusxml2cpp -a chat_adaptor.h: com.trolltech.chat.xml
+** Command line was: qdbusxml2cpp -a chat_adaptor.h: org.example.chat.xml
**
** qdbusxml2cpp is Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
**
@@ -64,14 +64,14 @@ class QVariant;
QT_END_NAMESPACE
/*
- * Adaptor class for interface com.trolltech.chat
+ * Adaptor class for interface org.example.chat
*/
class ChatAdaptor: public QDBusAbstractAdaptor
{
Q_OBJECT
- Q_CLASSINFO("D-Bus Interface", "com.trolltech.chat")
+ Q_CLASSINFO("D-Bus Interface", "org.example.chat")
Q_CLASSINFO("D-Bus Introspection", ""
-" <interface name=\"com.trolltech.chat\">\n"
+" <interface name=\"org.example.chat\">\n"
" <signal name=\"message\">\n"
" <arg direction=\"out\" type=\"s\" name=\"nickname\"/>\n"
" <arg direction=\"out\" type=\"s\" name=\"text\"/>\n"
diff --git a/examples/dbus/dbus-chat/chat_interface.cpp b/examples/dbus/dbus-chat/chat_interface.cpp
index 8c35e537ed..eb2258d5d4 100644
--- a/examples/dbus/dbus-chat/chat_interface.cpp
+++ b/examples/dbus/dbus-chat/chat_interface.cpp
@@ -38,7 +38,7 @@
**
**
** This file was generated by qdbusxml2cpp version 0.7
-** Command line was: qdbusxml2cpp -i chat_interface.h -p :chat_interface.cpp com.trolltech.chat.xml
+** Command line was: qdbusxml2cpp -i chat_interface.h -p :chat_interface.cpp org.example.chat.xml
**
** qdbusxml2cpp is Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
**
diff --git a/examples/dbus/dbus-chat/chat_interface.h b/examples/dbus/dbus-chat/chat_interface.h
index 3ef00df2d4..ee01a79e4c 100644
--- a/examples/dbus/dbus-chat/chat_interface.h
+++ b/examples/dbus/dbus-chat/chat_interface.h
@@ -38,7 +38,7 @@
**
**
** This file was generated by qdbusxml2cpp version 0.7
-** Command line was: qdbusxml2cpp -p chat_interface.h: com.trolltech.chat.xml
+** Command line was: qdbusxml2cpp -p chat_interface.h: org.example.chat.xml
**
** qdbusxml2cpp is Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
**
@@ -60,14 +60,14 @@
#include <QtDBus/QtDBus>
/*
- * Proxy class for interface com.trolltech.chat
+ * Proxy class for interface org.example.chat
*/
class ComTrolltechChatInterface: public QDBusAbstractInterface
{
Q_OBJECT
public:
static inline const char *staticInterfaceName()
- { return "com.trolltech.chat"; }
+ { return "org.example.chat"; }
public:
ComTrolltechChatInterface(const QString &service, const QString &path, const QDBusConnection &connection, QObject *parent = 0);
diff --git a/examples/dbus/dbus-chat/com.trolltech.chat.xml b/examples/dbus/dbus-chat/com.trolltech.chat.xml
index 618c8c4dcc..acb6dc1d57 100644
--- a/examples/dbus/dbus-chat/com.trolltech.chat.xml
+++ b/examples/dbus/dbus-chat/com.trolltech.chat.xml
@@ -1,7 +1,7 @@
<!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN"
"http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
<node>
- <interface name="com.trolltech.chat">
+ <interface name="org.example.chat">
<signal name="message">
<arg name="nickname" type="s" direction="out"/>
<arg name="text" type="s" direction="out"/>
diff --git a/examples/dbus/dbus-chat/dbus-chat.pro b/examples/dbus/dbus-chat/dbus-chat.pro
index 29b1f56826..2dc17fe667 100644
--- a/examples/dbus/dbus-chat/dbus-chat.pro
+++ b/examples/dbus/dbus-chat/dbus-chat.pro
@@ -5,8 +5,8 @@ HEADERS += chat.h chat_adaptor.h chat_interface.h
SOURCES += chat.cpp chat_adaptor.cpp chat_interface.cpp
FORMS += chatmainwindow.ui chatsetnickname.ui
-#DBUS_ADAPTORS += com.trolltech.chat.xml
-#DBUS_INTERFACES += com.trolltech.chat.xml
+#DBUS_ADAPTORS += org.example.chat.xml
+#DBUS_INTERFACES += org.example.chat.xml
# install
target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/dbus/chat
diff --git a/examples/dbus/pingpong/ping-common.h b/examples/dbus/pingpong/ping-common.h
index 987c8b6d96..0cde67302f 100644
--- a/examples/dbus/pingpong/ping-common.h
+++ b/examples/dbus/pingpong/ping-common.h
@@ -38,4 +38,4 @@
**
****************************************************************************/
-#define SERVICE_NAME "com.trolltech.QtDBus.PingExample"
+#define SERVICE_NAME "org.example.QtDBus.PingExample"
diff --git a/examples/dbus/remotecontrolledcar/car/car.xml b/examples/dbus/remotecontrolledcar/car/car.xml
index 641c6982d4..6d8c9d19f2 100644
--- a/examples/dbus/remotecontrolledcar/car/car.xml
+++ b/examples/dbus/remotecontrolledcar/car/car.xml
@@ -1,7 +1,7 @@
<!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN"
"http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
<node name="/com/trollech/examples/car">
- <interface name="com.trolltech.Examples.CarInterface">
+ <interface name="org.example.Examples.CarInterface">
<method name="accelerate"/>
<method name="decelerate"/>
<method name="turnLeft"/>
diff --git a/examples/dbus/remotecontrolledcar/car/car_adaptor.cpp b/examples/dbus/remotecontrolledcar/car/car_adaptor.cpp
index c7e62829be..e70b5bc873 100644
--- a/examples/dbus/remotecontrolledcar/car/car_adaptor.cpp
+++ b/examples/dbus/remotecontrolledcar/car/car_adaptor.cpp
@@ -74,25 +74,25 @@ CarInterfaceAdaptor::~CarInterfaceAdaptor()
void CarInterfaceAdaptor::accelerate()
{
- // handle method call com.trolltech.Examples.CarInterface.accelerate
+ // handle method call org.example.Examples.CarInterface.accelerate
QMetaObject::invokeMethod(parent(), "accelerate");
}
void CarInterfaceAdaptor::decelerate()
{
- // handle method call com.trolltech.Examples.CarInterface.decelerate
+ // handle method call org.example.Examples.CarInterface.decelerate
QMetaObject::invokeMethod(parent(), "decelerate");
}
void CarInterfaceAdaptor::turnLeft()
{
- // handle method call com.trolltech.Examples.CarInterface.turnLeft
+ // handle method call org.example.Examples.CarInterface.turnLeft
QMetaObject::invokeMethod(parent(), "turnLeft");
}
void CarInterfaceAdaptor::turnRight()
{
- // handle method call com.trolltech.Examples.CarInterface.turnRight
+ // handle method call org.example.Examples.CarInterface.turnRight
QMetaObject::invokeMethod(parent(), "turnRight");
}
diff --git a/examples/dbus/remotecontrolledcar/car/car_adaptor.h b/examples/dbus/remotecontrolledcar/car/car_adaptor.h
index 3c2c1dd124..c7542ae811 100644
--- a/examples/dbus/remotecontrolledcar/car/car_adaptor.h
+++ b/examples/dbus/remotecontrolledcar/car/car_adaptor.h
@@ -64,14 +64,14 @@ class QVariant;
QT_END_NAMESPACE
/*
- * Adaptor class for interface com.trolltech.Examples.CarInterface
+ * Adaptor class for interface org.example.Examples.CarInterface
*/
class CarInterfaceAdaptor: public QDBusAbstractAdaptor
{
Q_OBJECT
- Q_CLASSINFO("D-Bus Interface", "com.trolltech.Examples.CarInterface")
+ Q_CLASSINFO("D-Bus Interface", "org.example.Examples.CarInterface")
Q_CLASSINFO("D-Bus Introspection", ""
-" <interface name=\"com.trolltech.Examples.CarInterface\">\n"
+" <interface name=\"org.example.Examples.CarInterface\">\n"
" <method name=\"accelerate\"/>\n"
" <method name=\"decelerate\"/>\n"
" <method name=\"turnLeft\"/>\n"
diff --git a/examples/dbus/remotecontrolledcar/car/main.cpp b/examples/dbus/remotecontrolledcar/car/main.cpp
index 99dccbae0c..7bb4aa1720 100644
--- a/examples/dbus/remotecontrolledcar/car/main.cpp
+++ b/examples/dbus/remotecontrolledcar/car/main.cpp
@@ -66,7 +66,7 @@ int main(int argc, char *argv[])
new CarInterfaceAdaptor(car);
QDBusConnection connection = QDBusConnection::sessionBus();
connection.registerObject("/Car", car);
- connection.registerService("com.trolltech.CarExample");
+ connection.registerService("org.example.CarExample");
return app.exec();
}
diff --git a/examples/dbus/remotecontrolledcar/controller/car.xml b/examples/dbus/remotecontrolledcar/controller/car.xml
index 641c6982d4..6d8c9d19f2 100644
--- a/examples/dbus/remotecontrolledcar/controller/car.xml
+++ b/examples/dbus/remotecontrolledcar/controller/car.xml
@@ -1,7 +1,7 @@
<!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN"
"http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
<node name="/com/trollech/examples/car">
- <interface name="com.trolltech.Examples.CarInterface">
+ <interface name="org.example.Examples.CarInterface">
<method name="accelerate"/>
<method name="decelerate"/>
<method name="turnLeft"/>
diff --git a/examples/dbus/remotecontrolledcar/controller/car_interface.h b/examples/dbus/remotecontrolledcar/controller/car_interface.h
index fadd127460..8d624b3746 100644
--- a/examples/dbus/remotecontrolledcar/controller/car_interface.h
+++ b/examples/dbus/remotecontrolledcar/controller/car_interface.h
@@ -60,14 +60,14 @@
#include <QtDBus/QtDBus>
/*
- * Proxy class for interface com.trolltech.Examples.CarInterface
+ * Proxy class for interface org.example.Examples.CarInterface
*/
class ComTrolltechExamplesCarInterfaceInterface: public QDBusAbstractInterface
{
Q_OBJECT
public:
static inline const char *staticInterfaceName()
- { return "com.trolltech.Examples.CarInterface"; }
+ { return "org.example.Examples.CarInterface"; }
public:
ComTrolltechExamplesCarInterfaceInterface(const QString &service, const QString &path, const QDBusConnection &connection, QObject *parent = 0);
diff --git a/examples/dbus/remotecontrolledcar/controller/controller.cpp b/examples/dbus/remotecontrolledcar/controller/controller.cpp
index 77a6883b11..fb829da17c 100644
--- a/examples/dbus/remotecontrolledcar/controller/controller.cpp
+++ b/examples/dbus/remotecontrolledcar/controller/controller.cpp
@@ -47,7 +47,7 @@ Controller::Controller(QWidget *parent)
: QWidget(parent)
{
ui.setupUi(this);
- car = new com::trolltech::Examples::CarInterface("com.trolltech.CarExample", "/Car",
+ car = new com::trolltech::Examples::CarInterface("org.example.CarExample", "/Car",
QDBusConnection::sessionBus(), this);
startTimer(1000);
}
diff --git a/examples/dialogs/findfiles/window.cpp b/examples/dialogs/findfiles/window.cpp
index 7cf0079ffe..6b89436dc8 100644
--- a/examples/dialogs/findfiles/window.cpp
+++ b/examples/dialogs/findfiles/window.cpp
@@ -225,7 +225,7 @@ void Window::createFilesTable()
QStringList labels;
labels << tr("Filename") << tr("Size");
filesTable->setHorizontalHeaderLabels(labels);
- filesTable->horizontalHeader()->setResizeMode(0, QHeaderView::Stretch);
+ filesTable->horizontalHeader()->setSectionResizeMode(0, QHeaderView::Stretch);
filesTable->verticalHeader()->hide();
filesTable->setShowGrid(false);
diff --git a/examples/graphicsview/elasticnodes/graphwidget.cpp b/examples/graphicsview/elasticnodes/graphwidget.cpp
index 4909a42292..36005b85f4 100644
--- a/examples/graphicsview/elasticnodes/graphwidget.cpp
+++ b/examples/graphicsview/elasticnodes/graphwidget.cpp
@@ -199,7 +199,7 @@ void GraphWidget::drawBackground(QPainter *painter, const QRectF &rect)
QLinearGradient gradient(sceneRect.topLeft(), sceneRect.bottomRight());
gradient.setColorAt(0, Qt::white);
gradient.setColorAt(1, Qt::lightGray);
- painter->fillRect(rect.intersect(sceneRect), gradient);
+ painter->fillRect(rect.intersected(sceneRect), gradient);
painter->setBrush(Qt::NoBrush);
painter->drawRect(sceneRect);
diff --git a/examples/itemviews/chart/pieview.cpp b/examples/itemviews/chart/pieview.cpp
index dcf3aca3fb..b60d7ed879 100644
--- a/examples/itemviews/chart/pieview.cpp
+++ b/examples/itemviews/chart/pieview.cpp
@@ -478,7 +478,7 @@ void PieView::setSelection(const QRect &rect, QItemSelectionModel::SelectionFlag
for (int column = 0; column < columns; ++column) {
QModelIndex index = model()->index(row, column, rootIndex());
QRegion region = itemRegion(index);
- if (!region.intersect(contentsRect).isEmpty())
+ if (region.intersects(contentsRect))
indexes.append(index);
}
}
diff --git a/examples/itemviews/fetchmore/filelistmodel.cpp b/examples/itemviews/fetchmore/filelistmodel.cpp
index 42146f8edc..d9678191d9 100644
--- a/examples/itemviews/fetchmore/filelistmodel.cpp
+++ b/examples/itemviews/fetchmore/filelistmodel.cpp
@@ -107,9 +107,10 @@ void FileListModel::setDirPath(const QString &path)
{
QDir dir(path);
+ beginResetModel();
fileList = dir.entryList();
fileCount = 0;
- reset();
+ endResetModel();
}
//![0]
diff --git a/examples/itemviews/interview/main.cpp b/examples/itemviews/interview/main.cpp
index 92239c9bdb..fa059cdb53 100644
--- a/examples/itemviews/interview/main.cpp
+++ b/examples/itemviews/interview/main.cpp
@@ -61,8 +61,8 @@ int main(int argc, char *argv[])
QTableView *table = new QTableView;
table->setModel(data);
table->setSelectionModel(selections);
- table->horizontalHeader()->setMovable(true);
- table->verticalHeader()->setMovable(true);
+ table->horizontalHeader()->setSectionsMovable(true);
+ table->verticalHeader()->setSectionsMovable(true);
// Set StaticContents to enable minimal repaints on resizes.
table->viewport()->setAttribute(Qt::WA_StaticContents);
page.addWidget(table);
diff --git a/examples/itemviews/pixelator/imagemodel.cpp b/examples/itemviews/pixelator/imagemodel.cpp
index 5b64fb26e2..efbf2d35bc 100644
--- a/examples/itemviews/pixelator/imagemodel.cpp
+++ b/examples/itemviews/pixelator/imagemodel.cpp
@@ -52,8 +52,9 @@ ImageModel::ImageModel(QObject *parent)
//! [1]
void ImageModel::setImage(const QImage &image)
{
+ beginResetModel();
modelImage = image;
- reset();
+ endResetModel();
}
//! [1]
diff --git a/examples/mainwindows/mdi/mainwindow.cpp b/examples/mainwindows/mdi/mainwindow.cpp
index 7f7bd84fec..6ba15aa224 100644
--- a/examples/mainwindows/mdi/mainwindow.cpp
+++ b/examples/mainwindows/mdi/mainwindow.cpp
@@ -117,6 +117,7 @@ void MainWindow::saveAs()
statusBar()->showMessage(tr("File saved"), 2000);
}
+#ifndef QT_NO_CLIPBOARD
void MainWindow::cut()
{
if (activeMdiChild())
@@ -134,6 +135,7 @@ void MainWindow::paste()
if (activeMdiChild())
activeMdiChild()->paste();
}
+#endif
void MainWindow::about()
{
@@ -147,7 +149,9 @@ void MainWindow::updateMenus()
bool hasMdiChild = (activeMdiChild() != 0);
saveAct->setEnabled(hasMdiChild);
saveAsAct->setEnabled(hasMdiChild);
+#ifndef QT_NO_CLIPBOARD
pasteAct->setEnabled(hasMdiChild);
+#endif
closeAct->setEnabled(hasMdiChild);
closeAllAct->setEnabled(hasMdiChild);
tileAct->setEnabled(hasMdiChild);
@@ -156,10 +160,12 @@ void MainWindow::updateMenus()
previousAct->setEnabled(hasMdiChild);
separatorAct->setVisible(hasMdiChild);
+#ifndef QT_NO_CLIPBOARD
bool hasSelection = (activeMdiChild() &&
activeMdiChild()->textCursor().hasSelection());
cutAct->setEnabled(hasSelection);
copyAct->setEnabled(hasSelection);
+#endif
}
void MainWindow::updateWindowMenu()
@@ -202,10 +208,12 @@ MdiChild *MainWindow::createMdiChild()
MdiChild *child = new MdiChild;
mdiArea->addSubWindow(child);
+#ifndef QT_NO_CLIPBOARD
connect(child, SIGNAL(copyAvailable(bool)),
cutAct, SLOT(setEnabled(bool)));
connect(child, SIGNAL(copyAvailable(bool)),
copyAct, SLOT(setEnabled(bool)));
+#endif
return child;
}
@@ -239,6 +247,7 @@ void MainWindow::createActions()
connect(exitAct, SIGNAL(triggered()), qApp, SLOT(closeAllWindows()));
//! [0]
+#ifndef QT_NO_CLIPBOARD
cutAct = new QAction(QIcon(":/images/cut.png"), tr("Cu&t"), this);
cutAct->setShortcuts(QKeySequence::Cut);
cutAct->setStatusTip(tr("Cut the current selection's contents to the "
@@ -256,6 +265,7 @@ void MainWindow::createActions()
pasteAct->setStatusTip(tr("Paste the clipboard's contents into the current "
"selection"));
connect(pasteAct, SIGNAL(triggered()), this, SLOT(paste()));
+#endif
closeAct = new QAction(tr("Cl&ose"), this);
closeAct->setStatusTip(tr("Close the active window"));
@@ -313,9 +323,11 @@ void MainWindow::createMenus()
fileMenu->addAction(exitAct);
editMenu = menuBar()->addMenu(tr("&Edit"));
+#ifndef QT_NO_CLIPBOARD
editMenu->addAction(cutAct);
editMenu->addAction(copyAct);
editMenu->addAction(pasteAct);
+#endif
windowMenu = menuBar()->addMenu(tr("&Window"));
updateWindowMenu();
@@ -335,10 +347,12 @@ void MainWindow::createToolBars()
fileToolBar->addAction(openAct);
fileToolBar->addAction(saveAct);
+#ifndef QT_NO_CLIPBOARD
editToolBar = addToolBar(tr("Edit"));
editToolBar->addAction(cutAct);
editToolBar->addAction(copyAct);
editToolBar->addAction(pasteAct);
+#endif
}
void MainWindow::createStatusBar()
diff --git a/examples/mainwindows/mdi/mainwindow.h b/examples/mainwindows/mdi/mainwindow.h
index 00f29e702a..1652ca9749 100644
--- a/examples/mainwindows/mdi/mainwindow.h
+++ b/examples/mainwindows/mdi/mainwindow.h
@@ -67,9 +67,11 @@ private slots:
void open();
void save();
void saveAs();
+#ifndef QT_NO_CLIPBOARD
void cut();
void copy();
void paste();
+#endif
void about();
void updateMenus();
void updateWindowMenu();
@@ -101,9 +103,11 @@ private:
QAction *saveAct;
QAction *saveAsAct;
QAction *exitAct;
+#ifndef QT_NO_CLIPBOARD
QAction *cutAct;
QAction *copyAct;
QAction *pasteAct;
+#endif
QAction *closeAct;
QAction *closeAllAct;
QAction *tileAct;
diff --git a/examples/opengl/hellowindow/hellowindow.cpp b/examples/opengl/hellowindow/hellowindow.cpp
index 489d715166..380ddcc702 100644
--- a/examples/opengl/hellowindow/hellowindow.cpp
+++ b/examples/opengl/hellowindow/hellowindow.cpp
@@ -72,16 +72,21 @@ HelloWindow::HelloWindow(Renderer *renderer)
create();
- QTimer *timer = new QTimer(this);
- connect(timer, SIGNAL(timeout()), this, SLOT(render()));
- timer->start(10);
-
connect(this, SIGNAL(needRender(QSurface *, const QColor &, const QSize &)),
renderer, SLOT(render(QSurface *, const QColor &, const QSize &)));
updateColor();
}
+void HelloWindow::exposeEvent(QExposeEvent *event)
+{
+ render();
+
+ QTimer *timer = new QTimer(this);
+ connect(timer, SIGNAL(timeout()), this, SLOT(render()));
+ timer->start(10);
+}
+
void HelloWindow::mousePressEvent(QMouseEvent *)
{
updateColor();
diff --git a/examples/opengl/hellowindow/hellowindow.h b/examples/opengl/hellowindow/hellowindow.h
index 91267a8ba1..8f294b5ae3 100644
--- a/examples/opengl/hellowindow/hellowindow.h
+++ b/examples/opengl/hellowindow/hellowindow.h
@@ -92,6 +92,8 @@ public:
void updateColor();
+ void exposeEvent(QExposeEvent *event);
+
signals:
void needRender(QSurface *surface, const QColor &color, const QSize &viewSize);
diff --git a/examples/sql/masterdetail/mainwindow.cpp b/examples/sql/masterdetail/mainwindow.cpp
index 0eb8bb4548..4e7abfcbf5 100644
--- a/examples/sql/masterdetail/mainwindow.cpp
+++ b/examples/sql/masterdetail/mainwindow.cpp
@@ -410,7 +410,7 @@ void MainWindow::updateHeader(QModelIndex, int, int)
void MainWindow::adjustHeader()
{
albumView->hideColumn(0);
- albumView->horizontalHeader()->setResizeMode(1, QHeaderView::Stretch);
+ albumView->horizontalHeader()->setSectionResizeMode(1, QHeaderView::Stretch);
albumView->resizeColumnToContents(2);
albumView->resizeColumnToContents(3);
}
diff --git a/examples/tools/completer/mainwindow.cpp b/examples/tools/completer/mainwindow.cpp
index bc80bc939f..4d989c3d61 100644
--- a/examples/tools/completer/mainwindow.cpp
+++ b/examples/tools/completer/mainwindow.cpp
@@ -242,8 +242,8 @@ void MainWindow::changeModel()
treeView->setRootIsDecorated(false);
treeView->header()->hide();
treeView->header()->setStretchLastSection(false);
- treeView->header()->setResizeMode(0, QHeaderView::Stretch);
- treeView->header()->setResizeMode(1, QHeaderView::ResizeToContents);
+ treeView->header()->setSectionResizeMode(0, QHeaderView::Stretch);
+ treeView->header()->setSectionResizeMode(1, QHeaderView::ResizeToContents);
contentsLabel->setText(tr("Enter name of your country"));
}
break;
diff --git a/examples/tools/plugandpaint/mainwindow.cpp b/examples/tools/plugandpaint/mainwindow.cpp
index 472e10120d..c33c5be518 100644
--- a/examples/tools/plugandpaint/mainwindow.cpp
+++ b/examples/tools/plugandpaint/mainwindow.cpp
@@ -116,10 +116,10 @@ void MainWindow::brushColor()
void MainWindow::brushWidth()
{
bool ok;
- const int newWidth = QInputDialog::getInteger(this, tr("Plug & Paint"),
- tr("Select brush width:"),
- paintArea->brushWidth(),
- 1, 50, 1, &ok);
+ const int newWidth = QInputDialog::getInt(this, tr("Plug & Paint"),
+ tr("Select brush width:"),
+ paintArea->brushWidth(),
+ 1, 50, 1, &ok);
if (ok)
paintArea->setBrushWidth(newWidth);
}
diff --git a/examples/tools/plugandpaintplugins/extrafilters/extrafiltersplugin.cpp b/examples/tools/plugandpaintplugins/extrafilters/extrafiltersplugin.cpp
index 186f364b77..f7f5310ea9 100644
--- a/examples/tools/plugandpaintplugins/extrafilters/extrafiltersplugin.cpp
+++ b/examples/tools/plugandpaintplugins/extrafilters/extrafiltersplugin.cpp
@@ -73,7 +73,7 @@ QImage ExtraFiltersPlugin::filterImage(const QString &filter,
}
} else if (filter == tr("Smudge...")) {
bool ok;
- int numIters = QInputDialog::getInteger(parent, tr("Smudge Filter"),
+ int numIters = QInputDialog::getInt(parent, tr("Smudge Filter"),
tr("Enter number of iterations:"),
5, 1, 20, 1, &ok);
if (ok) {
@@ -102,7 +102,7 @@ QImage ExtraFiltersPlugin::filterImage(const QString &filter,
}
} else if (filter == tr("Threshold...")) {
bool ok;
- int threshold = QInputDialog::getInteger(parent, tr("Threshold Filter"),
+ int threshold = QInputDialog::getInt(parent, tr("Threshold Filter"),
tr("Enter threshold:"),
10, 1, 256, 1, &ok);
if (ok) {
diff --git a/examples/tools/settingseditor/locationdialog.cpp b/examples/tools/settingseditor/locationdialog.cpp
index e1ec636202..192aaab1b0 100644
--- a/examples/tools/settingseditor/locationdialog.cpp
+++ b/examples/tools/settingseditor/locationdialog.cpp
@@ -89,7 +89,7 @@ LocationDialog::LocationDialog(QWidget *parent)
locationsTable->setEditTriggers(QAbstractItemView::NoEditTriggers);
locationsTable->setColumnCount(2);
locationsTable->setHorizontalHeaderLabels(labels);
- locationsTable->horizontalHeader()->setResizeMode(0, QHeaderView::Stretch);
+ locationsTable->horizontalHeader()->setSectionResizeMode(0, QHeaderView::Stretch);
locationsTable->horizontalHeader()->resizeSection(1, 180);
buttonBox = new QDialogButtonBox(QDialogButtonBox::Ok
diff --git a/examples/tools/settingseditor/settingstree.cpp b/examples/tools/settingseditor/settingstree.cpp
index b5b3457651..4966ff98d9 100644
--- a/examples/tools/settingseditor/settingstree.cpp
+++ b/examples/tools/settingseditor/settingstree.cpp
@@ -51,8 +51,8 @@ SettingsTree::SettingsTree(QWidget *parent)
QStringList labels;
labels << tr("Setting") << tr("Type") << tr("Value");
setHeaderLabels(labels);
- header()->setResizeMode(0, QHeaderView::Stretch);
- header()->setResizeMode(2, QHeaderView::Stretch);
+ header()->setSectionResizeMode(0, QHeaderView::Stretch);
+ header()->setSectionResizeMode(2, QHeaderView::Stretch);
settings = 0;
refreshTimer.setInterval(2000);
diff --git a/examples/widgets/charactermap/mainwindow.cpp b/examples/widgets/charactermap/mainwindow.cpp
index 44eb30708d..fbe0df616c 100644
--- a/examples/widgets/charactermap/mainwindow.cpp
+++ b/examples/widgets/charactermap/mainwindow.cpp
@@ -70,11 +70,13 @@ MainWindow::MainWindow()
//! [2]
lineEdit = new QLineEdit;
+#ifndef QT_NO_CLIPBOARD
QPushButton *clipboardButton = new QPushButton(tr("&To clipboard"));
//! [2]
//! [3]
clipboard = QApplication::clipboard();
+#endif
//! [3]
//! [4]
@@ -91,7 +93,10 @@ MainWindow::MainWindow()
//! [4] //! [5]
connect(characterWidget, SIGNAL(characterSelected(QString)),
this, SLOT(insertCharacter(QString)));
+
+#ifndef QT_NO_CLIPBOARD
connect(clipboardButton, SIGNAL(clicked()), this, SLOT(updateClipboard()));
+#endif
//! [5]
connect(fontMerging, SIGNAL(toggled(bool)), characterWidget, SLOT(updateFontMerging(bool)));
@@ -110,7 +115,9 @@ MainWindow::MainWindow()
QHBoxLayout *lineLayout = new QHBoxLayout;
lineLayout->addWidget(lineEdit, 1);
lineLayout->addSpacing(12);
+#ifndef QT_NO_CLIPBOARD
lineLayout->addWidget(clipboardButton);
+#endif
QVBoxLayout *centralLayout = new QVBoxLayout;
centralLayout->addLayout(controlsLayout);
@@ -185,6 +192,7 @@ void MainWindow::insertCharacter(const QString &character)
//! [9]
//! [10]
+#ifndef QT_NO_CLIPBOARD
void MainWindow::updateClipboard()
{
//! [11]
@@ -192,4 +200,5 @@ void MainWindow::updateClipboard()
//! [11]
clipboard->setText(lineEdit->text(), QClipboard::Selection);
}
+#endif
//! [10]
diff --git a/examples/widgets/charactermap/mainwindow.h b/examples/widgets/charactermap/mainwindow.h
index 478df1dc06..37109827ab 100644
--- a/examples/widgets/charactermap/mainwindow.h
+++ b/examples/widgets/charactermap/mainwindow.h
@@ -66,11 +66,15 @@ public slots:
void findStyles(const QFont &font);
void findSizes(const QFont &font);
void insertCharacter(const QString &character);
+#ifndef QT_NO_CLIPBOARD
void updateClipboard();
+#endif
private:
CharacterWidget *characterWidget;
+#ifndef QT_NO_CLIPBOARD
QClipboard *clipboard;
+#endif
QComboBox *styleCombo;
QComboBox *sizeCombo;
QFontComboBox *fontCombo;
diff --git a/examples/widgets/icons/mainwindow.cpp b/examples/widgets/icons/mainwindow.cpp
index da4458e9a9..00f5a21854 100644
--- a/examples/widgets/icons/mainwindow.cpp
+++ b/examples/widgets/icons/mainwindow.cpp
@@ -285,9 +285,9 @@ void MainWindow::createImagesGroupBox()
imagesTable->horizontalHeader()->setDefaultSectionSize(90);
imagesTable->setColumnCount(3);
imagesTable->setHorizontalHeaderLabels(labels);
- imagesTable->horizontalHeader()->setResizeMode(0, QHeaderView::Stretch);
- imagesTable->horizontalHeader()->setResizeMode(1, QHeaderView::Fixed);
- imagesTable->horizontalHeader()->setResizeMode(2, QHeaderView::Fixed);
+ imagesTable->horizontalHeader()->setSectionResizeMode(0, QHeaderView::Stretch);
+ imagesTable->horizontalHeader()->setSectionResizeMode(1, QHeaderView::Fixed);
+ imagesTable->horizontalHeader()->setSectionResizeMode(2, QHeaderView::Fixed);
imagesTable->verticalHeader()->hide();
//! [23]
diff --git a/examples/widgets/scribble/mainwindow.cpp b/examples/widgets/scribble/mainwindow.cpp
index 00bf9884c9..6db7b39b4c 100644
--- a/examples/widgets/scribble/mainwindow.cpp
+++ b/examples/widgets/scribble/mainwindow.cpp
@@ -107,10 +107,10 @@ void MainWindow::penWidth()
//! [9] //! [10]
{
bool ok;
- int newWidth = QInputDialog::getInteger(this, tr("Scribble"),
- tr("Select pen width:"),
- scribbleArea->penWidth(),
- 1, 50, 1, &ok);
+ int newWidth = QInputDialog::getInt(this, tr("Scribble"),
+ tr("Select pen width:"),
+ scribbleArea->penWidth(),
+ 1, 50, 1, &ok);
if (ok)
scribbleArea->setPenWidth(newWidth);
}
diff --git a/mkspecs/cmake/Qt5BasicConfig.cmake.in b/mkspecs/cmake/Qt5BasicConfig.cmake.in
index a04d2b4d4e..f8e092f8b4 100644
--- a/mkspecs/cmake/Qt5BasicConfig.cmake.in
+++ b/mkspecs/cmake/Qt5BasicConfig.cmake.in
@@ -17,12 +17,27 @@ string(TOUPPER "$${CMAKE_MODULE_NAME}" _CMAKE_MODULE_NAME_UPPER)
set(Qt5$${CMAKE_MODULE_NAME}_DEFINITIONS -DQT_\${_CMAKE_MODULE_NAME_UPPER}_LIB)
set(Qt5$${CMAKE_MODULE_NAME}_COMPILE_DEFINITIONS QT_\${_CMAKE_MODULE_NAME_UPPER}_LIB)
-set(_Qt5_MODULE_DEPENDENCIES \"$${CMAKE_MODULE_DEPS}\")
+set(_Qt5$${CMAKE_MODULE_NAME}_MODULE_DEPENDENCIES \"$${CMAKE_MODULE_DEPS}\")
-foreach(_module_dep ${_Qt5_MODULE_DEPENDENCIES})
+set(_Qt5$${CMAKE_MODULE_NAME}_FIND_DEPENDENCIES_REQUIRED)
+if (Qt5$${CMAKE_MODULE_NAME}_FIND_REQUIRED)
+ set(_Qt5$${CMAKE_MODULE_NAME}_FIND_DEPENDENCIES_REQUIRED REQUIRED)
+endif()
+set(_Qt5$${CMAKE_MODULE_NAME}_FIND_DEPENDENCIES_QUIET)
+if (Qt5$${CMAKE_MODULE_NAME}_FIND_QUIETLY)
+ set(_Qt5$${CMAKE_MODULE_NAME}_DEPENDENCIES_FIND_QUIET QUIET)
+endif()
+
+foreach(_module_dep ${_Qt5$${CMAKE_MODULE_NAME}_MODULE_DEPENDENCIES})
if (NOT Qt5${_module_dep}_FOUND)
- find_package(Qt5${_module_dep} REQUIRED)
+ find_package(Qt5${_module_dep} ${_Qt5$${CMAKE_MODULE_NAME}_DEPENDENCIES_FIND_QUIET} ${_Qt5$${CMAKE_MODULE_NAME}_FIND_DEPENDENCIES_REQUIRED})
endif()
+
+ if (NOT Qt5${_module_dep}_FOUND)
+ set(Qt5$${CMAKE_MODULE_NAME}_FOUND False)
+ return()
+ endif()
+
list(APPEND Qt5$${CMAKE_MODULE_NAME}_INCLUDE_DIRS ${Qt5${_module_dep}_INCLUDE_DIRS})
list(APPEND Qt5$${CMAKE_MODULE_NAME}_DEFINITIONS ${Qt5${_module_dep}_DEFINITIONS})
list(APPEND Qt5$${CMAKE_MODULE_NAME}_COMPILE_DEFINITIONS ${Qt5${_module_dep}_COMPILE_DEFINITIONS})
@@ -35,7 +50,7 @@ if (Qt5$${CMAKE_MODULE_NAME}_EXECUTABLE_COMPILE_FLAGS)
list(REMOVE_DUPLICATES Qt5$${CMAKE_MODULE_NAME}_EXECUTABLE_COMPILE_FLAGS)
endif()
-set(Qt5$${CMAKE_MODULE_NAME}_LIB_DEPENDENCIES "$${CMAKE_QT5_MODULE_DEPS}")
+set(Qt5$${CMAKE_MODULE_NAME}_LIB_DEPENDENCIES \"$${CMAKE_QT5_MODULE_DEPS}\")
!!IF !isEmpty(CMAKE_STATIC_TYPE)
# For static builds, we also list the dependencies of
diff --git a/mkspecs/common/gcc-base-ios.conf b/mkspecs/common/gcc-base-ios.conf
new file mode 100644
index 0000000000..68ec777f85
--- /dev/null
+++ b/mkspecs/common/gcc-base-ios.conf
@@ -0,0 +1,33 @@
+#
+# Base qmake configuration for GCC on iOS
+#
+# Before making changes to this file, please read the comment in
+# gcc-base.conf, to make sure the change goes in the right place.
+#
+# To verify that your change has the desired effect on the final configuration
+# you can use the manual test in tests/manual/mkspecs.
+#
+
+include(gcc-base.conf)
+
+QMAKE_COMPILER_DEFINES += __APPLE__ __GNUC__=4
+
+QMAKE_CFLAGS_DWARF2 += -gdwarf-2
+
+QMAKE_CXXFLAGS_DWARF2 += $$QMAKE_CFLAGS_DWARF2
+
+QMAKE_OBJECTIVE_CFLAGS = $$QMAKE_CFLAGS
+QMAKE_OBJECTIVE_CFLAGS_WARN_ON = $$QMAKE_CFLAGS_WARN_ON
+QMAKE_OBJECTIVE_CFLAGS_WARN_OFF = $$QMAKE_CFLAGS_WARN_OFF
+QMAKE_OBJECTIVE_CFLAGS_DEBUG = $$QMAKE_CFLAGS_DEBUG
+QMAKE_OBJECTIVE_CFLAGS_RELEASE = $$QMAKE_CFLAGS_RELEASE
+QMAKE_OBJECTIVE_CFLAGS_HIDESYMS = $$QMAKE_CXXFLAGS_HIDESYMS
+
+QMAKE_LFLAGS += -headerpad_max_install_names
+QMAKE_LFLAGS_SHLIB += -single_module -dynamiclib
+QMAKE_LFLAGS_PLUGIN += $$QMAKE_LFLAGS_SHLIB
+QMAKE_LFLAGS_INCREMENTAL += -undefined suppress -flat_namespace
+QMAKE_LFLAGS_SONAME += -install_name$${LITERAL_WHITESPACE}@executable_path/
+QMAKE_LFLAGS_VERSION += -current_version$${LITERAL_WHITESPACE}
+QMAKE_LFLAGS_COMPAT_VERSION += -compatibility_version$${LITERAL_WHITESPACE}
+
diff --git a/mkspecs/common/gcc-base.conf b/mkspecs/common/gcc-base.conf
index 28e3b87b5d..4a8419aa78 100644
--- a/mkspecs/common/gcc-base.conf
+++ b/mkspecs/common/gcc-base.conf
@@ -7,6 +7,7 @@
#
# Platform-specific options shared by these compilers are put into:
#
+# - gcc-base-ios.conf
# - gcc-base-macx.conf
# - gcc-base-unix.conf
#
diff --git a/mkspecs/common/ios.conf b/mkspecs/common/ios.conf
new file mode 100644
index 0000000000..5f28a5c5b2
--- /dev/null
+++ b/mkspecs/common/ios.conf
@@ -0,0 +1,21 @@
+#
+# qmake common configuration for iOS
+#
+
+MAKEFILE_GENERATOR = UNIX
+TEMPLATE = app
+CONFIG += qt ios warn_on release reduce_exports incremental global_init_link_order lib_version_first plugin_no_soname link_prl
+QT += core gui opengl
+QMAKE_INCREMENTAL_STYLE = sublib
+
+# Qt can't build iOS app bundle :(
+CONFIG -= app_bundle
+
+# Not deploying to Mac OSX
+QMAKE_MACOSX_DEPLOYMENT_TARGET =
+
+# Add iOS common folder to include path
+INCLUDEPATH += $$PWD/ios
+
+# iOS defines
+DEFINES += DARWIN_NO_CARBON Q_OS_IOS QT_NO_CORESERVICES QT_NO_PRINTER QT_NO_PRINTDIALOG
diff --git a/src/plugins/platforms/openkode/shaders/frag.glslf b/mkspecs/common/ios/GLES/gl.h
index f657f4f926..c074eb29b1 100644
--- a/src/plugins/platforms/openkode/shaders/frag.glslf
+++ b/mkspecs/common/ios/GLES/gl.h
@@ -3,7 +3,7 @@
** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/
**
-** This file is part of the plugins of the Qt Toolkit.
+** This file is part of the qmake spec of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** GNU Lesser General Public License Usage
@@ -39,11 +39,5 @@
**
****************************************************************************/
-uniform sampler2D tex_samp;
-
-varying vec2 texcoord_var;
-
-void main(void)
-{
- gl_FragColor = texture2D(tex_samp, texcoord_var);
-}
+#include <OpenGLES/ES1/gl.h>
+#include <OpenGLES/ES1/glext.h>
diff --git a/mkspecs/common/ios/GLES2/gl2.h b/mkspecs/common/ios/GLES2/gl2.h
new file mode 100644
index 0000000000..07e3abded1
--- /dev/null
+++ b/mkspecs/common/ios/GLES2/gl2.h
@@ -0,0 +1,43 @@
+/****************************************************************************
+**
+** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
+**
+** This file is part of the qmake spec of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** This file may be used under the terms of the GNU Lesser General Public
+** License version 2.1 as published by the Free Software Foundation and
+** appearing in the file LICENSE.LGPL included in the packaging of this
+** file. Please review the following information to ensure the GNU Lesser
+** General Public License version 2.1 requirements will be met:
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights. These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU General
+** Public License version 3.0 as published by the Free Software Foundation
+** and appearing in the file LICENSE.GPL included in the packaging of this
+** file. Please review the following information to ensure the GNU General
+** Public License version 3.0 requirements will be met:
+** http://www.gnu.org/copyleft/gpl.html.
+**
+** Other Usage
+** Alternatively, this file may be used in accordance with the terms and
+** conditions contained in a signed written agreement between you and Nokia.
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <OpenGLES/ES2/gl.h>
+#include <OpenGLES/ES2/glext.h>
diff --git a/mkspecs/common/ios/arch.conf b/mkspecs/common/ios/arch.conf
new file mode 100644
index 0000000000..4ad96874fe
--- /dev/null
+++ b/mkspecs/common/ios/arch.conf
@@ -0,0 +1,84 @@
+#
+# Helper to set CPU architecture flags for iOS configurations
+#
+# Depends on:
+#
+# QMAKE_IPHONEOS_DEPLOYMENT_TARGET - set in mkspecs/common/ios/versions.conf
+#
+# Note:
+#
+# Must be included after load(qt_config) in mkspec for auto-detection based
+# on GL/ES version (GL/ES 2.x implies armv7 on iOS).
+#
+
+# Target architecture for iOS devices (armv6, armv7 or leave blank for default)
+QMAKE_IOS_TARGET_ARCH =
+
+###########################################################################
+
+# Device?
+!*simulator* {
+ # Let mkspec specify archictecture
+ *armv6*: QMAKE_IOS_TARGET_ARCH = armv6
+ else:*armv7*: QMAKE_IOS_TARGET_ARCH = armv7
+
+ # ARMv7 architecture device (see below) is required for OpenGL/ES 2.x
+ isEmpty(QMAKE_IOS_TARGET_ARCH):contains(QT_CONFIG, opengles2): QMAKE_IOS_TARGET_ARCH = armv7
+
+ # No target architecture specified?
+ isEmpty(QMAKE_IOS_TARGET_ARCH) {
+ # iOS versions < 4.3 can be armv6 or armv7, so need armv6 for max. compatibility,
+ # assume that building for OpenGL/ES 1.x is targeting armv6
+ lessThan(QMAKE_IPHONEOS_DEPLOYMENT_TARGET, "4.3")|contains(QT_CONFIG, opengles1) {
+ QMAKE_IOS_TARGET_ARCH = armv6
+ } else: QMAKE_IOS_TARGET_ARCH = armv7
+ }
+
+ # Samsung S5PC100, Apple A4, A5, A5X
+ equals(QMAKE_IOS_TARGET_ARCH, "armv7") {
+ # iOS CPU architecture (armv7)
+ QMAKE_IOS_ARM_ARCH = __ARM_ARCH_7__
+
+ # Thumb2 instructions
+ QMAKE_IOS_ARM_FLAGS = -mthumb
+ QMAKE_IOS_ARM_ARCH += __MARM_THUMB__
+
+ # NEON instructions
+ *-g++*: QMAKE_IOS_ARM_FLAGS += -mfloat-abi=softfp -mfpu=neon
+ QMAKE_IOS_ARM_ARCH += __ARM_NEON__
+ } else {
+ # Samsung S5L8900
+ if(equals(QMAKE_IOS_TARGET_ARCH, "armv6")) {
+ # iOS CPU architecture (armv6)
+ QMAKE_IOS_ARM_ARCH = __ARM_ARCH_6__
+
+ # ARM instructions
+ QMAKE_IOS_ARM_FLAGS = -marm -mcpu=arm1176jzf-s
+ !*clang*: QMAKE_IOS_ARM_FLAGS += -march=armv6
+ } else {
+ # Unsupported architecture
+ error("Invalid iOS target $${QMAKE_IOS_TARGET_ARCH}! Edit mkspecs/common/ios/arch.conf to specify target architecture.")
+ }
+ }
+# Simulator is i386 only
+} else: QMAKE_IOS_TARGET_ARCH = i386
+
+# iOS architecture build flags
+QMAKE_IOS_ARCH_FLAGS = -arch $$QMAKE_IOS_TARGET_ARCH
+QMAKE_CFLAGS += $$QMAKE_IOS_ARCH_FLAGS
+QMAKE_CXXFLAGS += $$QMAKE_IOS_ARCH_FLAGS
+QMAKE_OBJECTIVE_CFLAGS += $$QMAKE_IOS_ARCH_FLAGS
+QMAKE_LFLAGS += $$QMAKE_IOS_ARCH_FLAGS
+QMAKE_IOS_TARGET_ARCH =
+QMAKE_IOS_ARCH_FLAGS =
+
+# Architecture specific defines/flags
+!*simulator* {
+ DEFINES += $$QMAKE_IOS_ARM_ARCH
+ QMAKE_IOS_ARM_ARCH =
+
+ QMAKE_CFLAGS += $$QMAKE_IOS_ARM_FLAGS
+ QMAKE_CXXFLAGS += $$QMAKE_IOS_ARM_FLAGS
+ QMAKE_OBJECTIVE_CFLAGS += $$QMAKE_IOS_ARM_FLAGS
+ QMAKE_IOS_ARM_FLAGS =
+}
diff --git a/mkspecs/common/ios/clang.conf b/mkspecs/common/ios/clang.conf
new file mode 100644
index 0000000000..e5c9b338c1
--- /dev/null
+++ b/mkspecs/common/ios/clang.conf
@@ -0,0 +1,47 @@
+#
+# compiler settings for iOS clang compilers
+#
+# Depends on:
+#
+# QMAKE_IOS_XCODE_VERSION - set in mkspecs/common/ios/versions.conf
+#
+
+# iOS build flags
+QMAKE_IOS_CFLAGS = -fvisibility=hidden -fpascal-strings -fmessage-length=0
+QMAKE_IOS_CFLAGS += -Wno-trigraphs -Wreturn-type -Wparentheses -Wswitch -Wno-unused-parameter -Wunused-variable -Wunused-value -Wno-shorten-64-to-32 -Wno-sign-conversion
+QMAKE_IOS_CXXFLAGS = -fvisibility-inlines-hidden
+QMAKE_IOS_OBJ_CFLAGS = -Wno-arc-abi -Wc++0x-extensions
+
+# Device or simulator specific flags
+*simulator* {
+ QMAKE_IOS_CFLAGS += -fexceptions -fasm-blocks
+ QMAKE_IOS_OBJ_CFLAGS += -fobjc-abi-version=2 -fobjc-legacy-dispatch
+}
+
+# Compiler version-specific flags
+!lessThan(QMAKE_IOS_XCODE_VERSION, "4.3") {
+ # Clang 3.1 flags (will be used for later versions too)
+ QMAKE_IOS_CFLAGS += -Wno-missing-field-initializers -Wno-missing-prototypes -Wno-implicit-atomic-properties -Wformat -Wno-missing-braces -Wno-unused-function -Wno-unused-label -Wuninitialized -Wno-unknown-pragmas -Wno-shadow -Wno-four-char-constants -Wno-sign-compare -Wpointer-sign -Wno-newline-eof -Wdeprecated-declarations -Winvalid-offsetof -Wno-conversion
+ QMAKE_IOS_CXXFLAGS += -Wno-non-virtual-dtor -Wno-overloaded-virtual -Wno-exit-time-destructors -Wc++11-extensions
+ QMAKE_IOS_OBJ_CFLAGS += -Wno-deprecated-implementations -Wprotocol -Wno-selector -Wno-strict-selector-match -Wno-undeclared-selector
+
+ # Warn about unsupported (later) Xcode versions
+ !lessThan(QMAKE_IOS_XCODE_VERSION, "4.4"): warning("The version of Xcode installed on this system is not recognised - custom compiler settings may be necessary")
+} else {
+ if (!lessThan(QMAKE_IOS_XCODE_VERSION, "4.2")) {
+ # Clang 3.0 flags
+ QMAKE_IOS_CFLAGS += -fdiagnostics-print-source-range-info -fdiagnostics-show-category=id -fdiagnostics-parseable-fixits
+ } else {
+ # Older Clang versions are not supported
+ error("Unsupported Xcode version $${QMAKE_IOS_XCODE_VERSION}")
+ }
+}
+
+# Set build flags
+QMAKE_CFLAGS += $$QMAKE_IOS_CFLAGS
+QMAKE_CXXFLAGS += $$QMAKE_IOS_CFLAGS $$QMAKE_IOS_CXXFLAGS
+QMAKE_OBJECTIVE_CFLAGS += $$QMAKE_IOS_CFLAGS $$QMAKE_IOS_CXXFLAGS $$QMAKE_IOS_OBJ_CFLAGS
+
+QMAKE_IOS_CFLAGS =
+QMAKE_IOS_CXXFLAGS =
+QMAKE_IOS_OBJ_CFLAGS =
diff --git a/mkspecs/common/ios/g++.conf b/mkspecs/common/ios/g++.conf
new file mode 100644
index 0000000000..8a1e0b20c0
--- /dev/null
+++ b/mkspecs/common/ios/g++.conf
@@ -0,0 +1,21 @@
+#
+# compiler settings for iOS g++ compilers
+#
+
+# iOS build flags
+QMAKE_IOS_CFLAGS = -fvisibility=hidden -fexceptions -fmessage-length=0
+QMAKE_IOS_CFLAGS += -Wno-trigraphs -Wreturn-type -Wunused-variable
+QMAKE_IOS_CXXFLAGS = -fvisibility-inlines-hidden
+
+# Device or simulator specific flags
+!*simulator*: QMAKE_IOS_OBJ_CFLAGS =
+else: QMAKE_IOS_OBJ_CFLAGS = -fobjc-abi-version=2 -fobjc-legacy-dispatch
+
+# Set build flags
+QMAKE_CFLAGS += $$QMAKE_IOS_CFLAGS
+QMAKE_CXXFLAGS += $$QMAKE_IOS_CFLAGS $$QMAKE_IOS_CXXFLAGS
+QMAKE_OBJECTIVE_CFLAGS += $$QMAKE_IOS_CFLAGS $$QMAKE_IOS_CXXFLAGS $$QMAKE_IOS_OBJ_CFLAGS
+
+QMAKE_IOS_CFLAGS =
+QMAKE_IOS_CXXFLAGS =
+QMAKE_IOS_OBJ_CFLAGS =
diff --git a/mkspecs/common/ios/llvm.conf b/mkspecs/common/ios/llvm.conf
new file mode 100644
index 0000000000..fa2e519dd9
--- /dev/null
+++ b/mkspecs/common/ios/llvm.conf
@@ -0,0 +1,31 @@
+#
+# compiler settings for iOS llvm-g++ compilers
+#
+# Depends on:
+#
+# QMAKE_IOS_XCODE_VERSION - set in mkspecs/common/ios/versions.conf
+#
+
+# iOS build flags
+QMAKE_IOS_CFLAGS = -fvisibility=hidden -fpascal-strings -fmessage-length=0
+QMAKE_IOS_CFLAGS += -Wno-trigraphs -Wreturn-type -Wunused-variable
+QMAKE_IOS_CXXFLAGS = -fvisibility-inlines-hidden
+
+# Device or simulator specific flags
+!*simulator*: QMAKE_IOS_OBJ_CFLAGS =
+else: QMAKE_IOS_OBJ_CFLAGS = -fobjc-abi-version=2 -fobjc-legacy-dispatch
+
+# Compiler version specific flags
+!lessThan(QMAKE_IOS_XCODE_VERSION, "4.3") {
+ # Xcode 4.3+ specific flags
+ QMAKE_IOS_CFLAGS += -Wuninitialized
+}
+
+# Set build flags
+QMAKE_CFLAGS += $$QMAKE_IOS_CFLAGS
+QMAKE_CXXFLAGS += $$QMAKE_IOS_CFLAGS $$QMAKE_IOS_CXXFLAGS
+QMAKE_OBJECTIVE_CFLAGS += $$QMAKE_IOS_CFLAGS $$QMAKE_IOS_CXXFLAGS $$QMAKE_IOS_OBJ_CFLAGS
+
+QMAKE_IOS_CFLAGS =
+QMAKE_IOS_CXXFLAGS =
+QMAKE_IOS_OBJ_CFLAGS =
diff --git a/mkspecs/common/ios/qmake.conf b/mkspecs/common/ios/qmake.conf
new file mode 100644
index 0000000000..8ee2575fb4
--- /dev/null
+++ b/mkspecs/common/ios/qmake.conf
@@ -0,0 +1,66 @@
+#
+# Common build settings for all iOS configurations
+#
+# Depends on:
+#
+# QMAKE_IOS_XCODE_VERSION - set in mkspecs/common/ios/versions.conf
+# QMAKE_IOS_SDK_VERSION - set in mkspecs/common/ios/versions.conf
+# QMAKE_IOSSIMULATOR_SDK_VERSION - set in mkspecs/common/ios/versions.conf
+#
+
+# iOS SDK device type
+!*simulator*: QMAKE_IOS_DEVICE_TYPE = iPhoneOS
+else {
+ QMAKE_IOS_DEVICE_TYPE = iPhoneSimulator
+
+ # Use simulator SDK version
+ QMAKE_IOS_SDK_VERSION = $$QMAKE_IOS_SIMULATOR_SDK_VERSION
+ QMAKE_IOS_SIMULATOR_SDK_VERSION =
+}
+
+!lessThan(QMAKE_IOS_XCODE_VERSION, "4.3") {
+ # Xcode 4.3+ is stored in /Applications
+ QMAKE_IOS_XCODE_PATH = /Applications/Xcode.app/Contents
+} else: QMAKE_IOS_XCODE_PATH =
+
+# iOS platform /Developer path
+QMAKE_IOS_DEV_PATH = $$QMAKE_IOS_XCODE_PATH/Developer/Platforms/$${QMAKE_IOS_DEVICE_TYPE}.platform/Developer
+QMAKE_IOS_XCODE_PATH =
+
+# iOS platform SDK path
+QMAKE_IOS_SDK = $$QMAKE_IOS_DEV_PATH/SDKs/$${QMAKE_IOS_DEVICE_TYPE}$${QMAKE_IOS_SDK_VERSION}.sdk
+QMAKE_IOS_DEV_PATH =
+QMAKE_IOS_DEVICE_TYPE =
+
+QMAKE_CFLAGS += -isysroot $$QMAKE_IOS_SDK
+QMAKE_CXXFLAGS += -isysroot $$QMAKE_IOS_SDK
+QMAKE_OBJECTIVE_CFLAGS += -isysroot $$QMAKE_IOS_SDK
+QMAKE_LFLAGS += -Wl,-syslibroot,$$QMAKE_IOS_SDK
+QMAKE_IOS_SDK =
+
+# Basic iOS frameworks needed for any GUI app
+QMAKE_LFLAGS += -framework Foundation -framework UIKit -framework QuartzCore -lz
+
+# OpenGL ES1
+QMAKE_INCDIR_OPENGL_ES1 = $$QMAKE_IOS_SDK/System/Library/Frameworks/OpenGLES.framework/Headers
+QMAKE_LIBDIR_OPENGL_ES1 =
+QMAKE_LIBS_OPENGL_ES1 = -framework OpenGLES
+
+# OpenGL ES2
+QMAKE_INCDIR_OPENGL_ES2 = $$QMAKE_IOS_SDK/System/Library/Frameworks/OpenGLES.framework/Headers
+QMAKE_LIBDIR_OPENGL_ES2 =
+QMAKE_LIBS_OPENGL_ES2 = -framework OpenGLES
+
+# No desktop OpenGL
+QMAKE_INCDIR_OPENGL =
+QMAKE_LIBS_OPENGL =
+QMAKE_LIBS_OPENGL_QT =
+
+# Compiler-specific flags
+!*-g++* {
+ # Objective-C/C++ precompile flags
+ QMAKE_OBJCFLAGS_PRECOMPILE = -x objective-c-header -c ${QMAKE_PCH_INPUT} -o ${QMAKE_PCH_OUTPUT}
+ QMAKE_OBJCFLAGS_USE_PRECOMPILE = $$QMAKE_CFLAGS_USE_PRECOMPILE
+ QMAKE_OBJCXXFLAGS_PRECOMPILE = -x objective-c++-header -c ${QMAKE_PCH_INPUT} -o ${QMAKE_PCH_OUTPUT}
+ QMAKE_OBJCXXFLAGS_USE_PRECOMPILE = $$QMAKE_CFLAGS_USE_PRECOMPILE
+}
diff --git a/src/plugins/platforms/openvglite/qgraphicssystem_vglite.h b/mkspecs/common/ios/qplatformdefs.h
index 46faf7cd2c..d25d99320a 100644
--- a/src/plugins/platforms/openvglite/qgraphicssystem_vglite.h
+++ b/mkspecs/common/ios/qplatformdefs.h
@@ -3,7 +3,7 @@
** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/
**
-** This file is part of the plugins of the Qt Toolkit.
+** This file is part of the qmake spec of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** GNU Lesser General Public License Usage
@@ -39,55 +39,62 @@
**
****************************************************************************/
-#ifndef QGRAPHICSSYSTEM_VGLITE_H
-#define QGRAPHICSSYSTEM_VGLITE_H
+#ifndef QPLATFORMDEFS_H
+#define QPLATFORMDEFS_H
-#include <QtGui/private/qgraphicssystem_p.h>
-#include <QtGui/private/qegl_p.h>
-#include <QtGui/qimage.h>
+// Get Qt defines/settings
-QT_BEGIN_NAMESPACE
+#include "qglobal.h"
-class QVGLiteWindowSurface;
+// Set any POSIX/XOPEN defines at the top of this file to turn on specific APIs
-class QVGLiteGraphicsSystem : public QGraphicsSystem,
- public QGraphicsSystemScreen
-{
-public:
- QVGLiteGraphicsSystem();
- ~QVGLiteGraphicsSystem();
+#include <unistd.h>
- QPlatformPixmap *createPlatformPixmap(QPlatformPixmap::PixelType type) const;
- QWindowSurface *createWindowSurface(QWidget *widget) const;
- QList<QGraphicsSystemScreen *> screens() const { return mScreens; }
- QRect geometry() const { return QRect(0, 0, w, h); }
- int depth() const { return d; }
- QImage::Format format() const { return screenFormat; }
- QSize physicalSize() const { return QSize(physWidth, physHeight); }
+// We are hot - unistd.h should have turned on the specific APIs we requested
-private:
- friend class QVGLiteWindowSurface;
- int w;
- int h;
- int d;
+#include <pthread.h>
+#include <dirent.h>
+#include <fcntl.h>
+#include <grp.h>
+#include <pwd.h>
+#include <signal.h>
+#define QT_NO_LIBRARY_UNLOAD
- int dw;
- int dh;
-
- int physWidth;
- int physHeight;
+#include <sys/types.h>
+#include <sys/ioctl.h>
+#include <sys/ipc.h>
+#include <sys/time.h>
+#include <sys/shm.h>
+#include <sys/socket.h>
+#include <sys/stat.h>
+#include <sys/wait.h>
+#include <netinet/in.h>
+#ifndef QT_NO_IPV6IFNAME
+#include <net/if.h>
+#endif
- mutable QVGLiteWindowSurface *surface;
- QEglContext *context;
- EGLSurface rootWindow;
- QImage::Format screenFormat;
- bool preservedSwap;
+#include "../../common/posix/qplatformdefs.h"
- QList<QGraphicsSystemScreen *> mScreens;
-};
+#undef QT_OPEN_LARGEFILE
+#undef QT_SOCKLEN_T
+#undef QT_SIGNAL_IGNORE
-QT_END_NAMESPACE
+#define QT_OPEN_LARGEFILE 0
+#if (MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_4)
+#define QT_SOCKLEN_T socklen_t
+#else
+#define QT_SOCKLEN_T int
#endif
+
+#define QT_SIGNAL_IGNORE (void (*)(int))1
+
+#define QT_SNPRINTF ::snprintf
+#define QT_VSNPRINTF ::vsnprintf
+
+#define QT_GUI_DRAG_DISTANCE 12
+#define QT_GUI_DOUBLE_CLICK_DISTANCE 12
+
+#endif // QPLATFORMDEFS_H
diff --git a/mkspecs/common/ios/versions.conf b/mkspecs/common/ios/versions.conf
new file mode 100644
index 0000000000..b755068769
--- /dev/null
+++ b/mkspecs/common/ios/versions.conf
@@ -0,0 +1,184 @@
+#
+# Helper to set build tool & SDK versions for iOS configurations
+#
+# This file sets up the following configuration variables:
+#
+# QMAKE_IOS_XCODE_VERSION - version number of Xcode being used
+# QMAKE_IOS_SDK_VERSION - version number of iOS device SDK
+# QMAKE_IOS_SIMULATOR_SDK_VERSION - version number of iOS simulator SDK
+#
+# Used in:
+#
+# mkspecs/common/ios/clang.conf
+# mkspecs/common/ios/llvm.conf
+# mkspecs/common/ios/qmake.conf
+# mkspecs/unsupported/macx-iosdevice-clang-legacy/qmake.conf
+# mkspecs/unsupported/macx-iosdevice-clang/qmake.conf
+# mkspecs/unsupported/macx-iosdevice-llvm-legacy/qmake.conf
+# mkspecs/unsupported/macx-iosdevice-llvm/qmake.conf
+# mkspecs/unsupported/macx-iosdevice-g++-legacy/qmake.conf
+# mkspecs/unsupported/macx-iossimulator-llvm-legacy/qmake.conf
+# mkspecs/unsupported/macx-iossimulator-llvm/qmake.conf
+# mkspecs/unsupported/macx-iossimulator-g++-legacy/qmake.conf
+#
+
+#
+# IMPORTANT:
+#
+# Xcode versions <= 4.2.x must be installed in /Developer.
+# Xcode versions >= 4.3.x must be installed in /Applications
+#
+# Xcode versions >= 4.10 & < 5.0 and versions >= 10.0 are not supported due to
+# the way the version checks are done here. As Apple (so far) has not used
+# minor version numbers greater than 3 for Xcode, and the Xcode major version
+# has only changed three times in the period 2003-2012, this is viewed as an
+# acceptable limitation.
+#
+
+#
+# Edit values below to match iOS build environment, or leave blank for
+# autodetection (slower!)
+#
+
+# Xcode version used for cross-compiling
+QMAKE_IOS_XCODE_VERSION =
+
+# iOS SDK version used for cross-compiling for iOS devices
+QMAKE_IOS_SDK_VERSION =
+
+# iOS SDK version used for cross-compiling for the iOS simulator
+QMAKE_IOS_SIMULATOR_SDK_VERSION =
+
+#
+# Do not edit values below here if using a pre-built SDK
+#
+
+# Minimum iOS version required on deployment target (if not specified, will
+# default to minimum version that guarantees ARMv7 & OpenGL/ES 2.x).
+#
+# No part of Qt or any known plugin uses features that require iOS versions
+# later than 4.0.
+QMAKE_IPHONEOS_DEPLOYMENT_TARGET = 4.0
+
+###########################################################################
+
+# No Xcode version specified?
+isEmpty(QMAKE_IOS_XCODE_VERSION) {
+ # Get version string from installed Xcode
+ exists(/Applications/Xcode.app/Contents/Developer) {
+ QMAKE_IOS_XCODE_INFO = $$system(/Applications/Xcode.app/Contents/Developer/usr/bin/xcodebuild -version)
+ } else: QMAKE_IOS_XCODE_INFO = $$system(/Developer/usr/bin/xcodebuild -version)
+
+ # Extract Xcode version number from output
+ QMAKE_IOS_XCODE_VERSION = $$member(QMAKE_IOS_XCODE_INFO, 1)
+ QMAKE_IOS_XCODE_INFO =
+}
+
+# Make sure Xcode version is valid
+!lessThan(QMAKE_IOS_XCODE_VERSION, "4.3") {
+ # Xcode 4.3+ is stored in /Applications
+ QMAKE_IOS_PLATFORM_PATH = /Applications/Xcode.app/Contents/Developer/Platforms
+
+ # Make sure Xcode path is valid
+ !exists($$QMAKE_IOS_PLATFORM_PATH): error("Xcode is not installed in /Applications/Xcode.app! Edit mkspecs/common/ios/versions.conf to specify version installed.")
+} else {
+ # Older Xcode versions are stored in /Developer
+ QMAKE_IOS_PLATFORM_PATH = /Developer/Platforms
+
+ # Make sure Xcode path is valid
+ !exists($$QMAKE_IOS_PLATFORM_PATH): error("Xcode is not installed in /Developer! Edit mkspecs/common/ios/versions.conf to specify version installed.")
+}
+
+# iOS 4.3 is the preferred version as it is the earliest version that is armv7/gles2 only
+QMAKE_IPHONEOS_PREFERRED_TARGET = 4.3
+
+# Building for iOS device?
+!*simulator* {
+ # No iOS SDK version specified?
+ isEmpty(QMAKE_IOS_SDK_VERSION) {
+ # Get version string from installed Xcode
+ !lessThan(QMAKE_IOS_XCODE_VERSION, "4.3") {
+ QMAKE_IOS_SDK_INFO = $$system(/Applications/Xcode.app/Contents/Developer/usr/bin/xcodebuild -showsdks)
+ } else: QMAKE_IOS_SDK_INFO = $$system(/Developer/usr/bin/xcodebuild -showsdks)
+
+ # Get names of installed device SDKs
+ QMAKE_IOS_SDK_INFO = $$find(QMAKE_IOS_SDK_INFO, ^iphoneos)
+ for(v, QMAKE_IOS_SDK_INFO): {
+ # Extract SDK version number from output
+ v = $$replace(v,iphoneos,)
+
+ # Use latest SDK version
+ greaterThan(v, $$QMAKE_IOS_SDK_VERSION): QMAKE_IOS_SDK_VERSION = $$v
+ }
+ QMAKE_IOS_SDK_INFO =
+ }
+
+ # Make sure iOS SDK version is valid
+ !exists($$QMAKE_IOS_PLATFORM_PATH/iPhoneOS.platform/Developer/SDKs/iPhoneOS$${QMAKE_IOS_SDK_VERSION}.sdk) {
+ error("iOS $$QMAKE_IOS_SDK_VERSION SDK not found! Edit mkspecs/common/ios/versions.conf to specify version installed.")
+ }
+
+ # No deployment target specified?
+ isEmpty(QMAKE_IPHONEOS_DEPLOYMENT_TARGET) {
+ # Use SDK version for iOS versions < preferred
+ lessThan(QMAKE_IOS_SDK_VERSION, $$QMAKE_IPHONEOS_PREFERRED_TARGET) {
+ QMAKE_IPHONEOS_DEPLOYMENT_TARGET = $$QMAKE_IOS_SDK_VERSION
+ } else: QMAKE_IPHONEOS_DEPLOYMENT_TARGET = $$QMAKE_IPHONEOS_PREFERRED_TARGET
+ }
+
+ # Make sure iOS SDK version is >= iOS target version
+ !lessThan(QMAKE_IPHONEOS_DEPLOYMENT_TARGET, $$QMAKE_IOS_SDK_VERSION) {
+ error("Target iOS version is greater that iOS SDK version $$QMAKE_IOS_SDK_VERSION! Edit mkspecs/common/ios/versions.conf to specify target iOS version.")
+ }
+# Building for iOS simulator
+} else {
+ # No iOS simulator SDK version specified?
+ isEmpty(QMAKE_IOS_SIMULATOR_SDK_VERSION) {
+ # Get version string from installed Xcode
+ !lessThan(QMAKE_IOS_XCODE_VERSION, "4.3") {
+ QMAKE_IOS_SDK_INFO = $$system(/Applications/Xcode.app/Contents/Developer/usr/bin/xcodebuild -showsdks)
+ } else: QMAKE_IOS_SDK_INFO = $$system(/Developer/usr/bin/xcodebuild -showsdks)
+
+ # Get names of installed device SDKs
+ QMAKE_IOS_SDK_INFO = $$find(QMAKE_IOS_SDK_INFO, ^iphonesimulator)
+ for(v, QMAKE_IOS_SDK_INFO): {
+ # Extract SDK version number from output
+ v = $$replace(v,iphonesimulator,)
+
+ # Use latest SDK version
+ greaterThan(v, $$QMAKE_IOS_SIMULATOR_SDK_VERSION): QMAKE_IOS_SIMULATOR_SDK_VERSION = $$v
+ }
+ QMAKE_IOS_SDK_INFO =
+ }
+
+ # Make sure iOS simulator SDK version is valid
+ !exists($$QMAKE_IOS_PLATFORM_PATH/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator$${QMAKE_IOS_SIMULATOR_SDK_VERSION}.sdk) {
+ error("iOS $$QMAKE_IOS_SIMULATOR_SDK_VERSION simulator SDK not found! Edit mkspecs/common/ios/versions.conf to specify version installed.")
+ }
+
+ # No deployment target specified?
+ isEmpty(QMAKE_IPHONEOS_DEPLOYMENT_TARGET) {
+ # Use SDK version for iOS versions < preferred
+ lessThan(QMAKE_IOS_SIMULATOR_SDK_VERSION, $$QMAKE_IPHONEOS_PREFERRED_TARGET) {
+ QMAKE_IPHONEOS_DEPLOYMENT_TARGET = $$QMAKE_IOS_SIMULATOR_SDK_VERSION
+ } else: QMAKE_IPHONEOS_DEPLOYMENT_TARGET = $$QMAKE_IPHONEOS_PREFERRED_TARGET
+ }
+
+ # Make sure iOS simulator SDK version is >= iOS target version
+ !lessThan(QMAKE_IPHONEOS_DEPLOYMENT_TARGET, $$QMAKE_IOS_SIMULATOR_SDK_VERSION) {
+ error("Target iOS version is greater that iOS simulator SDK version $$QMAKE_IOS_SIMULATOR_SDK_VERSION! Edit mkspecs/common/ios/versions.conf to specify target iOS version.")
+ }
+}
+
+QMAKE_IPHONEOS_PREFERRED_TARGET =
+QMAKE_IOS_PLATFORM_PATH =
+
+# Set deployment target
+QMAKE_IOS_VERSION_FLAGS = -miphoneos-version-min=$$QMAKE_IPHONEOS_DEPLOYMENT_TARGET
+
+# Set build flags
+QMAKE_CFLAGS += $$QMAKE_IOS_VERSION_FLAGS
+QMAKE_CXXFLAGS += $$QMAKE_IOS_VERSION_FLAGS
+QMAKE_OBJECTIVE_CFLAGS += $$QMAKE_IOS_VERSION_FLAGS
+QMAKE_LFLAGS += $$QMAKE_IOS_VERSION_FLAGS
+QMAKE_IOS_VERSION_FLAGS =
diff --git a/mkspecs/common/qcc-base-qnx-armv7le.conf b/mkspecs/common/qcc-base-qnx-armv7le.conf
new file mode 100644
index 0000000000..8270a27625
--- /dev/null
+++ b/mkspecs/common/qcc-base-qnx-armv7le.conf
@@ -0,0 +1,25 @@
+#
+# qmake configuration for qnx-qcc armv7 targets
+#
+
+MAKEFILE_GENERATOR = UNIX
+TARGET_PLATFORM = unix
+TEMPLATE = app
+CONFIG += qt warn_on release link_prl
+QT += core gui
+
+include(g++-unix.conf)
+include(unix.conf)
+
+QMAKE_CC = qcc -Vgcc_ntoarmv7le
+QNX_CPUDIR = armle-v7
+
+include(qcc-base-qnx.conf)
+
+QMAKE_AR = ntoarmv7-ar cqs
+QMAKE_OBJCOPY = ntoarmv7-objcopy
+QMAKE_RANLIB = ntoarmv7-ranlib
+
+QMAKE_STRIP = ntoarmv7-strip
+
+load(qt_config)
diff --git a/mkspecs/common/qcc-base-qnx-x86.conf b/mkspecs/common/qcc-base-qnx-x86.conf
new file mode 100644
index 0000000000..5e88ba8b54
--- /dev/null
+++ b/mkspecs/common/qcc-base-qnx-x86.conf
@@ -0,0 +1,25 @@
+#
+# qmake configuration for qnx-qcc x86 targets
+#
+
+MAKEFILE_GENERATOR = UNIX
+TARGET_PLATFORM = unix
+TEMPLATE = app
+CONFIG += qt warn_on release link_prl
+QT += core gui
+
+include(g++-unix.conf)
+include(unix.conf)
+
+QMAKE_CC = qcc -Vgcc_ntox86
+QNX_CPUDIR = x86
+
+include(qcc-base-qnx.conf)
+
+QMAKE_AR = ntox86-ar cqs
+QMAKE_OBJCOPY = ntox86-objcopy
+QMAKE_RANLIB = ntox86-ranlib
+
+QMAKE_STRIP = ntox86-strip
+
+load(qt_config)
diff --git a/mkspecs/common/qcc-base-qnx.conf b/mkspecs/common/qcc-base-qnx.conf
index ec0d27873d..d7c2f9f340 100644
--- a/mkspecs/common/qcc-base-qnx.conf
+++ b/mkspecs/common/qcc-base-qnx.conf
@@ -6,6 +6,9 @@ include(qcc-base.conf)
CONFIG += qnx
+#Choose qnx QPA Plugin as default
+QT_QPA_DEFAULT_PLATFORM = qnx
+
QMAKE_LFLAGS_SHLIB += -shared
QMAKE_LFLAGS_PLUGIN += $$QMAKE_LFLAGS_SHLIB
QMAKE_LFLAGS_SONAME += -Wl,-soname,
@@ -27,6 +30,7 @@ QMAKE_LIBS_NETWORK = -lsocket
# OpenGL libraries have a dependency on libEGL
QMAKE_LIBS_OPENGL_ES1 = -lGLES_CM -lEGL
QMAKE_LIBS_OPENGL_ES2 = -lGLESv2 -lEGL
+QMAKE_LIBS_EGL = -lEGL
# When using this mkspec to build Qt apps (ie - not Qt itself) we want to build
# against the NDK's target directory which is referenced by the QNX_TARGET environment
diff --git a/mkspecs/devices/linux-archos-gen8-g++/qmake.conf b/mkspecs/devices/linux-archos-gen8-g++/qmake.conf
new file mode 100644
index 0000000000..5e1fe8aea7
--- /dev/null
+++ b/mkspecs/devices/linux-archos-gen8-g++/qmake.conf
@@ -0,0 +1,63 @@
+#
+# qmake configuration for the Archos gen8 tablets (70 and 101)
+# with the SDE (Software Developer Edition) firmware
+# http://www.archos.com/support/support_tech/updates_dev.html
+#
+# OpenEmbedded platform build system for Qt5 available at:
+# http://github.com/KDAB/OpenEmbedded-Archos
+
+MAKEFILE_GENERATOR = UNIX
+TARGET_PLATFORM = unix
+TEMPLATE = app
+CONFIG += qt warn_on release incremental link_prl gdb_dwarf_index
+QT += core gui
+QMAKE_INCREMENTAL_STYLE = sublib
+
+include(../../common/linux.conf)
+include(../../common/gcc-base-unix.conf)
+include(../../common/g++-unix.conf)
+
+load(device_config)
+
+QT_QPA_DEFAULT_PLATFORM = eglfs
+
+isEmpty(CROSS_COMPILE) {
+ CROSS_COMPILE = arm-angstrom-linux-gnueabi-
+}
+
+# modifications to g++.conf
+QMAKE_CC = $${CROSS_COMPILE}gcc
+QMAKE_CXX = $${CROSS_COMPILE}g++
+QMAKE_LINK = $${QMAKE_CXX}
+QMAKE_LINK_SHLIB = $${QMAKE_CXX}
+
+# modifications to linux.conf
+QMAKE_AR = $${CROSS_COMPILE}ar cqs
+QMAKE_OBJCOPY = $${CROSS_COMPILE}objcopy
+QMAKE_STRIP = $${CROSS_COMPILE}strip
+
+COMPILER_FLAGS = -march=armv7-a -mtune=cortex-a8 -mfpu=neon -mfloat-abi=softfp
+
+#modifications to gcc-base.conf
+QMAKE_CFLAGS += $${COMPILER_FLAGS}
+QMAKE_CXXFLAGS += $${COMPILER_FLAGS}
+QMAKE_CXXFLAGS_RELEASE += -O3
+
+QMAKE_LIBS += -lrt -lpthread -ldl
+
+# Extra stuff (OpenGL, DirectFB, ...)
+QMAKE_INCDIR_EGL = $$[QT_SYSROOT]/usr/include
+QMAKE_LIBDIR_EGL = $$[QT_SYSROOT]/usr/lib
+QMAKE_INCDIR_OPENGL_ES2 = $${QMAKE_INCDIR_EGL}
+QMAKE_LIBDIR_OPENGL_ES2 = $${QMAKE_LIBDIR_EGL}
+QMAKE_INCDIR_OPENVG = $${QMAKE_INCDIR_EGL}
+QMAKE_LIBDIR_OPENVG = $${QMAKE_LIBDIR_EGL}
+
+QMAKE_LIBS_EGL = -lEGL -lIMGegl -lsrv_um
+QMAKE_LIBS_OPENGL_ES2 = -lGLESv2 $${QMAKE_LIBS_EGL}
+QMAKE_LIBS_OPENVG = -lOpenVG $${QMAKE_LIBS_EGL}
+
+# Sanity check
+deviceSanityCheckCompiler()
+
+load(qt_config)
diff --git a/mkspecs/freebsd-g++40/qplatformdefs.h b/mkspecs/devices/linux-archos-gen8-g++/qplatformdefs.h
index e708ea78a7..9e6b0f5bcc 100644
--- a/mkspecs/freebsd-g++40/qplatformdefs.h
+++ b/mkspecs/devices/linux-archos-gen8-g++/qplatformdefs.h
@@ -39,4 +39,4 @@
**
****************************************************************************/
-#include "../freebsd-g++/qplatformdefs.h"
+#include "../../linux-g++/qplatformdefs.h"
diff --git a/mkspecs/devices/linux-arm-amlogic-8726M-g++/qeglfshooks_8726m.cpp b/mkspecs/devices/linux-arm-amlogic-8726M-g++/qeglfshooks_8726m.cpp
index 6655c50573..9fa05a4bf4 100644
--- a/mkspecs/devices/linux-arm-amlogic-8726M-g++/qeglfshooks_8726m.cpp
+++ b/mkspecs/devices/linux-arm-amlogic-8726M-g++/qeglfshooks_8726m.cpp
@@ -48,6 +48,8 @@
#include <fcntl.h>
#include <linux/fb.h>
+QT_BEGIN_NAMESPACE
+
class QEglFS8726MHooks : public QEglFSHooks
{
public:
@@ -90,3 +92,4 @@ void QEglFS8726MHooks::destroyNativeWindow(EGLNativeWindowType window)
QEglFS8726MHooks eglFS8726MHooks;
QEglFSHooks *platformHooks = &eglFS8726MHooks;
+QT_END_NAMESPACE
diff --git a/mkspecs/devices/linux-arm-amlogic-8726M-g++/qmake.conf b/mkspecs/devices/linux-arm-amlogic-8726M-g++/qmake.conf
index 7525397a65..fb22fb4e97 100644
--- a/mkspecs/devices/linux-arm-amlogic-8726M-g++/qmake.conf
+++ b/mkspecs/devices/linux-arm-amlogic-8726M-g++/qmake.conf
@@ -33,4 +33,6 @@ deviceSanityCheckCompiler()
EGLFS_PLATFORM_HOOKS_SOURCES = $$PWD/qeglfshooks_8726m.cpp
+QT_QPA_DEFAULT_PLATFORM = eglfs
+
load(qt_config)
diff --git a/mkspecs/devices/linux-arm-trident-pnx8473-g++/qmake.conf b/mkspecs/devices/linux-arm-trident-pnx8473-g++/qmake.conf
index fbe6ed100b..ffc0965af0 100644
--- a/mkspecs/devices/linux-arm-trident-pnx8473-g++/qmake.conf
+++ b/mkspecs/devices/linux-arm-trident-pnx8473-g++/qmake.conf
@@ -63,4 +63,6 @@ QMAKE_LIBDIR_OPENGL_ES2 = $${TRIDENT_SHINER_SDK_LIBDIR_EGL_OPENGL_ES2}
QMAKE_LIBS_EGL = -lEGL -lIMGegl -lsrv_um -lusc
QMAKE_LIBS_OPENGL_ES2 = $$QMAKE_LIBS_EGL -lGLESv2 -lGLES_CM
+QT_QPA_DEFAULT_PLATFORM = eglfs
+
load(qt_config)
diff --git a/mkspecs/devices/linux-beagleboard-g++/qmake.conf b/mkspecs/devices/linux-beagleboard-g++/qmake.conf
new file mode 100644
index 0000000000..df3f4d343b
--- /dev/null
+++ b/mkspecs/devices/linux-beagleboard-g++/qmake.conf
@@ -0,0 +1,59 @@
+#
+# qmake configuration for the BeagleBoard and BeagleBoard xM boards
+# http://beagleboard.org/
+
+MAKEFILE_GENERATOR = UNIX
+TARGET_PLATFORM = unix
+TEMPLATE = app
+CONFIG += qt warn_on release incremental link_prl gdb_dwarf_index
+QT += core gui
+QMAKE_INCREMENTAL_STYLE = sublib
+
+include(../../common/linux.conf)
+include(../../common/gcc-base-unix.conf)
+include(../../common/g++-unix.conf)
+
+load(device_config)
+
+QT_QPA_DEFAULT_PLATFORM = eglfs
+
+isEmpty(CROSS_COMPILE) {
+ CROSS_COMPILE = arm-angstrom-linux-gnueabi-
+}
+
+# modifications to g++.conf
+QMAKE_CC = $${CROSS_COMPILE}gcc
+QMAKE_CXX = $${CROSS_COMPILE}g++
+QMAKE_LINK = $${QMAKE_CXX}
+QMAKE_LINK_SHLIB = $${QMAKE_CXX}
+
+# modifications to linux.conf
+QMAKE_AR = $${CROSS_COMPILE}ar cqs
+QMAKE_OBJCOPY = $${CROSS_COMPILE}objcopy
+QMAKE_STRIP = $${CROSS_COMPILE}strip
+
+COMPILER_FLAGS = -march=armv7-a -mtune=cortex-a8 -mfpu=neon -mfloat-abi=softfp
+
+#modifications to gcc-base.conf
+QMAKE_CFLAGS += $${COMPILER_FLAGS}
+QMAKE_CXXFLAGS += $${COMPILER_FLAGS}
+QMAKE_CXXFLAGS_RELEASE += -O3
+
+QMAKE_LIBS += -lrt -lpthread -ldl
+
+# Extra stuff (OpenGL, DirectFB, ...)
+QMAKE_INCDIR_EGL = $$[QT_SYSROOT]/usr/include
+QMAKE_LIBDIR_EGL = $$[QT_SYSROOT]/usr/lib
+QMAKE_INCDIR_OPENGL_ES2 = $${QMAKE_INCDIR_EGL}
+QMAKE_LIBDIR_OPENGL_ES2 = $${QMAKE_LIBDIR_EGL}
+QMAKE_INCDIR_OPENVG = $${QMAKE_INCDIR_EGL}
+QMAKE_LIBDIR_OPENVG = $${QMAKE_LIBDIR_EGL}
+
+QMAKE_LIBS_EGL = -lEGL -lIMGegl -lsrv_um
+QMAKE_LIBS_OPENGL_ES2 = -lGLESv2 $${QMAKE_LIBS_EGL}
+QMAKE_LIBS_OPENVG = -lOpenVG $${QMAKE_LIBS_EGL}
+
+# Sanity check
+deviceSanityCheckCompiler()
+
+load(qt_config)
diff --git a/mkspecs/devices/linux-beagleboard-g++/qplatformdefs.h b/mkspecs/devices/linux-beagleboard-g++/qplatformdefs.h
new file mode 100644
index 0000000000..9e6b0f5bcc
--- /dev/null
+++ b/mkspecs/devices/linux-beagleboard-g++/qplatformdefs.h
@@ -0,0 +1,42 @@
+/****************************************************************************
+**
+** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
+**
+** This file is part of the qmake spec of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** This file may be used under the terms of the GNU Lesser General Public
+** License version 2.1 as published by the Free Software Foundation and
+** appearing in the file LICENSE.LGPL included in the packaging of this
+** file. Please review the following information to ensure the GNU Lesser
+** General Public License version 2.1 requirements will be met:
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights. These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU General
+** Public License version 3.0 as published by the Free Software Foundation
+** and appearing in the file LICENSE.GPL included in the packaging of this
+** file. Please review the following information to ensure the GNU General
+** Public License version 3.0 requirements will be met:
+** http://www.gnu.org/copyleft/gpl.html.
+**
+** Other Usage
+** Alternatively, this file may be used in accordance with the terms and
+** conditions contained in a signed written agreement between you and Nokia.
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "../../linux-g++/qplatformdefs.h"
diff --git a/mkspecs/devices/linux-mipsel-broadcom-97425-g++/qdirectfbeglhooks_bcm97425.cpp b/mkspecs/devices/linux-mipsel-broadcom-97425-g++/qdirectfbeglhooks_bcm97425.cpp
index 16aee0c4f7..07967f762d 100644
--- a/mkspecs/devices/linux-mipsel-broadcom-97425-g++/qdirectfbeglhooks_bcm97425.cpp
+++ b/mkspecs/devices/linux-mipsel-broadcom-97425-g++/qdirectfbeglhooks_bcm97425.cpp
@@ -44,6 +44,8 @@
#include "default_directfb.h"
+QT_BEGIN_NAMESPACE
+
// Exported to the directfb plugin
QDirectFBEGLHooks platform_hook;
static void *dbpl_handle;
@@ -69,3 +71,4 @@ bool QDirectFBEGLHooks::hasCapability(QPlatformIntegration::Capability cap) cons
}
}
+QT_END_NAMESPACE
diff --git a/mkspecs/devices/linux-mipsel-broadcom-97425-g++/qmake.conf b/mkspecs/devices/linux-mipsel-broadcom-97425-g++/qmake.conf
index e69a3cee4b..fa25cdd97d 100644
--- a/mkspecs/devices/linux-mipsel-broadcom-97425-g++/qmake.conf
+++ b/mkspecs/devices/linux-mipsel-broadcom-97425-g++/qmake.conf
@@ -64,4 +64,6 @@ DIRECTFB_PLATFORM_HOOKS_INCLUDEPATH = $${BRCM_ROCKFORD_PATH}/middleware/platform
DIRECTFB_PLATFORM_HOOKS_LIBS = -ldbpl
DIRECTFB_PLATFORM_HOOKS_LIBDIR = $${BRCM_ROCKFORD_PATH}/middleware/platform/directfb/lib_$${BRCM_PLATFORM}_$${BRCM_BUILD_TYPE}
+QT_QPA_DEFAULT_PLATFORM = directfbegl
+
load(qt_config)
diff --git a/mkspecs/devices/linux-n9-g++/qmake.conf b/mkspecs/devices/linux-n9-g++/qmake.conf
new file mode 100644
index 0000000000..f26db53830
--- /dev/null
+++ b/mkspecs/devices/linux-n9-g++/qmake.conf
@@ -0,0 +1,34 @@
+#
+# qmake configuration for building Qt5 for the Nokia N9
+# http://wiki.qt-project.org/Devices/N9
+
+MAKEFILE_GENERATOR = UNIX
+TARGET_PLATFORM = unix
+TEMPLATE = app
+CONFIG += qt warn_on release incremental link_prl gdb_dwarf_index
+QT += core gui
+QMAKE_INCREMENTAL_STYLE = sublib
+
+include(../../common/linux.conf)
+include(../../common/gcc-base-unix.conf)
+include(../../common/g++-unix.conf)
+
+load(device_config)
+
+# modifications to g++.conf
+QMAKE_CC = $${CROSS_COMPILE}gcc
+QMAKE_CXX = $${CROSS_COMPILE}g++
+QMAKE_LINK = $${QMAKE_CXX}
+QMAKE_LINK_SHLIB = $${QMAKE_CXX}
+
+# modifications to linux.conf
+QMAKE_AR = $${CROSS_COMPILE}ar cqs
+QMAKE_OBJCOPY = $${CROSS_COMPILE}objcopy
+QMAKE_STRIP = $${CROSS_COMPILE}strip
+
+QMAKE_CFLAGS_RELEASE += -O2 -mfloat-abi=hard -mfpu=neon -march=armv7-a -mcpu=cortex-a8
+QMAKE_CXXFLAGS_RELEASE += $$QMAKE_CFLAGS_RELEASE
+
+QT_QPA_DEFAULT_PLATFORM = xcb
+
+load(qt_config)
diff --git a/mkspecs/devices/linux-n9-g++/qplatformdefs.h b/mkspecs/devices/linux-n9-g++/qplatformdefs.h
new file mode 100644
index 0000000000..9e6b0f5bcc
--- /dev/null
+++ b/mkspecs/devices/linux-n9-g++/qplatformdefs.h
@@ -0,0 +1,42 @@
+/****************************************************************************
+**
+** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
+**
+** This file is part of the qmake spec of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** This file may be used under the terms of the GNU Lesser General Public
+** License version 2.1 as published by the Free Software Foundation and
+** appearing in the file LICENSE.LGPL included in the packaging of this
+** file. Please review the following information to ensure the GNU Lesser
+** General Public License version 2.1 requirements will be met:
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights. These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU General
+** Public License version 3.0 as published by the Free Software Foundation
+** and appearing in the file LICENSE.GPL included in the packaging of this
+** file. Please review the following information to ensure the GNU General
+** Public License version 3.0 requirements will be met:
+** http://www.gnu.org/copyleft/gpl.html.
+**
+** Other Usage
+** Alternatively, this file may be used in accordance with the terms and
+** conditions contained in a signed written agreement between you and Nokia.
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "../../linux-g++/qplatformdefs.h"
diff --git a/mkspecs/devices/linux-rasp-pi-g++/qeglfshooks_pi.cpp b/mkspecs/devices/linux-rasp-pi-g++/qeglfshooks_pi.cpp
index 21052a5b63..cdd01dc3fa 100644
--- a/mkspecs/devices/linux-rasp-pi-g++/qeglfshooks_pi.cpp
+++ b/mkspecs/devices/linux-rasp-pi-g++/qeglfshooks_pi.cpp
@@ -52,6 +52,8 @@
#include <linux/fb.h>
#endif
+QT_BEGIN_NAMESPACE
+
static DISPMANX_DISPLAY_HANDLE_T dispman_display = 0;
static DISPMANX_UPDATE_HANDLE_T dispman_update = 0;
@@ -167,3 +169,5 @@ bool QEglFSPiHooks::hasCapability(QPlatformIntegration::Capability cap) const
QEglFSPiHooks eglFSPiHooks;
QEglFSHooks *platformHooks = &eglFSPiHooks;
+
+QT_END_NAMESPACE
diff --git a/mkspecs/devices/linux-rasp-pi-g++/qmake.conf b/mkspecs/devices/linux-rasp-pi-g++/qmake.conf
index 4c75e0b0b2..079c07830e 100644
--- a/mkspecs/devices/linux-rasp-pi-g++/qmake.conf
+++ b/mkspecs/devices/linux-rasp-pi-g++/qmake.conf
@@ -53,4 +53,6 @@ EGLFS_PLATFORM_HOOKS_SOURCES = $$PWD/qeglfshooks_pi.cpp
# Sanity check
deviceSanityCheckCompiler()
+QT_QPA_DEFAULT_PLATFORM = eglfs
+
load(qt_config)
diff --git a/mkspecs/devices/linux-rasp-pi-g++/qplatformdefs.h b/mkspecs/devices/linux-rasp-pi-g++/qplatformdefs.h
index 62cbb049dd..9e6b0f5bcc 100644
--- a/mkspecs/devices/linux-rasp-pi-g++/qplatformdefs.h
+++ b/mkspecs/devices/linux-rasp-pi-g++/qplatformdefs.h
@@ -40,5 +40,3 @@
****************************************************************************/
#include "../../linux-g++/qplatformdefs.h"
-
-#define QT_QPA_DEFAULT_PLATFORM_NAME "eglfs"
diff --git a/mkspecs/devices/linux-sh4-stmicro-ST7108-g++/qmake.conf b/mkspecs/devices/linux-sh4-stmicro-ST7108-g++/qmake.conf
index ba8ab28026..52c15982c3 100644
--- a/mkspecs/devices/linux-sh4-stmicro-ST7108-g++/qmake.conf
+++ b/mkspecs/devices/linux-sh4-stmicro-ST7108-g++/qmake.conf
@@ -32,4 +32,6 @@ deviceSanityCheckCompiler()
QMAKE_LIBS_EGL += -lMali
+QT_QPA_DEFAULT_PLATFORM = eglfs
+
load(qt_config)
diff --git a/mkspecs/devices/linux-sh4-stmicro-ST7540-g++/qmake.conf b/mkspecs/devices/linux-sh4-stmicro-ST7540-g++/qmake.conf
index 9a99a82ee3..e020a9585c 100644
--- a/mkspecs/devices/linux-sh4-stmicro-ST7540-g++/qmake.conf
+++ b/mkspecs/devices/linux-sh4-stmicro-ST7540-g++/qmake.conf
@@ -43,5 +43,7 @@ QMAKE_INCDIR_OPENGL_ES2 += $$QMAKE_INCDIR_EGL
QMAKE_LIBDIR_OPENGL_ES2 += $$QMAKE_LIBDIR_EGL
QMAKE_LIBS_OPENGL_ES2 += $$QMAKE_LIBS_EGL
+QT_QPA_DEFAULT_PLATFORM = eglfs
+
load(qt_config)
diff --git a/mkspecs/features/create_cmake.prf b/mkspecs/features/create_cmake.prf
index b8809a236b..120c96746d 100644
--- a/mkspecs/features/create_cmake.prf
+++ b/mkspecs/features/create_cmake.prf
@@ -113,8 +113,22 @@ macx {
CMAKE_DEBUG_TYPE =
CMAKE_RELEASE_TYPE =
-debug_and_release|debug:CMAKE_DEBUG_TYPE = debug
-debug_and_release|release:CMAKE_RELEASE_TYPE = release
+# Requirements:
+# * If Qt is configured with -debug, we're creating debug libraries and not
+# release libraries, regardless of whether we're on a platform where
+# debug_and_release is true.
+# * If Qt is configured with -release, we're creating release libraries and not
+# debug libraries, regardless of whether we're on a platform where
+# debug_and_release is true.
+# * If Qt is configured with neither -debug nor -release, and we are on a
+# platform where debug_and_release is true, we're creating both
+# debug and release libraries.
+# * If Qt is configured with -debug on a platform where debug_and_release is
+# true, and 'make release' is subsequently invoked, CMake is only aware of
+# the debug libraries at build time.
+
+if (build_all|CONFIG(debug, debug|release)):CMAKE_DEBUG_TYPE = debug
+if (build_all|CONFIG(release, debug|release)):CMAKE_RELEASE_TYPE = release
INSTALLS += cmake_qt5_module_files
diff --git a/mkspecs/features/declarative_debug.prf b/mkspecs/features/declarative_debug.prf
index 9125fcf33f..94c94cfb57 100644
--- a/mkspecs/features/declarative_debug.prf
+++ b/mkspecs/features/declarative_debug.prf
@@ -1,2 +1,2 @@
DEFINES += QT_DECLARATIVE_DEBUG
-warning("CONFIG+=declarative_debug is deprecated. Use qml_debug instead!")
+warning("CONFIG+=declarative_debug is deprecated. Use qml_debug or quick1_debug instead!")
diff --git a/mkspecs/features/device_config.prf b/mkspecs/features/device_config.prf
index 90bf9150e9..020b3ad7bb 100644
--- a/mkspecs/features/device_config.prf
+++ b/mkspecs/features/device_config.prf
@@ -22,6 +22,11 @@ isEmpty(DEVICE_PRI) {
exists($$DEVICE_PRI):include($$DEVICE_PRI)
+isEmpty(CROSS_COMPILE) {
+ #this variable can be persisted via qmake -set CROSS_COMPILE /foo
+ CROSS_COMPILE = $$[CROSS_COMPILE]
+}
+
unset(DEVICE_PRI)
unset(DIR)
diff --git a/mkspecs/features/qt.prf b/mkspecs/features/qt.prf
index fb67251600..c69941357a 100644
--- a/mkspecs/features/qt.prf
+++ b/mkspecs/features/qt.prf
@@ -1,32 +1,5 @@
CONFIG *= moc thread
-# Temporary fixes to avoid QDeclarative -> QQml breakage:
-
-# Projects depending on declarative will now get the full set of
-# -DOldSymbol=NewSymbol definitions added to their configuration
-# so that the old symbol names still compile. All code previously
-# in the declarative library is now in the qml library.
-contains(QT, qmldevtools):!contains(QT, declarative) {
- QT += declarative
-}
-contains(QT, qmldevtools-private):!contains(QT, declarative-private) {
- QT += declarative-private
-}
-
-contains(QT, quick):!contains(QT, declarative) {
- QT += declarative
-}
-contains(QT, quick-private):!contains(QT, declarative-private) {
- QT += declarative-private
-}
-
-contains(QT, declarative):!contains(QT, qml) {
- QT += qml
-}
-contains(QT, declarative-private):!contains(QT, qml-private) {
- QT += qml-private
-}
-
#handle defines
win32 {
qt_static:DEFINES += QT_NODLL
diff --git a/mkspecs/features/qt_module_config.prf b/mkspecs/features/qt_module_config.prf
index ac0b635f2f..217572e143 100644
--- a/mkspecs/features/qt_module_config.prf
+++ b/mkspecs/features/qt_module_config.prf
@@ -143,6 +143,7 @@ contains(QT_PRODUCT, OpenSource.*):DEFINES *= QT_OPENSOURCE
DEFINES *= QT_NO_CAST_TO_ASCII QT_ASCII_CAST_WARNINGS
DEFINES *= QT_MOC_COMPAT #we don't need warnings from calling moc code in our generated code
DEFINES *= QT_USE_QSTRINGBUILDER
+DEFINES *= QT_DEPRECATED_WARNINGS
TARGET = $$qtLibraryTarget($$TARGET$$QT_LIBINFIX) #do this towards the end
diff --git a/mkspecs/features/quick1_debug.prf b/mkspecs/features/quick1_debug.prf
new file mode 100644
index 0000000000..59e45f662f
--- /dev/null
+++ b/mkspecs/features/quick1_debug.prf
@@ -0,0 +1 @@
+DEFINES += QT_DECLARATIVE_DEBUG
diff --git a/mkspecs/freebsd-g++/qplatformdefs.h b/mkspecs/freebsd-g++/qplatformdefs.h
index 4c0d9e091f..90640bf429 100644
--- a/mkspecs/freebsd-g++/qplatformdefs.h
+++ b/mkspecs/freebsd-g++/qplatformdefs.h
@@ -79,30 +79,10 @@
#include "../common/posix/qplatformdefs.h"
#undef QT_OPEN_LARGEFILE
-#undef QT_SOCKLEN_T
#define QT_OPEN_LARGEFILE 0
-#if !defined(__DragonFly__) && (__FreeBSD_version < 400000)
-// FreeBSD 1.0 - 3.5.1
-#define QT_SOCKLEN_T int
-#else
-// FreeBSD 4.0 and better
-#define QT_SOCKLEN_T socklen_t
-#endif
-
#define QT_SNPRINTF ::snprintf
#define QT_VSNPRINTF ::vsnprintf
-// Older FreeBSD versions may still use the a.out format instead of ELF.
-// From the FreeBSD man pages:
-// In previous implementations, it was necessary to prepend an
-// underscore to all external symbols in order to gain symbol
-// compatibility with object code compiled from the C language.
-// This is still the case when using the (obsolete) -aout option to
-// the C language compiler.
-#ifndef __ELF__
-#define QT_AOUT_UNDERSCORE
-#endif
-
#endif // QPLATFORMDEFS_H
diff --git a/mkspecs/freebsd-g++34/qmake.conf b/mkspecs/freebsd-g++34/qmake.conf
deleted file mode 100644
index ee597de6c5..0000000000
--- a/mkspecs/freebsd-g++34/qmake.conf
+++ /dev/null
@@ -1,84 +0,0 @@
-#
-# qmake configuration for freebsd-g++34 (using g++34 from ports/lang/gcc34)
-#
-
-MAKEFILE_GENERATOR = UNIX
-TARGET_PLATFORM = unix
-TEMPLATE = app
-CONFIG += qt warn_on release link_prl
-QT += core gui
-
-QMAKE_CC = gcc34
-QMAKE_LEX = flex
-QMAKE_LEXFLAGS =
-QMAKE_YACC = yacc
-QMAKE_YACCFLAGS = -d
-QMAKE_CFLAGS = -pipe
-QMAKE_CFLAGS_DEPS = -M
-QMAKE_CFLAGS_WARN_ON = -Wall -W
-QMAKE_CFLAGS_WARN_OFF = -w
-QMAKE_CFLAGS_RELEASE = -O2
-QMAKE_CFLAGS_DEBUG = -g
-QMAKE_CFLAGS_SHLIB = -fPIC
-QMAKE_CFLAGS_STATIC_LIB = $$QMAKE_CFLAGS_SHLIB
-QMAKE_CFLAGS_YACC = -Wno-unused -Wno-parentheses
-QMAKE_CFLAGS_THREAD = -pthread -D_THREAD_SAFE
-
-QMAKE_CXX = g++34
-QMAKE_CXXFLAGS = $$QMAKE_CFLAGS
-QMAKE_CXXFLAGS_DEPS = $$QMAKE_CFLAGS_DEPS
-QMAKE_CXXFLAGS_WARN_ON = $$QMAKE_CFLAGS_WARN_ON
-QMAKE_CXXFLAGS_WARN_OFF = $$QMAKE_CFLAGS_WARN_OFF
-QMAKE_CXXFLAGS_RELEASE = $$QMAKE_CFLAGS_RELEASE
-QMAKE_CXXFLAGS_DEBUG = $$QMAKE_CFLAGS_DEBUG
-QMAKE_CXXFLAGS_SHLIB = $$QMAKE_CFLAGS_SHLIB
-QMAKE_CXXFLAGS_STATIC_LIB = $$QMAKE_CFLAGS_STATIC_LIB
-QMAKE_CXXFLAGS_YACC = $$QMAKE_CFLAGS_YACC
-QMAKE_CXXFLAGS_THREAD = $$QMAKE_CFLAGS_THREAD
-
-# Addon software goes into /usr/local on the BSDs, by default we will look there
-QMAKE_INCDIR = /usr/local/include
-QMAKE_LIBDIR = /usr/local/lib
-QMAKE_INCDIR_X11 = /usr/X11R6/include
-QMAKE_LIBDIR_X11 = /usr/X11R6/lib
-QMAKE_INCDIR_QT = $$[QT_INSTALL_HEADERS]
-QMAKE_LIBDIR_QT = $$[QT_INSTALL_LIBS]
-QMAKE_INCDIR_OPENGL = /usr/X11R6/include
-QMAKE_LIBDIR_OPENGL = /usr/X11R6/lib
-
-QMAKE_LINK = g++34
-QMAKE_LINK_SHLIB = g++34
-QMAKE_LINK_C = gcc34
-QMAKE_LINK_C_SHLIB = gcc34
-QMAKE_LFLAGS =
-QMAKE_LFLAGS_RELEASE =
-QMAKE_LFLAGS_DEBUG =
-QMAKE_LFLAGS_SHLIB = -shared
-QMAKE_LFLAGS_PLUGIN = $$QMAKE_LFLAGS_SHLIB
-QMAKE_LFLAGS_SONAME = -Wl,-soname,
-QMAKE_LFLAGS_THREAD = -pthread
-QMAKE_LFLAGS_RPATH = -Wl,-rpath,
-
-QMAKE_LIBS =
-QMAKE_LIBS_DYNLOAD =
-QMAKE_LIBS_X11 = -lXext -lX11 -lm
-QMAKE_LIBS_X11SM = -lSM -lICE
-QMAKE_LIBS_OPENGL = -lGL
-QMAKE_LIBS_OPENGL_QT = -lGL
-QMAKE_LIBS_THREAD =
-
-QMAKE_AR = ar cqs
-QMAKE_OBJCOPY = objcopy
-QMAKE_RANLIB =
-
-QMAKE_TAR = tar -cf
-QMAKE_GZIP = gzip -9f
-
-QMAKE_COPY = cp -f
-QMAKE_MOVE = mv -f
-QMAKE_DEL_FILE = rm -f
-QMAKE_DEL_DIR = rmdir
-QMAKE_CHK_DIR_EXISTS = test -d
-QMAKE_MKDIR = mkdir -p
-include(../common/unix.conf)
-load(qt_config)
diff --git a/mkspecs/freebsd-g++40/qmake.conf b/mkspecs/freebsd-g++40/qmake.conf
deleted file mode 100644
index 331c267b9e..0000000000
--- a/mkspecs/freebsd-g++40/qmake.conf
+++ /dev/null
@@ -1,84 +0,0 @@
-#
-# qmake configuration for freebsd-g++40 (using g++40 from ports/lang/gcc40)
-#
-
-MAKEFILE_GENERATOR = UNIX
-TARGET_PLATFORM = unix
-TEMPLATE = app
-CONFIG += qt warn_on release link_prl gdb_dwarf_index
-QT += core gui
-
-QMAKE_CC = gcc40
-QMAKE_LEX = flex
-QMAKE_LEXFLAGS =
-QMAKE_YACC = yacc
-QMAKE_YACCFLAGS = -d
-QMAKE_CFLAGS = -pipe
-QMAKE_CFLAGS_DEPS = -M
-QMAKE_CFLAGS_WARN_ON = -Wall -W
-QMAKE_CFLAGS_WARN_OFF = -w
-QMAKE_CFLAGS_RELEASE = -O2
-QMAKE_CFLAGS_DEBUG = -g
-QMAKE_CFLAGS_SHLIB = -fPIC
-QMAKE_CFLAGS_STATIC_LIB = $$QMAKE_CFLAGS_SHLIB
-QMAKE_CFLAGS_YACC = -Wno-unused -Wno-parentheses
-QMAKE_CFLAGS_THREAD = -pthread -D_THREAD_SAFE
-
-QMAKE_CXX = g++40
-QMAKE_CXXFLAGS = $$QMAKE_CFLAGS
-QMAKE_CXXFLAGS_DEPS = $$QMAKE_CFLAGS_DEPS
-QMAKE_CXXFLAGS_WARN_ON = $$QMAKE_CFLAGS_WARN_ON
-QMAKE_CXXFLAGS_WARN_OFF = $$QMAKE_CFLAGS_WARN_OFF
-QMAKE_CXXFLAGS_RELEASE = $$QMAKE_CFLAGS_RELEASE
-QMAKE_CXXFLAGS_DEBUG = $$QMAKE_CFLAGS_DEBUG
-QMAKE_CXXFLAGS_SHLIB = $$QMAKE_CFLAGS_SHLIB
-QMAKE_CXXFLAGS_STATIC_LIB = $$QMAKE_CFLAGS_STATIC_LIB
-QMAKE_CXXFLAGS_YACC = $$QMAKE_CFLAGS_YACC
-QMAKE_CXXFLAGS_THREAD = $$QMAKE_CFLAGS_THREAD
-
-# Addon software goes into /usr/local on the BSDs, by default we will look there
-QMAKE_INCDIR = /usr/local/include
-QMAKE_LIBDIR = /usr/local/lib
-QMAKE_INCDIR_X11 = /usr/X11R6/include
-QMAKE_LIBDIR_X11 = /usr/X11R6/lib
-QMAKE_INCDIR_QT = $$[QT_INSTALL_HEADERS]
-QMAKE_LIBDIR_QT = $$[QT_INSTALL_LIBS]
-QMAKE_INCDIR_OPENGL = /usr/X11R6/include
-QMAKE_LIBDIR_OPENGL = /usr/X11R6/lib
-
-QMAKE_LINK = g++40
-QMAKE_LINK_SHLIB = g++40
-QMAKE_LINK_C = gcc40
-QMAKE_LINK_C_SHLIB = gcc40
-QMAKE_LFLAGS =
-QMAKE_LFLAGS_RELEASE =
-QMAKE_LFLAGS_DEBUG =
-QMAKE_LFLAGS_SHLIB = -shared
-QMAKE_LFLAGS_PLUGIN = $$QMAKE_LFLAGS_SHLIB
-QMAKE_LFLAGS_SONAME = -Wl,-soname,
-QMAKE_LFLAGS_THREAD = -pthread
-QMAKE_LFLAGS_RPATH = -Wl,-rpath,
-
-QMAKE_LIBS =
-QMAKE_LIBS_DYNLOAD =
-QMAKE_LIBS_X11 = -lXext -lX11 -lm
-QMAKE_LIBS_X11SM = -lSM -lICE
-QMAKE_LIBS_OPENGL = -lGL
-QMAKE_LIBS_OPENGL_QT = -lGL
-QMAKE_LIBS_THREAD =
-
-QMAKE_AR = ar cqs
-QMAKE_OBJCOPY = objcopy
-QMAKE_RANLIB =
-
-QMAKE_TAR = tar -cf
-QMAKE_GZIP = gzip -9f
-
-QMAKE_COPY = cp -f
-QMAKE_MOVE = mv -f
-QMAKE_DEL_FILE = rm -f
-QMAKE_DEL_DIR = rmdir
-QMAKE_CHK_DIR_EXISTS = test -d
-QMAKE_MKDIR = mkdir -p
-include(../common/unix.conf)
-load(qt_config)
diff --git a/mkspecs/freebsd-g++46/qmake.conf b/mkspecs/freebsd-g++46/qmake.conf
new file mode 100644
index 0000000000..faa79f8e69
--- /dev/null
+++ b/mkspecs/freebsd-g++46/qmake.conf
@@ -0,0 +1,61 @@
+#
+# qmake configuration for freebsd-g++46 (using g++46 from ports/lang/gcc)
+#
+
+MAKEFILE_GENERATOR = UNIX
+TARGET_PLATFORM = unix
+TEMPLATE = app
+CONFIG += qt warn_on release link_prl gdb_dwarf_index
+QT += core gui
+
+QMAKE_CFLAGS_THREAD = -pthread -D_THREAD_SAFE
+
+QMAKE_CXXFLAGS_THREAD = $$QMAKE_CFLAGS_THREAD
+
+# Addon software goes into /usr/local on the BSDs, by default we will look there
+QMAKE_INCDIR = /usr/local/include
+QMAKE_LIBDIR = /usr/local/lib
+QMAKE_INCDIR_X11 = /usr/X11R6/include
+QMAKE_LIBDIR_X11 = /usr/X11R6/lib
+QMAKE_INCDIR_QT = $$[QT_INSTALL_HEADERS]
+QMAKE_LIBDIR_QT = $$[QT_INSTALL_LIBS]
+QMAKE_INCDIR_OPENGL = /usr/X11R6/include
+QMAKE_LIBDIR_OPENGL = /usr/X11R6/lib
+
+QMAKE_LFLAGS_THREAD = -pthread
+
+QMAKE_LIBS =
+QMAKE_LIBS_DYNLOAD =
+QMAKE_LIBS_X11 = -lXext -lX11 -lm
+QMAKE_LIBS_X11SM = -lSM -lICE
+QMAKE_LIBS_OPENGL = -lGL
+QMAKE_LIBS_OPENGL_QT = -lGL
+QMAKE_LIBS_THREAD =
+
+QMAKE_AR = ar cqs
+QMAKE_OBJCOPY = objcopy
+QMAKE_RANLIB =
+
+QMAKE_TAR = tar -cf
+QMAKE_GZIP = gzip -9f
+
+QMAKE_COPY = cp -f
+QMAKE_MOVE = mv -f
+QMAKE_DEL_FILE = rm -f
+QMAKE_DEL_DIR = rmdir
+QMAKE_CHK_DIR_EXISTS = test -d
+QMAKE_MKDIR = mkdir -p
+include(../common/unix.conf)
+include(../common/gcc-base-unix.conf)
+include(../common/g++-unix.conf)
+
+# Redefined here because g++-base.conf sets QMAKE_CC and QMAKE_CXX
+# to gcc and g++, respectively.
+QMAKE_CC = gcc46
+QMAKE_CXX = g++46
+QMAKE_LINK_C = $$QMAKE_CC
+QMAKE_LINK_C_SHLIB = $$QMAKE_CC
+QMAKE_LINK = $$QMAKE_CXX
+QMAKE_LINK_SHLIB = $$QMAKE_CXX
+
+load(qt_config)
diff --git a/mkspecs/freebsd-g++34/qplatformdefs.h b/mkspecs/freebsd-g++46/qplatformdefs.h
index e708ea78a7..e708ea78a7 100644
--- a/mkspecs/freebsd-g++34/qplatformdefs.h
+++ b/mkspecs/freebsd-g++46/qplatformdefs.h
diff --git a/mkspecs/unsupported/blackberry-armv7le-qcc/qmake.conf b/mkspecs/unsupported/blackberry-armv7le-qcc/qmake.conf
index 4e72667c5d..efb585b6a5 100644
--- a/mkspecs/unsupported/blackberry-armv7le-qcc/qmake.conf
+++ b/mkspecs/unsupported/blackberry-armv7le-qcc/qmake.conf
@@ -1,5 +1,5 @@
#
-# qmake configuration for blackberry x86 systems
+# qmake configuration for blackberry armv7le systems
#
DEFINES += Q_OS_BLACKBERRY
@@ -9,4 +9,4 @@ LIBS += -lbps
# Blackberry also has support for stack smashing protection in its libc
QMAKE_CFLAGS += -fstack-protector -fstack-protector-all
-include(../qnx-armv7le-qcc/qmake.conf)
+include(../../common/qcc-base-qnx-armv7le.conf)
diff --git a/mkspecs/unsupported/blackberry-x86-qcc/qmake.conf b/mkspecs/unsupported/blackberry-x86-qcc/qmake.conf
index 60b67f801e..3fd84c13a6 100644
--- a/mkspecs/unsupported/blackberry-x86-qcc/qmake.conf
+++ b/mkspecs/unsupported/blackberry-x86-qcc/qmake.conf
@@ -9,4 +9,4 @@ LIBS += -lbps
# Blackberry also has support for stack smashing protection in its libc
QMAKE_CFLAGS += -fstack-protector -fstack-protector-all
-include(../qnx-x86-qcc/qmake.conf)
+include(../../common/qcc-base-qnx-x86.conf)
diff --git a/mkspecs/unsupported/integrity-ghs/qplatformdefs.h b/mkspecs/unsupported/integrity-ghs/qplatformdefs.h
index 87459d874e..4df7dea1d7 100644
--- a/mkspecs/unsupported/integrity-ghs/qplatformdefs.h
+++ b/mkspecs/unsupported/integrity-ghs/qplatformdefs.h
@@ -170,6 +170,10 @@
#define QT_VSNPRINTF ::vsnprintf
#endif
+// INTEGRITY doesn't enable the declaration in _POSIX_SOURCE mode,
+// because strdup() is not part of strict Posix; declare it here
+extern "C" char *strdup(const char *src);
+
#ifndef MAXNAMLEN
# define MAXNAMLEN NAME_MAX
#endif
diff --git a/mkspecs/unsupported/macx-iosdevice-clang-legacy/qmake.conf b/mkspecs/unsupported/macx-iosdevice-clang-legacy/qmake.conf
new file mode 100644
index 0000000000..ff8e0b6aa9
--- /dev/null
+++ b/mkspecs/unsupported/macx-iosdevice-clang-legacy/qmake.conf
@@ -0,0 +1,35 @@
+#
+# qmake configuration for ios-device-clang
+#
+# Depends on:
+#
+# QMAKE_IOS_XCODE_VERSION - set in mkspecs/common/ios/versions.conf
+#
+
+include(../../common/mac.conf)
+include(../../common/gcc-base-ios.conf)
+include(../../common/clang.conf)
+include(../../common/ios.conf)
+include(../../common/ios/versions.conf)
+include(../../common/ios/clang.conf)
+include(../../common/ios/qmake.conf)
+
+# Version check
+!lessThan(QMAKE_IOS_XCODE_VERSION, "4.3"): error("This mkspec requires Xcode 4.2.x or earlier")
+
+# iOS build tools
+QMAKE_CC = /Developer/Platforms/iPhoneOS.platform/Developer/usr/bin/clang
+QMAKE_CXX = /Developer/Platforms/iPhoneOS.platform/Developer/usr/bin/clang++
+QMAKE_FIX_RPATH = /Developer/Platforms/iPhoneOS.platform/Developer/usr/bin/install_name_tool -id
+QMAKE_AR = /Developer/Platforms/iPhoneOS.platform/Developer/usr/bin/ar cq
+QMAKE_RANLIB = /Developer/Platforms/iPhoneOS.platform/Developer/usr/bin/ranlib -s
+QMAKE_LINK = $$QMAKE_CXX
+QMAKE_LINK_SHLIB = $$QMAKE_CXX
+
+# Check that compiler is valid
+!exists($$QMAKE_CXX): error("The version of Xcode installed on this system does not include the clang compiler")
+
+load(qt_config)
+
+# Include after config is loaded to allow autodetection on GL/ES version
+include(../../common/ios/arch.conf)
diff --git a/mkspecs/unsupported/macx-iosdevice-clang-legacy/qplatformdefs.h b/mkspecs/unsupported/macx-iosdevice-clang-legacy/qplatformdefs.h
new file mode 100644
index 0000000000..89621ea21d
--- /dev/null
+++ b/mkspecs/unsupported/macx-iosdevice-clang-legacy/qplatformdefs.h
@@ -0,0 +1,42 @@
+/****************************************************************************
+**
+** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
+**
+** This file is part of the qmake spec of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** This file may be used under the terms of the GNU Lesser General Public
+** License version 2.1 as published by the Free Software Foundation and
+** appearing in the file LICENSE.LGPL included in the packaging of this
+** file. Please review the following information to ensure the GNU Lesser
+** General Public License version 2.1 requirements will be met:
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights. These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU General
+** Public License version 3.0 as published by the Free Software Foundation
+** and appearing in the file LICENSE.GPL included in the packaging of this
+** file. Please review the following information to ensure the GNU General
+** Public License version 3.0 requirements will be met:
+** http://www.gnu.org/copyleft/gpl.html.
+**
+** Other Usage
+** Alternatively, this file may be used in accordance with the terms and
+** conditions contained in a signed written agreement between you and Nokia.
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "../../common/ios/qplatformdefs.h"
diff --git a/mkspecs/unsupported/macx-iosdevice-clang/qmake.conf b/mkspecs/unsupported/macx-iosdevice-clang/qmake.conf
new file mode 100644
index 0000000000..777b5ab6e2
--- /dev/null
+++ b/mkspecs/unsupported/macx-iosdevice-clang/qmake.conf
@@ -0,0 +1,35 @@
+#
+# qmake configuration for ios-device-clang
+#
+# Depends on:
+#
+# QMAKE_IOS_XCODE_VERSION - set in mkspecs/common/ios/versions.conf
+#
+
+include(../../common/mac.conf)
+include(../../common/gcc-base-ios.conf)
+include(../../common/clang.conf)
+include(../../common/ios.conf)
+include(../../common/ios/versions.conf)
+include(../../common/ios/clang.conf)
+include(../../common/ios/qmake.conf)
+
+# Version check
+lessThan(QMAKE_IOS_XCODE_VERSION, "4.3"): error("This mkspec requires Xcode 4.3 or later")
+
+# iOS build tools
+QMAKE_CC = /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang
+QMAKE_CXX = /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang++
+QMAKE_FIX_RPATH = /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/install_name_tool -id
+QMAKE_AR = /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/ar cq
+QMAKE_RANLIB = /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/ranlib -s
+QMAKE_LINK = $$QMAKE_CXX
+QMAKE_LINK_SHLIB = $$QMAKE_CXX
+
+# Check that compiler is valid
+!exists($$QMAKE_CXX): error("The version of Xcode installed on this system does not include the clang compiler")
+
+load(qt_config)
+
+# Include after config is loaded to allow autodetection on GL/ES version
+include(../../common/ios/arch.conf)
diff --git a/mkspecs/unsupported/macx-iosdevice-clang/qplatformdefs.h b/mkspecs/unsupported/macx-iosdevice-clang/qplatformdefs.h
new file mode 100644
index 0000000000..89621ea21d
--- /dev/null
+++ b/mkspecs/unsupported/macx-iosdevice-clang/qplatformdefs.h
@@ -0,0 +1,42 @@
+/****************************************************************************
+**
+** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
+**
+** This file is part of the qmake spec of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** This file may be used under the terms of the GNU Lesser General Public
+** License version 2.1 as published by the Free Software Foundation and
+** appearing in the file LICENSE.LGPL included in the packaging of this
+** file. Please review the following information to ensure the GNU Lesser
+** General Public License version 2.1 requirements will be met:
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights. These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU General
+** Public License version 3.0 as published by the Free Software Foundation
+** and appearing in the file LICENSE.GPL included in the packaging of this
+** file. Please review the following information to ensure the GNU General
+** Public License version 3.0 requirements will be met:
+** http://www.gnu.org/copyleft/gpl.html.
+**
+** Other Usage
+** Alternatively, this file may be used in accordance with the terms and
+** conditions contained in a signed written agreement between you and Nokia.
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "../../common/ios/qplatformdefs.h"
diff --git a/mkspecs/unsupported/macx-iosdevice-g++-legacy/qmake.conf b/mkspecs/unsupported/macx-iosdevice-g++-legacy/qmake.conf
new file mode 100644
index 0000000000..5fcfb4a51d
--- /dev/null
+++ b/mkspecs/unsupported/macx-iosdevice-g++-legacy/qmake.conf
@@ -0,0 +1,35 @@
+#
+# qmake configuration for ios-device-g++
+#
+# Depends on:
+#
+# QMAKE_IOS_XCODE_VERSION - set in mkspecs/common/ios/versions.conf
+#
+
+include(../../common/mac.conf)
+include(../../common/gcc-base-ios.conf)
+include(../../common/g++-macx.conf)
+include(../../common/ios.conf)
+include(../../common/ios/versions.conf)
+include(../../common/ios/g++.conf)
+include(../../common/ios/qmake.conf)
+
+# Version check (g++ was discontinued at version 4.2, but user may have added it themselves)
+!lessThan(QMAKE_IOS_XCODE_VERSION, "4.3"): error("This mkspec requires Xcode 4.2.x or earlier")
+
+# iOS build tools
+QMAKE_CC = /Developer/Platforms/iPhoneOS.platform/Developer/usr/bin/gcc-4.2
+QMAKE_CXX = /Developer/Platforms/iPhoneOS.platform/Developer/usr/bin/g++-4.2
+QMAKE_FIX_RPATH = /Developer/Platforms/iPhoneOS.platform/Developer/usr/bin/install_name_tool -id
+QMAKE_AR = /Developer/Platforms/iPhoneOS.platform/Developer/usr/bin/ar cq
+QMAKE_RANLIB = /Developer/Platforms/iPhoneOS.platform/Developer/usr/bin/ranlib -s
+QMAKE_LINK = $$QMAKE_CXX
+QMAKE_LINK_SHLIB = $$QMAKE_CXX
+
+# Check that compiler is valid
+!exists($$QMAKE_CXX): error("The version of Xcode installed on this system does not include the g++ 4.2 compiler")
+
+load(qt_config)
+
+# Include after config is loaded to allow autodetection on GL/ES version
+include(../../common/ios/arch.conf)
diff --git a/mkspecs/unsupported/macx-iosdevice-g++-legacy/qplatformdefs.h b/mkspecs/unsupported/macx-iosdevice-g++-legacy/qplatformdefs.h
new file mode 100644
index 0000000000..89621ea21d
--- /dev/null
+++ b/mkspecs/unsupported/macx-iosdevice-g++-legacy/qplatformdefs.h
@@ -0,0 +1,42 @@
+/****************************************************************************
+**
+** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
+**
+** This file is part of the qmake spec of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** This file may be used under the terms of the GNU Lesser General Public
+** License version 2.1 as published by the Free Software Foundation and
+** appearing in the file LICENSE.LGPL included in the packaging of this
+** file. Please review the following information to ensure the GNU Lesser
+** General Public License version 2.1 requirements will be met:
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights. These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU General
+** Public License version 3.0 as published by the Free Software Foundation
+** and appearing in the file LICENSE.GPL included in the packaging of this
+** file. Please review the following information to ensure the GNU General
+** Public License version 3.0 requirements will be met:
+** http://www.gnu.org/copyleft/gpl.html.
+**
+** Other Usage
+** Alternatively, this file may be used in accordance with the terms and
+** conditions contained in a signed written agreement between you and Nokia.
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "../../common/ios/qplatformdefs.h"
diff --git a/mkspecs/unsupported/macx-iosdevice-g++/qmake.conf b/mkspecs/unsupported/macx-iosdevice-g++/qmake.conf
new file mode 100644
index 0000000000..2a29335334
--- /dev/null
+++ b/mkspecs/unsupported/macx-iosdevice-g++/qmake.conf
@@ -0,0 +1,35 @@
+#
+# qmake configuration for ios-device-g++
+#
+# Depends on:
+#
+# QMAKE_IOS_XCODE_VERSION - set in mkspecs/common/ios/versions.conf
+#
+
+include(../../common/mac.conf)
+include(../../common/gcc-base-ios.conf)
+include(../../common/g++-macx.conf)
+include(../../common/ios.conf)
+include(../../common/ios/versions.conf)
+include(../../common/ios/g++.conf)
+include(../../common/ios/qmake.conf)
+
+# Version check (g++ was discontinued at version 4.2, but user may have added it themselves)
+lessThan(QMAKE_IOS_XCODE_VERSION, "4.3"): error("This mkspec requires Xcode 4.3 or later")
+
+# iOS build tools
+QMAKE_CC = /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/usr/bin/gcc-4.2
+QMAKE_CXX = /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/usr/bin/g++-4.2
+QMAKE_FIX_RPATH = /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/usr/bin/install_name_tool -id
+QMAKE_AR = /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/usr/bin/ar cq
+QMAKE_RANLIB = /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/usr/bin/ranlib -s
+QMAKE_LINK = $$QMAKE_CXX
+QMAKE_LINK_SHLIB = $$QMAKE_CXX
+
+# Check that compiler is valid
+!exists($$QMAKE_CXX): error("The version of Xcode installed on this system does not include the g++ 4.2 compiler")
+
+load(qt_config)
+
+# Include after config is loaded to allow autodetection on GL/ES version
+include(../../common/ios/arch.conf)
diff --git a/mkspecs/unsupported/macx-iosdevice-g++/qplatformdefs.h b/mkspecs/unsupported/macx-iosdevice-g++/qplatformdefs.h
new file mode 100644
index 0000000000..89621ea21d
--- /dev/null
+++ b/mkspecs/unsupported/macx-iosdevice-g++/qplatformdefs.h
@@ -0,0 +1,42 @@
+/****************************************************************************
+**
+** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
+**
+** This file is part of the qmake spec of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** This file may be used under the terms of the GNU Lesser General Public
+** License version 2.1 as published by the Free Software Foundation and
+** appearing in the file LICENSE.LGPL included in the packaging of this
+** file. Please review the following information to ensure the GNU Lesser
+** General Public License version 2.1 requirements will be met:
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights. These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU General
+** Public License version 3.0 as published by the Free Software Foundation
+** and appearing in the file LICENSE.GPL included in the packaging of this
+** file. Please review the following information to ensure the GNU General
+** Public License version 3.0 requirements will be met:
+** http://www.gnu.org/copyleft/gpl.html.
+**
+** Other Usage
+** Alternatively, this file may be used in accordance with the terms and
+** conditions contained in a signed written agreement between you and Nokia.
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "../../common/ios/qplatformdefs.h"
diff --git a/mkspecs/unsupported/macx-iosdevice-llvm-legacy/qmake.conf b/mkspecs/unsupported/macx-iosdevice-llvm-legacy/qmake.conf
new file mode 100644
index 0000000000..4554843610
--- /dev/null
+++ b/mkspecs/unsupported/macx-iosdevice-llvm-legacy/qmake.conf
@@ -0,0 +1,35 @@
+#
+# qmake configuration for ios-device-llvm
+#
+# Depends on:
+#
+# QMAKE_IOS_XCODE_VERSION - set in mkspecs/common/ios/versions.conf
+#
+
+include(../../common/mac.conf)
+include(../../common/gcc-base-ios.conf)
+include(../../common/llvm.conf)
+include(../../common/ios.conf)
+include(../../common/ios/versions.conf)
+include(../../common/ios/llvm.conf)
+include(../../common/ios/qmake.conf)
+
+# Version check
+!lessThan(QMAKE_IOS_XCODE_VERSION, "4.3"): error("This mkspec requires Xcode 4.2.x or earlier")
+
+# iOS build tools
+QMAKE_CC = /Developer/Platforms/iPhoneOS.platform/Developer/usr/bin/llvm-gcc-4.2
+QMAKE_CXX = /Developer/Platforms/iPhoneOS.platform/Developer/usr/bin/llvm-g++-4.2
+QMAKE_FIX_RPATH = /Developer/Platforms/iPhoneOS.platform/Developer/usr/bin/install_name_tool -id
+QMAKE_AR = /Developer/Platforms/iPhoneOS.platform/Developer/usr/bin/ar cq
+QMAKE_RANLIB = /Developer/Platforms/iPhoneOS.platform/Developer/usr/bin/ranlib -s
+QMAKE_LINK = $$QMAKE_CXX
+QMAKE_LINK_SHLIB = $$QMAKE_CXX
+
+# Check that compiler is valid
+!exists($$QMAKE_CXX): error("The version of Xcode installed on this system does not include the llvm-g++ 4.2 compiler")
+
+load(qt_config)
+
+# Include after config is loaded to allow autodetection on GL/ES version
+include(../../common/ios/arch.conf)
diff --git a/mkspecs/unsupported/macx-iosdevice-llvm-legacy/qplatformdefs.h b/mkspecs/unsupported/macx-iosdevice-llvm-legacy/qplatformdefs.h
new file mode 100644
index 0000000000..89621ea21d
--- /dev/null
+++ b/mkspecs/unsupported/macx-iosdevice-llvm-legacy/qplatformdefs.h
@@ -0,0 +1,42 @@
+/****************************************************************************
+**
+** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
+**
+** This file is part of the qmake spec of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** This file may be used under the terms of the GNU Lesser General Public
+** License version 2.1 as published by the Free Software Foundation and
+** appearing in the file LICENSE.LGPL included in the packaging of this
+** file. Please review the following information to ensure the GNU Lesser
+** General Public License version 2.1 requirements will be met:
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights. These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU General
+** Public License version 3.0 as published by the Free Software Foundation
+** and appearing in the file LICENSE.GPL included in the packaging of this
+** file. Please review the following information to ensure the GNU General
+** Public License version 3.0 requirements will be met:
+** http://www.gnu.org/copyleft/gpl.html.
+**
+** Other Usage
+** Alternatively, this file may be used in accordance with the terms and
+** conditions contained in a signed written agreement between you and Nokia.
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "../../common/ios/qplatformdefs.h"
diff --git a/mkspecs/unsupported/macx-iosdevice-llvm/qmake.conf b/mkspecs/unsupported/macx-iosdevice-llvm/qmake.conf
new file mode 100644
index 0000000000..335c68fd42
--- /dev/null
+++ b/mkspecs/unsupported/macx-iosdevice-llvm/qmake.conf
@@ -0,0 +1,35 @@
+#
+# qmake configuration for ios-device-llvm
+#
+# Depends on:
+#
+# QMAKE_IOS_XCODE_VERSION - set in mkspecs/common/ios/versions.conf
+#
+
+include(../../common/mac.conf)
+include(../../common/gcc-base-ios.conf)
+include(../../common/llvm.conf)
+include(../../common/ios.conf)
+include(../../common/ios/versions.conf)
+include(../../common/ios/llvm.conf)
+include(../../common/ios/qmake.conf)
+
+# Version check
+lessThan(QMAKE_IOS_XCODE_VERSION, "4.3"): error("This mkspec requires Xcode 4.3 or later")
+
+# iOS build tools
+QMAKE_CC = /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/usr/bin/llvm-gcc-4.2
+QMAKE_CXX = /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/usr/bin/llvm-g++-4.2
+QMAKE_FIX_RPATH = /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/usr/bin/install_name_tool -id
+QMAKE_AR = /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/usr/bin/ar cq
+QMAKE_RANLIB = /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/usr/bin/ranlib -s
+QMAKE_LINK = $$QMAKE_CXX
+QMAKE_LINK_SHLIB = $$QMAKE_CXX
+
+# Check that compiler is valid
+!exists($$QMAKE_CXX): error("The version of Xcode installed on this system does not include the llvm-g++ 4.2 compiler")
+
+load(qt_config)
+
+# Include after config is loaded to allow autodetection on GL/ES version
+include(../../common/ios/arch.conf)
diff --git a/mkspecs/unsupported/macx-iosdevice-llvm/qplatformdefs.h b/mkspecs/unsupported/macx-iosdevice-llvm/qplatformdefs.h
new file mode 100644
index 0000000000..89621ea21d
--- /dev/null
+++ b/mkspecs/unsupported/macx-iosdevice-llvm/qplatformdefs.h
@@ -0,0 +1,42 @@
+/****************************************************************************
+**
+** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
+**
+** This file is part of the qmake spec of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** This file may be used under the terms of the GNU Lesser General Public
+** License version 2.1 as published by the Free Software Foundation and
+** appearing in the file LICENSE.LGPL included in the packaging of this
+** file. Please review the following information to ensure the GNU Lesser
+** General Public License version 2.1 requirements will be met:
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights. These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU General
+** Public License version 3.0 as published by the Free Software Foundation
+** and appearing in the file LICENSE.GPL included in the packaging of this
+** file. Please review the following information to ensure the GNU General
+** Public License version 3.0 requirements will be met:
+** http://www.gnu.org/copyleft/gpl.html.
+**
+** Other Usage
+** Alternatively, this file may be used in accordance with the terms and
+** conditions contained in a signed written agreement between you and Nokia.
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "../../common/ios/qplatformdefs.h"
diff --git a/mkspecs/unsupported/macx-iossimulator-clang-legacy/qmake.conf b/mkspecs/unsupported/macx-iossimulator-clang-legacy/qmake.conf
new file mode 100644
index 0000000000..b042766a39
--- /dev/null
+++ b/mkspecs/unsupported/macx-iossimulator-clang-legacy/qmake.conf
@@ -0,0 +1,6 @@
+#
+# qmake configuration for ios-simulator-clang
+#
+
+# All differences between device and simulator are handled in iOS include files
+include(../macx-iosdevice-clang-legacy/qmake.conf)
diff --git a/mkspecs/unsupported/macx-iossimulator-clang-legacy/qplatformdefs.h b/mkspecs/unsupported/macx-iossimulator-clang-legacy/qplatformdefs.h
new file mode 100644
index 0000000000..89621ea21d
--- /dev/null
+++ b/mkspecs/unsupported/macx-iossimulator-clang-legacy/qplatformdefs.h
@@ -0,0 +1,42 @@
+/****************************************************************************
+**
+** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
+**
+** This file is part of the qmake spec of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** This file may be used under the terms of the GNU Lesser General Public
+** License version 2.1 as published by the Free Software Foundation and
+** appearing in the file LICENSE.LGPL included in the packaging of this
+** file. Please review the following information to ensure the GNU Lesser
+** General Public License version 2.1 requirements will be met:
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights. These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU General
+** Public License version 3.0 as published by the Free Software Foundation
+** and appearing in the file LICENSE.GPL included in the packaging of this
+** file. Please review the following information to ensure the GNU General
+** Public License version 3.0 requirements will be met:
+** http://www.gnu.org/copyleft/gpl.html.
+**
+** Other Usage
+** Alternatively, this file may be used in accordance with the terms and
+** conditions contained in a signed written agreement between you and Nokia.
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "../../common/ios/qplatformdefs.h"
diff --git a/mkspecs/unsupported/macx-iossimulator-clang/qmake.conf b/mkspecs/unsupported/macx-iossimulator-clang/qmake.conf
new file mode 100644
index 0000000000..11301cb72f
--- /dev/null
+++ b/mkspecs/unsupported/macx-iossimulator-clang/qmake.conf
@@ -0,0 +1,6 @@
+#
+# qmake configuration for ios-simulator-clang
+#
+
+# All differences between device and simulator are handled in iOS include files
+include(../macx-iosdevice-clang/qmake.conf)
diff --git a/mkspecs/unsupported/macx-iossimulator-clang/qplatformdefs.h b/mkspecs/unsupported/macx-iossimulator-clang/qplatformdefs.h
new file mode 100644
index 0000000000..89621ea21d
--- /dev/null
+++ b/mkspecs/unsupported/macx-iossimulator-clang/qplatformdefs.h
@@ -0,0 +1,42 @@
+/****************************************************************************
+**
+** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
+**
+** This file is part of the qmake spec of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** This file may be used under the terms of the GNU Lesser General Public
+** License version 2.1 as published by the Free Software Foundation and
+** appearing in the file LICENSE.LGPL included in the packaging of this
+** file. Please review the following information to ensure the GNU Lesser
+** General Public License version 2.1 requirements will be met:
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights. These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU General
+** Public License version 3.0 as published by the Free Software Foundation
+** and appearing in the file LICENSE.GPL included in the packaging of this
+** file. Please review the following information to ensure the GNU General
+** Public License version 3.0 requirements will be met:
+** http://www.gnu.org/copyleft/gpl.html.
+**
+** Other Usage
+** Alternatively, this file may be used in accordance with the terms and
+** conditions contained in a signed written agreement between you and Nokia.
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "../../common/ios/qplatformdefs.h"
diff --git a/mkspecs/unsupported/macx-iossimulator-g++-legacy/qmake.conf b/mkspecs/unsupported/macx-iossimulator-g++-legacy/qmake.conf
new file mode 100644
index 0000000000..abc695231e
--- /dev/null
+++ b/mkspecs/unsupported/macx-iossimulator-g++-legacy/qmake.conf
@@ -0,0 +1,33 @@
+#
+# qmake configuration for ios-simulator-g++
+#
+# Depends on:
+#
+# QMAKE_IOS_XCODE_VERSION - set in mkspecs/common/ios/versions.conf
+#
+
+include(../../common/mac.conf)
+include(../../common/gcc-base-ios.conf)
+include(../../common/g++-macx.conf)
+include(../../common/ios.conf)
+include(../../common/ios/versions.conf)
+include(../../common/ios/arch.conf)
+include(../../common/ios/g++.conf)
+include(../../common/ios/qmake.conf)
+
+# Version check (g++ was discontinued at version 4.2)
+!lessThan(QMAKE_IOS_XCODE_VERSION, "4.2"): error("This mkspec requires Xcode 4.1.x or earlier")
+
+# iOS build tools
+QMAKE_CC = /Developer/Platforms/iPhoneSimulator.platform/Developer/usr/bin/gcc-4.2
+QMAKE_CXX = /Developer/Platforms/iPhoneSimulator.platform/Developer/usr/bin/g++-4.2
+QMAKE_FIX_RPATH = /Developer/Platforms/iPhoneSimulator.platform/Developer/usr/bin/install_name_tool -id
+QMAKE_AR = /Developer/Platforms/iPhoneSimulator.platform/Developer/usr/bin/ar cq
+QMAKE_RANLIB = /Developer/Platforms/iPhoneSimulator.platform/Developer/usr/bin/ranlib -s
+QMAKE_LINK = $$QMAKE_CXX
+QMAKE_LINK_SHLIB = $$QMAKE_CXX
+
+# Check that compiler is valid
+!exists($$QMAKE_CXX): error("The version of Xcode installed on this system does not include the g++ 4.2 compiler")
+
+load(qt_config)
diff --git a/mkspecs/unsupported/macx-iossimulator-g++-legacy/qplatformdefs.h b/mkspecs/unsupported/macx-iossimulator-g++-legacy/qplatformdefs.h
new file mode 100644
index 0000000000..89621ea21d
--- /dev/null
+++ b/mkspecs/unsupported/macx-iossimulator-g++-legacy/qplatformdefs.h
@@ -0,0 +1,42 @@
+/****************************************************************************
+**
+** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
+**
+** This file is part of the qmake spec of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** This file may be used under the terms of the GNU Lesser General Public
+** License version 2.1 as published by the Free Software Foundation and
+** appearing in the file LICENSE.LGPL included in the packaging of this
+** file. Please review the following information to ensure the GNU Lesser
+** General Public License version 2.1 requirements will be met:
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights. These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU General
+** Public License version 3.0 as published by the Free Software Foundation
+** and appearing in the file LICENSE.GPL included in the packaging of this
+** file. Please review the following information to ensure the GNU General
+** Public License version 3.0 requirements will be met:
+** http://www.gnu.org/copyleft/gpl.html.
+**
+** Other Usage
+** Alternatively, this file may be used in accordance with the terms and
+** conditions contained in a signed written agreement between you and Nokia.
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "../../common/ios/qplatformdefs.h"
diff --git a/mkspecs/unsupported/macx-iossimulator-g++/qmake.conf b/mkspecs/unsupported/macx-iossimulator-g++/qmake.conf
new file mode 100644
index 0000000000..99848be410
--- /dev/null
+++ b/mkspecs/unsupported/macx-iossimulator-g++/qmake.conf
@@ -0,0 +1,33 @@
+#
+# qmake configuration for ios-simulator-g++
+#
+# Depends on:
+#
+# QMAKE_IOS_XCODE_VERSION - set in mkspecs/common/ios/versions.conf
+#
+
+include(../../common/mac.conf)
+include(../../common/gcc-base-ios.conf)
+include(../../common/g++-macx.conf)
+include(../../common/ios.conf)
+include(../../common/ios/versions.conf)
+include(../../common/ios/arch.conf)
+include(../../common/ios/g++.conf)
+include(../../common/ios/qmake.conf)
+
+# Version check (g++ was discontinued at version 4.2, but user may have added it themselves)
+lessThan(QMAKE_IOS_XCODE_VERSION, "4.3"): error("This mkspec requires Xcode 4.3 or later")
+
+# iOS build tools
+QMAKE_CC = /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/usr/bin/gcc-4.2
+QMAKE_CXX = /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/usr/bin/g++-4.2
+QMAKE_FIX_RPATH = /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/usr/bin/install_name_tool -id
+QMAKE_AR = /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/usr/bin/ar cq
+QMAKE_RANLIB = /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/usr/bin/ranlib -s
+QMAKE_LINK = $$QMAKE_CXX
+QMAKE_LINK_SHLIB = $$QMAKE_CXX
+
+# Check that compiler is valid
+!exists($$QMAKE_CXX): error("The version of Xcode installed on this system does not include the g++ 4.2 compiler")
+
+load(qt_config)
diff --git a/mkspecs/unsupported/macx-iossimulator-g++/qplatformdefs.h b/mkspecs/unsupported/macx-iossimulator-g++/qplatformdefs.h
new file mode 100644
index 0000000000..89621ea21d
--- /dev/null
+++ b/mkspecs/unsupported/macx-iossimulator-g++/qplatformdefs.h
@@ -0,0 +1,42 @@
+/****************************************************************************
+**
+** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
+**
+** This file is part of the qmake spec of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** This file may be used under the terms of the GNU Lesser General Public
+** License version 2.1 as published by the Free Software Foundation and
+** appearing in the file LICENSE.LGPL included in the packaging of this
+** file. Please review the following information to ensure the GNU Lesser
+** General Public License version 2.1 requirements will be met:
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights. These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU General
+** Public License version 3.0 as published by the Free Software Foundation
+** and appearing in the file LICENSE.GPL included in the packaging of this
+** file. Please review the following information to ensure the GNU General
+** Public License version 3.0 requirements will be met:
+** http://www.gnu.org/copyleft/gpl.html.
+**
+** Other Usage
+** Alternatively, this file may be used in accordance with the terms and
+** conditions contained in a signed written agreement between you and Nokia.
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "../../common/ios/qplatformdefs.h"
diff --git a/mkspecs/unsupported/macx-iossimulator-llvm-legacy/qmake.conf b/mkspecs/unsupported/macx-iossimulator-llvm-legacy/qmake.conf
new file mode 100644
index 0000000000..95d530cc18
--- /dev/null
+++ b/mkspecs/unsupported/macx-iossimulator-llvm-legacy/qmake.conf
@@ -0,0 +1,33 @@
+#
+# qmake configuration for ios-simulator-llvm
+#
+# Depends on:
+#
+# QMAKE_IOS_XCODE_VERSION - set in mkspecs/common/ios/versions.conf
+#
+
+include(../../common/mac.conf)
+include(../../common/gcc-base-ios.conf)
+include(../../common/llvm.conf)
+include(../../common/ios.conf)
+include(../../common/ios/versions.conf)
+include(../../common/ios/arch.conf)
+include(../../common/ios/llvm.conf)
+include(../../common/ios/qmake.conf)
+
+# Version check
+!lessThan(QMAKE_IOS_XCODE_VERSION, "4.3"): error("This mkspec requires Xcode 4.2.x or earlier")
+
+# iOS build tools
+QMAKE_CC = /Developer/Platforms/iPhoneSimulator.platform/Developer/usr/bin/llvm-gcc-4.2
+QMAKE_CXX = /Developer/Platforms/iPhoneSimulator.platform/Developer/usr/bin/llvm-g++-4.2
+QMAKE_FIX_RPATH = /Developer/Platforms/iPhoneSimulator.platform/Developer/usr/bin/install_name_tool -id
+QMAKE_AR = /Developer/Platforms/iPhoneSimulator.platform/Developer/usr/bin/ar cq
+QMAKE_RANLIB = /Developer/Platforms/iPhoneSimulator.platform/Developer/usr/bin/ranlib -s
+QMAKE_LINK = $$QMAKE_CXX
+QMAKE_LINK_SHLIB = $$QMAKE_CXX
+
+# Check that compiler is valid
+!exists($$QMAKE_CXX): error("The version of Xcode installed on this system does not include the llvm-g++ 4.2 compiler")
+
+load(qt_config)
diff --git a/mkspecs/unsupported/macx-iossimulator-llvm-legacy/qplatformdefs.h b/mkspecs/unsupported/macx-iossimulator-llvm-legacy/qplatformdefs.h
new file mode 100644
index 0000000000..89621ea21d
--- /dev/null
+++ b/mkspecs/unsupported/macx-iossimulator-llvm-legacy/qplatformdefs.h
@@ -0,0 +1,42 @@
+/****************************************************************************
+**
+** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
+**
+** This file is part of the qmake spec of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** This file may be used under the terms of the GNU Lesser General Public
+** License version 2.1 as published by the Free Software Foundation and
+** appearing in the file LICENSE.LGPL included in the packaging of this
+** file. Please review the following information to ensure the GNU Lesser
+** General Public License version 2.1 requirements will be met:
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights. These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU General
+** Public License version 3.0 as published by the Free Software Foundation
+** and appearing in the file LICENSE.GPL included in the packaging of this
+** file. Please review the following information to ensure the GNU General
+** Public License version 3.0 requirements will be met:
+** http://www.gnu.org/copyleft/gpl.html.
+**
+** Other Usage
+** Alternatively, this file may be used in accordance with the terms and
+** conditions contained in a signed written agreement between you and Nokia.
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "../../common/ios/qplatformdefs.h"
diff --git a/mkspecs/unsupported/macx-iossimulator-llvm/qmake.conf b/mkspecs/unsupported/macx-iossimulator-llvm/qmake.conf
new file mode 100644
index 0000000000..7e3d4b5710
--- /dev/null
+++ b/mkspecs/unsupported/macx-iossimulator-llvm/qmake.conf
@@ -0,0 +1,33 @@
+#
+# qmake configuration for ios-simulator-llvm
+#
+# Depends on:
+#
+# QMAKE_IOS_XCODE_VERSION - set in mkspecs/common/ios/versions.conf
+#
+
+include(../../common/mac.conf)
+include(../../common/gcc-base-ios.conf)
+include(../../common/llvm.conf)
+include(../../common/ios.conf)
+include(../../common/ios/versions.conf)
+include(../../common/ios/arch.conf)
+include(../../common/ios/llvm.conf)
+include(../../common/ios/qmake.conf)
+
+# Version check
+lessThan(QMAKE_IOS_XCODE_VERSION, "4.3"): error("This mkspec requires Xcode 4.3 or later")
+
+# iOS build tools
+QMAKE_CC = /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/usr/bin/llvm-gcc-4.2
+QMAKE_CXX = /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/usr/bin/llvm-g++-4.2
+QMAKE_FIX_RPATH = /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/usr/bin/install_name_tool -id
+QMAKE_AR = /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/usr/bin/ar cq
+QMAKE_RANLIB = /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/usr/bin/ranlib -s
+QMAKE_LINK = $$QMAKE_CXX
+QMAKE_LINK_SHLIB = $$QMAKE_CXX
+
+# Check that compiler is valid
+!exists($$QMAKE_CXX): error("The version of Xcode installed on this system does not include the llvm-g++ 4.2 compiler")
+
+load(qt_config)
diff --git a/mkspecs/unsupported/macx-iossimulator-llvm/qplatformdefs.h b/mkspecs/unsupported/macx-iossimulator-llvm/qplatformdefs.h
new file mode 100644
index 0000000000..89621ea21d
--- /dev/null
+++ b/mkspecs/unsupported/macx-iossimulator-llvm/qplatformdefs.h
@@ -0,0 +1,42 @@
+/****************************************************************************
+**
+** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
+**
+** This file is part of the qmake spec of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** This file may be used under the terms of the GNU Lesser General Public
+** License version 2.1 as published by the Free Software Foundation and
+** appearing in the file LICENSE.LGPL included in the packaging of this
+** file. Please review the following information to ensure the GNU Lesser
+** General Public License version 2.1 requirements will be met:
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights. These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU General
+** Public License version 3.0 as published by the Free Software Foundation
+** and appearing in the file LICENSE.GPL included in the packaging of this
+** file. Please review the following information to ensure the GNU General
+** Public License version 3.0 requirements will be met:
+** http://www.gnu.org/copyleft/gpl.html.
+**
+** Other Usage
+** Alternatively, this file may be used in accordance with the terms and
+** conditions contained in a signed written agreement between you and Nokia.
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "../../common/ios/qplatformdefs.h"
diff --git a/mkspecs/unsupported/qnx-armv7le-qcc/qmake.conf b/mkspecs/unsupported/qnx-armv7le-qcc/qmake.conf
index ac6da27061..37c66cd178 100644
--- a/mkspecs/unsupported/qnx-armv7le-qcc/qmake.conf
+++ b/mkspecs/unsupported/qnx-armv7le-qcc/qmake.conf
@@ -2,24 +2,6 @@
# qmake configuration for qnx-qcc armv7 targets
#
-MAKEFILE_GENERATOR = UNIX
-TARGET_PLATFORM = unix
-TEMPLATE = app
-CONFIG += qt warn_on release link_prl
-QT += core gui
+include(../../common/qcc-base-qnx-armv7le.conf)
-include(../../common/g++-unix.conf)
-include(../../common/unix.conf)
-
-QMAKE_CC = qcc -Vgcc_ntoarmv7le
-QNX_CPUDIR = armle-v7
-
-include(../../common/qcc-base-qnx.conf)
-
-QMAKE_AR = ntoarmv7-ar cqs
-QMAKE_OBJCOPY = ntoarmv7-objcopy
-QMAKE_RANLIB = ntoarmv7-ranlib
-
-QMAKE_STRIP = ntoarmv7-strip
-
-load(qt_config)
+DEFINES += QT_NO_CLIPBOARD
diff --git a/mkspecs/unsupported/qnx-x86-qcc/qmake.conf b/mkspecs/unsupported/qnx-x86-qcc/qmake.conf
index fef8d443c1..cf588bae1c 100644
--- a/mkspecs/unsupported/qnx-x86-qcc/qmake.conf
+++ b/mkspecs/unsupported/qnx-x86-qcc/qmake.conf
@@ -2,24 +2,6 @@
# qmake configuration for qnx-qcc x86 targets
#
-MAKEFILE_GENERATOR = UNIX
-TARGET_PLATFORM = unix
-TEMPLATE = app
-CONFIG += qt warn_on release link_prl
-QT += core gui
+include(../../common/qcc-base-qnx-x86.conf)
-include(../../common/g++-unix.conf)
-include(../../common/unix.conf)
-
-QMAKE_CC = qcc -Vgcc_ntox86
-QNX_CPUDIR = x86
-
-include(../../common/qcc-base-qnx.conf)
-
-QMAKE_AR = ntox86-ar cqs
-QMAKE_OBJCOPY = ntox86-objcopy
-QMAKE_RANLIB = ntox86-ranlib
-
-QMAKE_STRIP = ntox86-strip
-
-load(qt_config)
+DEFINES += QT_NO_CLIPBOARD
diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp
index 1904b8f6c6..d37089ee35 100644
--- a/qmake/generators/makefile.cpp
+++ b/qmake/generators/makefile.cpp
@@ -3251,7 +3251,8 @@ MakefileGenerator::writePkgConfigFile()
} else {
pkgConfiglibDir = "-L${libdir}";
pkgConfiglibName = "-l" + lname.left(lname.length()-Option::libtool_ext.length());
- pkgConfiglibName += project->first("TARGET_VERSION_EXT");
+ if (project->isActiveConfig("shared"))
+ pkgConfiglibName += project->first("TARGET_VERSION_EXT");
}
t << pkgConfiglibDir << " " << pkgConfiglibName << " " << endl;
diff --git a/qmake/generators/win32/msbuild_objectmodel.cpp b/qmake/generators/win32/msbuild_objectmodel.cpp
index 3410c296ce..235e7ff634 100644
--- a/qmake/generators/win32/msbuild_objectmodel.cpp
+++ b/qmake/generators/win32/msbuild_objectmodel.cpp
@@ -660,6 +660,13 @@ void VCXProjectWriter::write(XmlOutput &xml, VCProject &tool)
<< valueTagT(ts);
}
+ const triState generateManifest = tool.SingleProjects.at(i).Configuration.linker.GenerateManifest;
+ if (generateManifest != unset) {
+ xml << tag("GenerateManifest")
+ << attrTag("Condition", QString("'$(Configuration)|$(Platform)'=='%1'").arg(tool.SingleProjects.at(i).Configuration.Name))
+ << valueTagT(generateManifest);
+ }
+
if ( tool.SingleProjects.at(i).Configuration.preBuild.ExcludedFromBuild != unset )
{
xml << tag("PreBuildEventUseInBuild")
diff --git a/qmake/generators/win32/msvc_objectmodel.cpp b/qmake/generators/win32/msvc_objectmodel.cpp
index e0f55a64c9..b474dac7a5 100644
--- a/qmake/generators/win32/msvc_objectmodel.cpp
+++ b/qmake/generators/win32/msvc_objectmodel.cpp
@@ -2185,7 +2185,6 @@ bool VCFilter::addExtraCompiler(const VCFilterFile &info)
QString tmp_cmd_name = Project->project->variables()[extraCompilerName + ".name"].join(" ");
QStringList tmp_dep = Project->project->variables()[extraCompilerName + ".depends"];
QString tmp_dep_cmd = Project->project->variables()[extraCompilerName + ".depend_command"].join(" ");
- QStringList vars = Project->project->variables()[extraCompilerName + ".variables"];
QStringList configs = Project->project->variables()[extraCompilerName + ".CONFIG"];
bool combined = configs.indexOf("combine") != -1;
diff --git a/qmake/generators/win32/msvc_vcproj.cpp b/qmake/generators/win32/msvc_vcproj.cpp
index c2482b58a8..951784ec28 100644
--- a/qmake/generators/win32/msvc_vcproj.cpp
+++ b/qmake/generators/win32/msvc_vcproj.cpp
@@ -476,10 +476,13 @@ void VcprojGenerator::writeSubDirs(QTextStream &t)
// and to be able to extract all the dependencies
Option::QMAKE_MODE old_mode = Option::qmake_mode;
Option::qmake_mode = Option::QMAKE_GENERATE_NOTHING;
+ QString old_output_dir = Option::output_dir;
+ Option::output_dir = QFileInfo(fileFixify(dir, qmake_getpwd(), Option::output_dir)).canonicalFilePath();
VcprojGenerator tmp_vcproj;
tmp_vcproj.setNoIO(true);
tmp_vcproj.setProjectFile(&tmp_proj);
Option::qmake_mode = old_mode;
+ Option::output_dir = old_output_dir;
if(Option::debug_level) {
debug_msg(1, "Dumping all variables:");
QHash<QString, QStringList> &vars = tmp_proj.variables();
diff --git a/qmake/generators/win32/winmakefile.cpp b/qmake/generators/win32/winmakefile.cpp
index 9d983ffc66..895c331b21 100644
--- a/qmake/generators/win32/winmakefile.cpp
+++ b/qmake/generators/win32/winmakefile.cpp
@@ -420,6 +420,8 @@ void Win32MakefileGenerator::processRcFileVar()
productName = project->values("TARGET").first();
QString originalName = project->values("TARGET").first() + project->values("TARGET_EXT").first();
+ int rcLang = project->intValue("RC_LANG", 1033); // default: English(USA)
+ int rcCodePage = project->intValue("RC_CODEPAGE", 1200); // default: Unicode
ts << "# if defined(UNDER_CE)" << endl;
ts << "# include <winbase.h>" << endl;
@@ -445,7 +447,9 @@ void Win32MakefileGenerator::processRcFileVar()
ts << "\tBEGIN" << endl;
ts << "\t\tBLOCK \"StringFileInfo\"" << endl;
ts << "\t\tBEGIN" << endl;
- ts << "\t\t\tBLOCK \"040904B0\"" << endl;
+ ts << "\t\t\tBLOCK \""
+ << QString("%1%2").arg(rcLang, 4, 16, QLatin1Char('0')).arg(rcCodePage, 4, 16, QLatin1Char('0'))
+ << "\"" << endl;
ts << "\t\t\tBEGIN" << endl;
ts << "\t\t\t\tVALUE \"CompanyName\", \"" << companyName << "\\0\"" << endl;
ts << "\t\t\t\tVALUE \"FileDescription\", \"" << description << "\\0\"" << endl;
@@ -457,6 +461,12 @@ void Win32MakefileGenerator::processRcFileVar()
ts << "\t\tEND" << endl;
ts << "\t\tBLOCK \"VarFileInfo\"" << endl;
ts << "\t\tBEGIN" << endl;
+ ts << "\t\t\tVALUE \"Translation\", "
+ << QString("0x%1").arg(rcLang, 4, 16, QLatin1Char('0'))
+ << ", " << QString("%1").arg(rcCodePage, 4) << endl;
+ ts << "\t\tEND" << endl;
+ ts << "\t\tBLOCK \"VarFileInfo\"" << endl;
+ ts << "\t\tBEGIN" << endl;
ts << "\t\t\tVALUE \"Translation\", 0x409, 1200" << endl;
ts << "\t\tEND" << endl;
ts << "\tEND" << endl;
diff --git a/qmake/project.cpp b/qmake/project.cpp
index c491e9b1b7..9716237f90 100644
--- a/qmake/project.cpp
+++ b/qmake/project.cpp
@@ -2085,7 +2085,7 @@ QMakeProject::doProjectExpand(QString func, QList<QStringList> args_list,
dirs.append("");
}
- const QRegExp regex(r, Qt::CaseSensitive, QRegExp::Wildcard);
+ QRegExp regex(r, Qt::CaseSensitive, QRegExp::Wildcard);
for(int d = 0; d < dirs.count(); d++) {
QString dir = dirs[d];
if (!dir.isEmpty() && !dir.endsWith(QLatin1Char('/')))
diff --git a/qmake/project.h b/qmake/project.h
index 979f1480bd..ccdc1b63f1 100644
--- a/qmake/project.h
+++ b/qmake/project.h
@@ -156,6 +156,7 @@ public:
bool isEmpty(const QString &v); // With compat mapping, but no magic variables
QStringList &values(const QString &v); // With compat mapping and magic variables
QString first(const QString &v); // ditto
+ int intValue(const QString &v, int defaultValue = 0); // ditto
QHash<QString, QStringList> &variables(); // No compat mapping and magic, obviously
bool isRecursive() const { return recursive; }
@@ -189,6 +190,18 @@ inline QString QMakeProject::first(const QString &v)
return vals.first();
}
+inline int QMakeProject::intValue(const QString &v, int defaultValue)
+{
+ const QString str = first(v);
+ if (!str.isEmpty()) {
+ bool ok;
+ int i = str.toInt(&ok);
+ if (ok)
+ return i;
+ }
+ return defaultValue;
+}
+
inline QHash<QString, QStringList> &QMakeProject::variables()
{ return vars; }
diff --git a/src/3rdparty/harfbuzz/src/harfbuzz-shaper.cpp b/src/3rdparty/harfbuzz/src/harfbuzz-shaper.cpp
index e630ec3808..f6900325bc 100644
--- a/src/3rdparty/harfbuzz/src/harfbuzz-shaper.cpp
+++ b/src/3rdparty/harfbuzz/src/harfbuzz-shaper.cpp
@@ -1302,52 +1302,30 @@ HB_Bool HB_OpenTypePosition(HB_ShaperItem *item, int availableGlyphs, HB_Bool do
glyphs[i] = face->buffer->in_string[i].gindex;
attributes[i] = face->tmpAttributes[face->buffer->in_string[i].cluster];
if (i && face->buffer->in_string[i].cluster == face->buffer->in_string[i-1].cluster)
- attributes[i].clusterStart = false; //FIXME - Shouldn't we otherwise set this to true, rather than leaving it?
+ attributes[i].clusterStart = false;
}
item->num_glyphs = face->buffer->in_length;
if (doLogClusters && face->glyphs_substituted) {
// we can't do this for indic, as we pass the stuf in syllables and it's easier to do it in the shaper.
- // #### the reconstruction of the logclusters currently does not work if the original string
- // contains surrogate pairs
-
unsigned short *logClusters = item->log_clusters;
int clusterStart = 0;
- int oldIntermediateIndex = 0;
-
- // This code makes a mapping, logClusters, between the original utf16 string (item->string) and the final
- // set of glyphs (in_string).
- //
- // The code sets the value of logClusters[i] to the index of in_string containing the glyph that will render
- // item->string[i].
- //
- // This is complicated slightly because in_string[i].cluster is an index to an intermediate
- // array of glyphs - the array that we were passed as the original value of item->glyphs.
- // To map from the original string to the intermediate array of glyphs we have tmpLogClusters.
- //
- // So we have three groups of indexes:
- //
- // i,clusterStart = index to in_length, the final set of glyphs. Also an index to attributes
- // intermediateIndex = index to the glyphs originally passed in.
- // stringIndex = index to item->string, the original string.
-
- int stringIndex = 0;
- // Iterate over the final set of glyphs...
+ int oldCi = 0;
+ // #### the reconstruction of the logclusters currently does not work if the original string
+ // contains surrogate pairs
for (unsigned int i = 0; i < face->buffer->in_length; ++i) {
- // Get the index into the intermediate string for the start of the cluster of chars
- int intermediateIndex = face->buffer->in_string[i].cluster;
- if (intermediateIndex != oldIntermediateIndex) {
- // We have found the end of the cluster of chars in the intermediate string
- while (face->tmpLogClusters[stringIndex] < intermediateIndex) {
- logClusters[stringIndex++] = clusterStart;
- }
+ int ci = face->buffer->in_string[i].cluster;
+ // DEBUG(" ci[%d] = %d mark=%d, cmb=%d, cs=%d",
+ // i, ci, glyphAttributes[i].mark, glyphAttributes[i].combiningClass, glyphAttributes[i].clusterStart);
+ if (!attributes[i].mark && attributes[i].clusterStart && ci != oldCi) {
+ for (int j = oldCi; j < ci; j++)
+ logClusters[j] = clusterStart;
clusterStart = i;
- oldIntermediateIndex = intermediateIndex;
+ oldCi = ci;
}
}
- while (stringIndex < face->length) {
- logClusters[stringIndex++] = clusterStart;
- }
+ for (int j = oldCi; j < face->length; j++)
+ logClusters[j] = clusterStart;
}
// calulate the advances for the shaped glyphs
diff --git a/src/3rdparty/libjpeg/jinclude.h b/src/3rdparty/libjpeg/jinclude.h
index a61939daaa..464b84d6d3 100644
--- a/src/3rdparty/libjpeg/jinclude.h
+++ b/src/3rdparty/libjpeg/jinclude.h
@@ -20,7 +20,7 @@
#include "jconfig.h" /* auto configuration options */
#define JCONFIG_INCLUDED /* so that jpeglib.h doesn't do it again */
-#ifdef _MSC_VER
+#if defined(_MSC_VER) && !defined (_CRT_SECURE_NO_DEPRECATE)
# define _CRT_SECURE_NO_DEPRECATE
#endif
diff --git a/src/3rdparty/libpng/ANNOUNCE b/src/3rdparty/libpng/ANNOUNCE
index 4a3b01888c..dbc2ed1730 100644
--- a/src/3rdparty/libpng/ANNOUNCE
+++ b/src/3rdparty/libpng/ANNOUNCE
@@ -1,5 +1,5 @@
-Libpng 1.5.1 - February 3, 2011
+Libpng 1.5.10 - March 29, 2012
This is a public release of libpng, intended for use in production codes.
@@ -8,89 +8,57 @@ Files available for download:
Source files with LF line endings (for Unix/Linux) and with a
"configure" script
- libpng-1.5.1.tar.xz (LZMA-compressed, recommended)
- libpng-1.5.1.tar.gz
- libpng-1.5.1.tar.bz2
+ libpng-1.5.10.tar.xz (LZMA-compressed, recommended)
+ libpng-1.5.10.tar.gz
+ libpng-1.5.10.tar.bz2
Source files with CRLF line endings (for Windows), without the
"configure" script
- lpng151.7z (LZMA-compressed, recommended)
- lpng151.zip
+ lpng1510.7z (LZMA-compressed, recommended)
+ lpng1510.zip
Other information:
- libpng-1.5.1-README.txt
- libpng-1.5.1-LICENSE.txt
+ libpng-1.5.10-README.txt
+ libpng-1.5.10-LICENSE.txt
-Changes since the last public release (1.5.0):
+Changes since the last public release (1.5.9):
- Added description of png_set_crc_action() to the manual.
- Added a note in the manual that the type of the iCCP profile was changed
- from png_charpp to png_bytepp in png_get_iCCP(). Similarly,
- it was changed from png_charpp to png_const_bytepp in png_set_iCCP().
- Ensure that png_rgb_to_gray ignores palette mapped images, if libpng
- internally happens to call it with one.
- Fixed the failure to handle palette mapped images correctly.
- Fixed a bug in handling of interlaced images (bero at arklinux.org).
- Updated CMakeLists.txt (Clifford Yapp)
- Fixed typecasting of some png_debug() statements (Cosmin)
- Updated documentation of png_set|get_tRNS() (Thomas Klausner).
- Mentioned in the documentation that applications must #include "zlib.h"
- if they need access to anything in zlib.h, and that a number of
- macros such as png_memset() are no longer accessible by applications.
- Corrected pngvalid gamma test "sample" function to access all of the color
- samples of each pixel, instead of sampling the red channel three times.
- Changed variable names index, div, exp, and gamma to char_index, divisor,
- exp_b10, and gamma_val, respectively, to avoid "shadow" warnings.
- Prevent png_push_crc_skip() from hanging while reading an unknown chunk
- or an over-large compressed zTXt chunk with the progressive reader.
- Eliminated more GCC "shadow" warnings.
- Revised png_fixed() in png.c to avoid compiler warning about reaching the
- end without returning anything.
- In the manual, describe the png_get_IHDR() arguments in the correct order.
- Added const_png_structp and const_png_infop types, and used them in
- prototypes for most png_get_*() functions.
- Added png_get_io_chunk_type() and deprecated png_get_io_chunk_name()
- Added synopses for the IO_STATE functions and other missing synopses
- to the manual. Removed the synopses from libpngpf.3 because they
- were out of date and no longer useful. Better information can be
- obtained by reading the prototypes and comments in pngpriv.h
- Attempted to fix cpp on Solaris with S. Studio 12 cc, fix build
- Added a make macro DFNCPP that is a CPP that will accept the tokens in
- a .dfn file and adds configure stuff to test for such a CPP. ./configure
- should fail if one is not available.
- Corrected const_png_ in png.h to png_const_ to avoid polluting the namespace.
- Added png_get_current_row_number and png_get_current_pass_number for the
- benefit of the user transform callback.
- Added png_process_data_pause and png_process_data_skip for the benefit of
- progressive readers that need to stop data processing or want to optimize
- skipping of unread data (e.g. if the reader marks a chunk to be skipped.)
- Enhanced pngvalid, corrected an error in gray_to_rgb, corrected doc error.
- pngvalid contains tests of transforms, which tests are currently disabled
- because they are incompletely tested. gray_to_rgb was failing to expand
- the bit depth for smaller bit depth images; this seems to be a long
- standing error and resulted, apparently, in invalid output. The
- documentation did not accurately describe what libpng really does when
- converting RGB to gray.
- Fixed incorrect examples of callback prototypes in the manual, that were
- introduced in libpng-1.0.0.
- In addition the order of the png_get_uint macros with respect to the
- relevant function definitions has been reversed. This helps the
- preprocessing of the symbol files be more robust. Furthermore, the
- symbol file preprocessing now uses -DPNG_NO_USE_READ_MACROS even when
- the library may actually be built with PNG_USE_READ_MACROS; this stops
- the read macros interfering with the symbol file format.
- Made the manual, synopses, and function prototypes use the function
- argument names file_gamma, int_file_gamma, and srgb_intent consistently.
- Changed PNG_UNUSED from "param=param;" to "(void)param;".
- Added transform tests to pngvalid and simplified the arguments.
- Added a request in the manual that applications do not use "png_" or
- "PNG_" to begin any of their own symbols.
+ Removed two useless #ifdef directives from pngread.c and one from pngrutil.c
+ Always put the CMAKE_LIBRARY in "lib" (removed special WIN32 case).
+ Removed empty vstudio/pngstest directory (Clifford Yapp).
+ Eliminated redundant png_push_read_tEXt|zTXt|iTXt|unknown code from
+ pngpread.c and use the sequential png_handle_tEXt, etc., in pngrutil.c;
+ now that png_ptr->buffer is inaccessible to applications, the special
+ handling is no longer useful.
+ Fixed bug with png_handle_hIST with odd chunk length (Frank Busse).
+ Added PNG_SAFE_LIMITS feature to pnglibconf.dfa and code in pngconf.h
+ to reset the user limits to safe ones if PNG_SAFE_LIMITS is defined.
+ To enable, use "CPPFLAGS=-DPNG_SAFE_LIMITS_SUPPORTED" on the configure
+ command or put "#define PNG_SAFE_LIMITS_SUPPORTED" in pnglibconf.h.
+ Revised the SAFE_LIMITS feature to be the same as the feature in libpng16.
+ Added information about the new limits in the manual.
+ Updated Makefile.in
+ Removed unused "current_text" members of png_struct and the png_free()
+ of png_ptr->current_text from pngread.c
+ Fixed PNG_LIBPNG_BUILD_BASE_TYPE definition.
+ Fixed CMF optimization of non-IDAT compressed chunks, which was added at
+ libpng-1.5.4. It sometimes produced too small of a window.
+ Reject all iCCP chunks after the first, even if the first one is invalid.
+ Added palette-index checking. Issue a png_benign_error() if an invalid
+ index is found.
+ Revised example.c to put text strings in a temporary character array
+ instead of directly assigning string constants to png_textp members.
+ This avoids compiler warnings when -Wwrite-strings is enabled.
+ Prevent PNG_EXPAND+PNG_SHIFT doing the shift twice.
+ Revised png_set_text_2() to avoid potential memory corruption (fixes
+ CVE-2011-3048).
Send comments/corrections/commendations to png-mng-implement at lists.sf.net
(subscription required; visit
https://lists.sourceforge.net/lists/listinfo/png-mng-implement
-to subscribe) or to glennrp at users.sourceforge.net
+to subscribe)
+or to glennrp at users.sourceforge.net
Glenn R-P
diff --git a/src/3rdparty/libpng/CHANGES b/src/3rdparty/libpng/CHANGES
index fa5f2aae79..70af8273e7 100644
--- a/src/3rdparty/libpng/CHANGES
+++ b/src/3rdparty/libpng/CHANGES
@@ -1,5 +1,4 @@
#if 0
-libpng_changes(){ /*
CHANGES - changes for libpng
Version 0.2
@@ -15,7 +14,7 @@ Version 0.3
fixed some bugs in writer
interfaced with zlib 0.5
added K&R support
- added check for 64 KB blocks for 16 bit machines
+ added check for 64 KB blocks for 16-bit machines
Version 0.4
cleaned up code and commented code
@@ -74,7 +73,7 @@ Version 0.82 [September, 1995]
Version 0.85 [December, 1995]
added more medium model code (almost everything's a far)
added i/o, error, and memory callback functions
- fixed some bugs (16 bit, 4 bit interlaced, etc.)
+ fixed some bugs (16-bit, 4-bit interlaced, etc.)
added first run progressive reader (barely tested)
Version 0.86 [January, 1996]
@@ -180,7 +179,7 @@ Version 0.96 [May, 1997]
Fixed serious bug with < 8bpp images introduced in 0.95
Fixed 256-color transparency bug (Greg Roelofs)
Fixed up documentation (Greg Roelofs, Laszlo Nyul)
- Fixed "error" in pngconf.h for Linux setjmp() behaviour
+ Fixed "error" in pngconf.h for Linux setjmp() behavior
Fixed DOS medium model support (Tim Wegner)
Fixed png_check_keyword() for case with error in static string text
Added read of CRC after IEND chunk for embedded PNGs (Laszlo Nyul)
@@ -197,18 +196,20 @@ Version 0.97 [January, 1998]
Added more typecasts. 65536L becomes (png_uint_32)65536L, etc. (Glenn R-P)
Minor corrections in libpng.txt
Added simple sRGB support (Glenn R-P)
- Easier conditional compiling, e.g. define PNG_READ/WRITE_NOT_FULLY_SUPPORTED;
+ Easier conditional compiling, e.g.,
+ define PNG_READ/WRITE_NOT_FULLY_SUPPORTED;
all configurable options can be selected from command-line instead
of having to edit pngconf.h (Glenn R-P)
Fixed memory leak in pngwrite.c (free info_ptr->text) (Glenn R-P)
Added more conditions for png_do_background, to avoid changing
black pixels to background when a background is supplied and
no pixels are transparent
- Repaired PNG_NO_STDIO behaviour
- Tested NODIV support and made it default behaviour (Greg Roelofs)
+ Repaired PNG_NO_STDIO behavior
+ Tested NODIV support and made it default behavior (Greg Roelofs)
Added "-m" option and PNGTEST_DEBUG_MEMORY to pngtest (John Bowler)
Regularized version numbering scheme and bumped shared-library major
- version number to 2 to avoid problems with libpng 0.89 apps (Greg Roelofs)
+ version number to 2 to avoid problems with libpng 0.89 apps
+ (Greg Roelofs)
Version 0.98 [January, 1998]
Cleaned up some typos in libpng.txt and in code documentation
@@ -1778,7 +1779,7 @@ Version 1.2.13beta1 [October 2, 2006]
Removed AC_FUNC_MALLOC from configure.ac
Work around Intel-Mac compiler bug by setting PNG_NO_MMX_CODE in pngconf.h
Change "logical" to "bitwise" throughout documentation.
- Detect and fix attempt to write wrong iCCP profile length.
+ Detect and fix attempt to write wrong iCCP profile length (CVE-2006-7244)
Version 1.0.21, 1.2.13 [November 14, 2006]
Fix potential buffer overflow in sPLT chunk handler.
@@ -2361,7 +2362,7 @@ Version 1.4.0beta72 [August 1, 2009]
Version 1.4.0beta73 [August 1, 2009]
Reject attempt to write iCCP chunk with negative embedded profile length
- (JD Chen)
+ (JD Chen) (CVE-2009-5063).
Version 1.4.0beta74 [August 8, 2009]
Changed png_ptr and info_ptr member "trans" to "trans_alpha".
@@ -2935,7 +2936,7 @@ Version 1.5.0beta36 [July 29, 2010]
PNG_INTERLACE transform and to get the number of rows in the current
pass.
A new test program, pngvalid.c, validates the gamma code.
- Errors in the 16 bit gamma correction (overflows) have been corrected.
+ Errors in the 16-bit gamma correction (overflows) have been corrected.
cHRM chunk testing is done consistently (previously the floating point
API bypassed it, because the test really didn't work on FP, now the test
is performed on the actual values to be stored in the PNG file so it
@@ -3149,8 +3150,8 @@ version 1.5.1beta01 [January 8, 2011]
in version 1.5.0beta36 but is not noted in the CHANGES. Similarly,
it was changed from png_charpp to png_const_bytepp in png_set_iCCP().
Ensure that png_rgb_to_gray ignores palette mapped images, if libpng
- internally happens to call it with one.
- Fixed a failure to handle palette mapped images correctly.
+ internally happens to call it with one, and fixed a failure to handle
+ palette mapped images correctly. This fixes CVE-2690.
Version 1.5.1beta02 [January 14, 2011]
Fixed a bug in handling of interlaced images (bero at arklinux.org).
@@ -3208,9 +3209,9 @@ Version 1.5.1beta09 [January 24, 2011]
pngvalid contains tests of transforms, which tests are currently disabled
because they are incompletely tested. gray_to_rgb was failing to expand
the bit depth for smaller bit depth images; this seems to be a long
- standing error and resulted, apparently, in invalid output. The
- documentation did not accurately describe what libpng really does when
- converting RGB to gray.
+ standing error and resulted, apparently, in invalid output
+ (CVE-2011-0408, CERT VU#643140). The documentation did not accurately
+ describe what libpng really does when converting RGB to gray.
Version 1.5.1beta10 [January 27, 2010]
Fixed incorrect examples of callback prototypes in the manual, that were
@@ -3227,7 +3228,7 @@ Version 1.5.1beta10 [January 27, 2010]
Version 1.5.1beta11 [January 28, 2011]
Changed PNG_UNUSED from "param=param;" to "{if(param){}}".
Corrected local variable type in new API png_process_data_skip()
- The type was self-evidently incorrect but only causes problems on 64 bit
+ The type was self-evidently incorrect but only causes problems on 64-bit
architectures.
Added transform tests to pngvalid and simplified the arguments.
@@ -3242,6 +3243,617 @@ Version 1.5.1rc02 [January 31, 2011]
Version 1.5.1 [February 3, 2011]
No changes.
+Version 1.5.2beta01 [February 13, 2011]
+ More -Wshadow fixes for older gcc compilers. Older gcc versions apparently
+ check formal parameters names in function declarations (as well as
+ definitions) to see if they match a name in the global namespace.
+ Revised PNG_EXPORTA macro to not use an empty parameter, to accommodate the
+ old VisualC++ preprocessor.
+ Turned on interlace handling in png_read_png().
+ Fixed gcc pendantic warnings.
+ Handle longjmp in Cygwin.
+ Fixed png_get_current_row_number() in the interlaced case.
+ Cleaned up ALPHA flags and transformations.
+ Implemented expansion to 16 bits.
+
+Version 1.5.2beta02 [February 19, 2011]
+ Fixed mistake in the descriptions of user read_transform and write_transform
+ function prototypes in the manual. The row_info struct is png_row_infop.
+ Reverted png_get_current_row_number() to previous (1.5.2beta01) behavior.
+ Corrected png_get_current_row_number documentation
+ Fixed the read/write row callback documentation.
+ This documents the current behavior, where the callback is called after
+ every row with information pertaining to the next row.
+
+Version 1.5.2beta03 [March 3, 2011]
+ Fixed scripts/makefile.vcwin32
+ Updated contrib/pngsuite/README to add the word "modify".
+ Define PNG_ALLOCATED to blank when _MSC_VER<1300.
+
+Version 1.5.2rc01 [March 19, 2011]
+ Define remaining attributes to blank when MSC_VER<1300.
+ ifdef out mask arrays in pngread.c when interlacing is not supported.
+
+Version 1.5.2rc02 [March 22, 2011]
+ Added a hint to try CPP=/bin/cpp if "cpp -E" fails in scripts/pnglibconf.mak
+ and in contrib/pngminim/*/makefile, eg., on SunOS 5.10, and removed "strip"
+ from the makefiles.
+ Fixed a bug (present since libpng-1.0.7) that makes png_handle_sPLT() fail
+ to compile when PNG_NO_POINTER_INDEXING is defined (Chubanov Kirill)
+
+Version 1.5.2rc03 [March 24, 2011]
+ Don't include standard header files in png.h while building the symbol table,
+ to avoid cpp failure on SunOS (introduced PNG_BUILDING_SYMBOL_TABLE macro).
+
+Version 1.5.2 [March 31, 2011]
+ No changes.
+
+Version 1.5.3beta01 [April 1, 2011]
+ Re-initialize the zlib compressor before compressing non-IDAT chunks.
+ Added API functions (png_set_text_compression_level() and four others) to
+ set parameters for zlib compression of non-IDAT chunks.
+
+Version 1.5.3beta02 [April 3, 2011]
+ Updated scripts/symbols.def with new API functions.
+ Only compile the new zlib re-initializing code when text or iCCP is
+ supported, using PNG_WRITE_COMPRESSED_TEXT_SUPPORTED macro.
+ Improved the optimization of the zlib CMF byte (see libpng-1.2.6beta03).
+ Optimize the zlib CMF byte in non-IDAT compressed chunks
+
+Version 1.5.3beta03 [April 16, 2011]
+ Fixed gcc -ansi -pedantic compile. A strict ANSI system does not have
+ snprintf, and the "__STRICT_ANSI__" detects that condition more reliably
+ than __STDC__ (John Bowler).
+ Removed the PNG_PTR_NORETURN attribute because it too dangerous. It tells
+ the compiler that a user supplied callback (the error handler) does not
+ return, yet there is no guarantee in practice that the application code
+ will correctly implement the error handler because the compiler only
+ issues a warning if there is a mistake (John Bowler).
+ Removed the no-longer-used PNG_DEPSTRUCT macro.
+ Updated the zlib version to 1.2.5 in the VStudio project.
+ Fixed 64-bit builds where png_uint_32 is smaller than png_size_t in
+ pngwutil.c (John Bowler).
+ Fixed bug with stripping the filler or alpha channel when writing, that
+ was introduced in libpng-1.5.2beta01 (bug report by Andrew Church).
+
+Version 1.5.3beta04 [April 27, 2011]
+ Updated pngtest.png with the new zlib CMF optimization.
+ Cleaned up conditional compilation code and of background/gamma handling
+ Internal changes only except a new option to avoid compiling the
+ png_build_grayscale_palette API (which is not used at all internally.)
+ The main change is to move the transform tests (READ_TRANSFORMS,
+ WRITE_TRANSFORMS) up one level to the caller of the APIs. This avoids
+ calls to spurious functions if all transforms are disabled and slightly
+ simplifies those functions. Pngvalid modified to handle this.
+ A minor change is to stop the strip_16 and expand_16 interfaces from
+ disabling each other; this allows the future alpha premultiplication
+ code to use 16-bit intermediate values while still producing 8-bit output.
+ png_do_background and png_do_gamma have been simplified to take a single
+ pointer to the png_struct rather than pointers to every item required
+ from the png_struct. This makes no practical difference to the internal
+ code.
+ A serious bug in the pngvalid internal routine 'standard_display_init' has
+ been fixed - this failed to initialize the red channel and accidentally
+ initialized the alpha channel twice.
+ Changed png_struct jmp_buf member name from png_jmpbuf to tmp_jmpbuf to
+ avoid a possible clash with the png_jmpbuf macro on some platforms.
+
+Version 1.5.3beta05 [May 6, 2011]
+ Added the "_POSIX_SOURCE" feature test macro to ensure libpng sees the
+ correct API. _POSIX_SOURCE is defined in pngpriv.h, pngtest.c and
+ pngvalid.c to ensure that POSIX conformant systems disable non-POSIX APIs.
+ Removed png_snprintf and added formatted warning messages. This change adds
+ internal APIs to allow png_warning messages to have parameters without
+ requiring the host OS to implement snprintf. As a side effect the
+ dependency of the tIME-supporting RFC1132 code on stdio is removed and
+ PNG_NO_WARNINGS does actually work now.
+ Pass "" instead of '\0' to png_default_error() in png_err(). This mistake
+ was introduced in libpng-1.2.20beta01. This fixes CVE-2011-2691.
+ Added PNG_WRITE_OPTIMIZE_CMF_SUPPORTED macro to make the zlib "CMF" byte
+ optimization configureable.
+ IDAT compression failed if preceded by a compressed text chunk (bug
+ introduced in libpng-1.5.3beta01-02). This was because the attempt to
+ reset the zlib stream in png_write_IDAT happened after the first IDAT
+ chunk had been deflated - much too late. In this change internal
+ functions were added to claim/release the z_stream and, hopefully, make
+ the code more robust. Also deflateEnd checking is added - previously
+ libpng would ignore an error at the end of the stream.
+
+Version 1.5.3beta06 [May 8, 2011]
+ Removed the -D_ALL_SOURCE from definitions for AIX in CMakeLists.txt
+ Implemented premultiplied alpha support: png_set_alpha_mode API
+
+Version 1.5.3beta07 [May 11, 2011]
+ Added expand_16 support to the high level interface.
+ Added named value and 'flag' gamma support to png_set_gamma. Made a minor
+ change from the previous (unreleased) ABI/API to hide the exact value used
+ for Macs - it's not a good idea to embed this in the ABI!
+ Moved macro definitions for PNG_HAVE_IHDR, PNG_HAVE_PLTE, and PNG_AFTER_IDAT
+ from pngpriv.h to png.h because they must be visible to applications
+ that call png_set_unknown_chunks().
+ Check for up->location !PNG_AFTER_IDAT when writing unknown chunks
+ before IDAT.
+
+Version 1.5.3beta08 [May 16, 2011]
+ Improved "pngvalid --speed" to exclude more of pngvalid from the time.
+ Documented png_set_alpha_mode(), other changes in libpng.3/libpng-manual.txt
+ The cHRM chunk now sets the defaults for png_set_rgb_to_gray() (when negative
+ parameters are supplied by the caller), while in the absence of cHRM
+ sRGB/Rec 709 values are still used. This introduced a divide-by-zero
+ bug in png_handle_cHRM().
+ The bKGD chunk no longer overwrites the background value set by
+ png_set_background(), allowing the latter to be used before the file
+ header is read. It never performed any useful function to override
+ the default anyway.
+ Added memory overwrite and palette image checks to pngvalid.c
+ Previously palette image code was poorly checked. Since the transformation
+ code has a special palette path in most cases this was a severe weakness.
+ Minor cleanup and some extra checking in pngrutil.c and pngrtran.c. When
+ expanding an indexed image, always expand to RGBA if transparency is
+ present.
+
+Version 1.5.3beta09 [May 17, 2011]
+ Reversed earlier 1.5.3 change of transformation order; move png_expand_16
+ back where it was. The change doesn't work because it requires 16-bit
+ gamma tables when the code only generates 8-bit ones. This fails
+ silently; the libpng code just doesn't do any gamma correction. Moving
+ the tests back leaves the old, inaccurate, 8-bit gamma calculations, but
+ these are clearly better than none!
+
+Version 1.5.3beta10 [May 20, 2011]
+
+ png_set_background() and png_expand_16() did not work together correctly.
+ This problem is present in 1.5.2; if png_set_background is called with
+ need_expand false and the matching 16 bit color libpng erroneously just
+ treats it as an 8-bit color because of where png_do_expand_16 is in the
+ transform list. This simple fix reduces the supplied colour to 8-bits,
+ so it gets smashed, but this is better than the current behavior.
+ Added tests for expand16, more fixes for palette image tests to pngvalid.
+ Corrects the code for palette image tests and disables attempts to
+ validate palette colors.
+
+Version 1.5.3rc01 [June 3, 2011]
+ No changes.
+
+Version 1.5.3rc02 [June 8, 2011]
+ Fixed uninitialized memory read in png_format_buffer() (Bug report by
+ Frank Busse, CVE-2011-2501, related to CVE-2004-0421).
+
+Version 1.5.3beta11 [June 11, 2011]
+ Fixed png_handle_sCAL which is broken in 1.5. This fixes CVE 2011-2692.
+ Added sCAL to pngtest.png
+ Revised documentation about png_set_user_limits() to say that it also affects
+ png writing.
+ Revised handling of png_set_user_limits() so that it can increase the
+ limit beyond the PNG_USER_WIDTH|HEIGHT_MAX; previously it could only
+ reduce it.
+ Make the 16-to-8 scaling accurate. Dividing by 256 with no rounding is
+ wrong (high by one) 25% of the time. Dividing by 257 with rounding is
+ wrong in 128 out of 65536 cases. Getting the right answer all the time
+ without division is easy.
+ Added "_SUPPORTED" to the PNG_WRITE_CUSTOMIZE_ZTXT_COMPRESSION macro.
+ Added projects/owatcom, an IDE project for OpenWatcom to replace
+ scripts/makefile.watcom. This project works with OpenWatcom 1.9. The
+ IDE autogenerates appropriate makefiles (libpng.mk) for batch processing.
+ The project is configurable, unlike the Visual Studio project, so long
+ as the developer has an awk.
+ Changed png_set_gAMA to limit the gamma value range so that the inverse
+ of the stored value cannot overflow the fixed point representation,
+ and changed other things OpenWatcom warns about.
+ Revised pngvalid.c to test PNG_ALPHA_MODE_SUPPORTED correctly. This allows
+ pngvalid to build when ALPHA_MODE is not supported, which is required if
+ it is to build on libpng 1.4.
+ Removed string/memory macros that are no longer used and are not
+ necessarily fully supportable, particularly png_strncpy and png_snprintf.
+ Added log option to pngvalid.c and attempted to improve gamma messages.
+
+Version 1.5.3 [omitted]
+ People found the presence of a beta release following an rc release
+ to be confusing; therefore we bump the version to libpng-1.5.4beta01
+ and there will be no libpng-1.5.3 release.
+
+Version 1.5.4beta01 [June 14, 2011]
+ Made it possible to undefine PNG_READ_16_TO_8_ACCURATE_SCALE_SUPPORTED
+ to get the same (inaccurate) output as libpng-1.5.2 and earlier.
+ Moved definitions of PNG_HAVE_IHDR, PNG_AFTER_IDAT, and PNG_HAVE_PLTE
+ outside of an unknown-chunk block in png.h because they are also
+ needed for other uses.
+
+Version 1.5.4beta02 [June 14, 2011]
+ Fixed and clarified LEGACY 16-to-8 scaling code.
+ Added png_set_chop_16() API, to match inaccurate results from previous
+ libpng versions.
+ Removed the ACCURATE and LEGACY options (they are no longer useable)
+ Use the old scaling method for background if png_set_chop_16() was
+ called.
+ Made png_set_chop_16() API removeable by disabling PNG_CHOP_16_TO_8_SUPPORTED
+
+Version 1.5.4beta03 [June 15, 2011]
+ Fixed a problem in png_do_expand_palette() exposed by optimization in
+ 1.5.3beta06
+ Also removed a spurious and confusing "trans" member ("trans") from png_info.
+ The palette expand optimization prevented expansion to an intermediate RGBA
+ form if tRNS was present but alpha was marked to be stripped; this exposed
+ a check for tRNS in png_do_expand_palette() which is inconsistent with the
+ code elsewhere in libpng.
+ Correction to the expand_16 code; removed extra instance of
+ png_set_scale_16_to_8 from pngpriv.h
+
+Version 1.5.4beta04 [June 16, 2011]
+ Added a missing "#ifdef PNG_READ_BACKGROUND_SUPPORTED/#endif" in pngrtran.c
+ Added PNG_TRANSFORM_CHOP_16 to the high-level read transforms.
+ Made PNG_READ_16_TO_8_ACCURATE_SCALE configurable again. If this is
+ not enabled, png_set_strip_16() and png_do_scale_16_to_8() aren't built.
+ Revised contrib/visupng, gregbook, and pngminim to demonstrate chop_16_to_8
+
+Version 1.5.4beta05 [June 16, 2011]
+ Renamed png_set_strip_16() to png_set_scale_16() and renamed
+ png_set_chop_16() to png_set_strip(16) in an attempt to minimize the
+ behavior changes between libpng14 and libpng15.
+
+Version 1.5.4beta06 [June 18, 2011]
+ Fixed new bug that was causing both strip_16 and scale_16 to be applied.
+
+Version 1.5.4beta07 [June 19, 2011]
+ Fixed pngvalid, simplified macros, added checking for 0 in sCAL.
+ The ACCURATE scale macro is no longer defined in 1.5 - call the
+ png_scale_16_to_8 API. Made sure that PNG_READ_16_TO_8 is still defined
+ if the png_strip_16_to_8 API is present. png_check_fp_number now
+ maintains some state so that positive, negative and zero values are
+ identified. sCAL uses these to be strictly spec conformant.
+
+Version 1.5.4beta08 [June 23, 2011]
+ Fixed pngvalid if ACCURATE_SCALE is defined.
+ Updated scripts/pnglibconf.h.prebuilt.
+
+Version 1.5.4rc01 [June 30, 2011]
+ Define PNG_ALLOCATED to "restrict" only if MSC_VER >= 1400.
+
+Version 1.5.4 [July 7, 2011]
+ No changes.
+
+Version 1.5.5beta01 [July 13, 2011]
+ Fixed some typos and made other minor changes in the manual.
+ Updated contrib/pngminus/makefile.std (Samuli Souminen)
+
+Version 1.5.5beta02 [July 14, 2011]
+ Revised Makefile.am and Makefile.in to look in the right directory for
+ pnglibconf.h.prebuilt
+
+Version 1.5.5beta03 [July 27, 2011]
+ Enabled compilation with g++ compiler. This compiler does not recognize
+ the file extension, so it always compiles with C++ rules. Made minor
+ changes to pngrutil.c to cast results where C++ expects it but C does not.
+ Minor editing of libpng.3 and libpng-manual.txt.
+
+Version 1.5.5beta04 [July 29, 2011]
+ Revised CMakeLists.txt (Clifford Yapp)
+ Updated commentary about the png_rgb_to_gray() default coefficients
+ in the manual and in pngrtran.c
+
+Version 1.5.5beta05 [August 17, 2011]
+ Prevent unexpected API exports from non-libpng DLLs on Windows. The "_DLL"
+ is removed from the test of whether a DLL is being built (this erroneously
+ caused the libpng APIs to be marked as DLL exports in static builds under
+ Microsoft Visual Studio). Almost all of the libpng building configuration
+ is moved from pngconf.h to pngpriv.h, but PNG_DLL_EXPORT remains in
+ pngconf.h, though, so that it is colocated with the import definition (it
+ is no longer used anywhere in the installed headers). The VStudio project
+ definitions have been cleaned up: "_USRDLL" has been removed from the
+ static library builds (this was incorrect), and PNG_USE_DLL has been added
+ to pngvalid to test the functionality (pngtest does not supply it,
+ deliberately). The spurious "_EXPORTS" has been removed from the
+ libpng build (all these errors were a result of copy/paste between project
+ configurations.)
+ Added new types and internal functions for CIE RGB end point handling to
+ pngpriv.h (functions yet to be implemented).
+
+Version 1.5.5beta06 [August 26, 2011]
+ Ensure the CMAKE_LIBRARY_OUTPUT_DIRECTORY is set in CMakeLists.txt
+ (Clifford Yap)
+ Fixes to rgb_to_gray and cHRM XYZ APIs (John Bowler):
+ The rgb_to_gray code had errors when combined with gamma correction.
+ Some pixels were treated as true grey when they weren't and such pixels
+ and true grey ones were not gamma corrected (the original value of the
+ red component was used instead). APIs to get and set cHRM using color
+ space end points have been added and the rgb_to_gray code that defaults
+ based on cHRM, and the divide-by-zero bug in png_handle_cHRM (CERT
+ VU#477046, CVE-2011-3328, introduced in 1.5.4) have been corrected.
+ A considerable number of tests has been added to pngvalid for the
+ rgb_to_gray transform.
+ Arithmetic errors in rgb_to_gray whereby the calculated gray value was
+ truncated to the bit depth rather than rounded have been fixed except in
+ the 8-bit non-gamma-corrected case (where consistency seems more important
+ than correctness.) The code still has considerable inaccuracies in the
+ 8-bit case because 8-bit linear arithmetic is used.
+
+Version 1.5.5beta07 [September 7, 2011]
+ Added "$(ARCH)" option to makefile.darwin
+ Added SunOS support to configure.ac and Makefile.am
+ Changed png_chunk_benign_error() to png_warning() in png.c, in
+ png_XYZ_from_xy_checked().
+
+Version 1.5.5beta08 [September 10, 2011]
+ Fixed 64-bit compilation errors (gcc). The errors fixed relate
+ to conditions where types that are 32 bits in the GCC 32-bit
+ world (uLong and png_size_t) become 64 bits in the 64-bit
+ world. This produces potential truncation errors which the
+ compiler correctly flags.
+ Relocated new HAVE_SOLARIS_LD definition in configure.ac
+ Constant changes for 64-bit compatibility (removal of L suffixes). The
+ 16-bit cases still use "L" as we don't have a 16-bit test system.
+
+Version 1.5.5rc01 [September 15, 2011]
+ Removed "L" suffixes in pngpriv.h
+
+Version 1.5.5 [September 22, 2011]
+ No changes.
+
+Version 1.5.6beta01 [September 22, 2011]
+ Fixed some 64-bit type conversion warnings in pngrtran.c
+ Moved row_info from png_struct to a local variable.
+ The various interlace mask arrays have been made into arrays of
+ bytes and made PNG_CONST and static (previously some arrays were
+ marked PNG_CONST and some weren't).
+ Additional checks have been added to the transform code to validate the
+ pixel depths after the transforms on both read and write.
+ Removed some redundant code from pngwrite.c, in png_destroy_write_struct().
+ Changed chunk reading/writing code to use png_uint_32 instead of png_byte[4].
+ This removes the need to allocate temporary strings for chunk names on
+ the stack in the read/write code. Unknown chunk handling still uses the
+ string form because this is exposed in the API.
+
+Version 1.5.6beta02 [September 26, 2011]
+ Added a note in the manual the png_read_update_info() must be called only
+ once with a particular info_ptr.
+ Fixed a typo in the definition of the new PNG_STRING_FROM_CHUNK(s,c) macro.
+
+Version 1.5.6beta03 [September 28, 2011]
+ Revised test-pngtest.sh to report FAIL when pngtest fails.
+ Added "--strict" option to pngtest, to report FAIL when the failure is
+ only because the resulting valid files are different.
+ Revised CMakeLists.txt to work with mingw and removed some material from
+ CMakeLists.txt that is no longer useful in libpng-1.5.
+
+Version 1.5.6beta04 [October 5, 2011]
+ Fixed typo in Makefile.in and Makefile.am ("-M Wl" should be "-M -Wl")."
+
+Version 1.5.6beta05 [October 12, 2011]
+ Speed up png_combine_row() for interlaced images. This reduces the generality
+ of the code, allowing it to be optimized for Adam7 interlace. The masks
+ passed to png_combine_row() are now generated internally, avoiding
+ some code duplication and localizing the interlace handling somewhat.
+ Align png_struct::row_buf - previously it was always unaligned, caused by
+ a bug in the code that attempted to align it; the code needs to subtract
+ one from the pointer to take account of the filter byte prepended to
+ each row.
+ Optimized png_combine_row() when rows are aligned. This gains a small
+ percentage for 16-bit and 32-bit pixels in the typical case where the
+ output row buffers are appropriately aligned. The optimization was not
+ previously possible because the png_struct buffer was always misaligned.
+ Fixed bug in png_write_chunk_header() debug print, introduced in 1.5.6beta01.
+
+Version 1.5.6beta06 [October 17, 2011]
+ Removed two redundant tests for unitialized row.
+ Fixed a relatively harmless memory overwrite in compressed text writing
+ with a 1 byte zlib buffer.
+ Add ability to call png_read_update_info multiple times to pngvalid.c.
+ Fixes for multiple calls to png_read_update_info. These fixes attend to
+ most of the errors revealed in pngvalid, however doing the gamma work
+ twice results in inaccuracies that can't be easily fixed. There is now
+ a warning in the code if this is going to happen.
+ Turned on multiple png_read_update_info in pngvalid transform tests.
+ Prevent libpng from overwriting unused bits at the end of the image when
+ it is not byte aligned, while reading. Prior to libpng-1.5.6 libpng would
+ overwrite the partial byte at the end of each row if the row width was not
+ an exact multiple of 8 bits and the image is not interlaced.
+
+Version 1.5.6beta07 [October 21, 2011]
+ Made png_ptr->prev_row an aligned pointer into png_ptr->big_prev_row
+ (Mans Rullgard).
+
+Version 1.5.6rc01 [October 26, 2011]
+ Changed misleading "Missing PLTE before cHRM" warning to "Out of place cHRM"
+
+Version 1.5.6rc02 [October 27, 2011]
+ Added LSR() macro to defend against buggy compilers that evaluate non-taken
+ code branches and complain about out-of-range shifts.
+
+Version 1.5.6rc03 [October 28, 2011]
+ Renamed the LSR() macro to PNG_LSR() and added PNG_LSL() macro.
+ Fixed compiler warnings with Intel and MSYS compilers. The logical shift
+ fix for Microsoft Visual C is required by other compilers, so this
+ enables that fix for all compilers when using compile-time constants.
+ Under MSYS 'byte' is a name declared in a system header file, so we
+ changed the name of a local variable to avoid the warnings that result.
+ Added #define PNG_ALIGN_TYPE PNG_ALIGN_NONE to contrib/pngminim/*/pngusr.h
+
+Version 1.5.6 [November 3, 2011]
+ No changes.
+
+Version 1.5.7beta01 [November 4, 2011]
+ Added support for ARM processor (Mans Rullgard)
+ Fixed bug in pngvalid on early allocation failure; fixed type cast in
+ pngmem.c; pngvalid would attempt to call png_error() if the allocation
+ of a png_struct or png_info failed. This would probably have led to a
+ crash. The pngmem.c implementation of png_malloc() included a cast
+ to png_size_t which would fail on large allocations on 16-bit systems.
+ Fix for the preprocessor of the Intel C compiler. The preprocessor
+ splits adjacent @ signs with a space; this changes the concatentation
+ token from @-@-@ to PNG_JOIN; that should work with all compiler
+ preprocessors.
+ Paeth filter speed improvements from work by Siarhei Siamashka. This
+ changes the 'Paeth' reconstruction function to improve the GCC code
+ generation on x86. The changes are only part of the suggested ones;
+ just the changes that definitely improve speed and remain simple.
+ The changes also slightly increase the clarity of the code.
+
+Version 1.5.7beta02 [November 11, 2011]
+ Check compression_type parameter in png_get_iCCP and remove spurious
+ casts. The compression_type parameter is always assigned to, so must
+ be non-NULL. The cast of the profile length potentially truncated the
+ value unnecessarily on a 16-bit int system, so the cast of the (byte)
+ compression type to (int) is specified by ANSI-C anyway.
+ Fixed FP division by zero in pngvalid.c; the 'test_pixel' code left
+ the sBIT fields in the test pixel as 0, which resulted in a floating
+ point division by zero which was irrelevant but causes systems where
+ FP exceptions cause a crash. Added code to pngvalid to turn on FP
+ exceptions if the appropriate glibc support is there to ensure this is
+ tested in the future.
+ Updated scripts/pnglibconf.mak and scripts/makefile.std to handle the
+ new PNG_JOIN macro.
+ Added versioning to pnglibconf.h comments.
+ Simplified read/write API initial version; basic read/write tested on
+ a variety of images, limited documentation (in the header file.)
+ Installed more accurate linear to sRGB conversion tables. The slightly
+ modified tables reduce the number of 16-bit values that
+ convert to an off-by-one 8-bit value. The "makesRGB.c" code that was used
+ to generate the tables is now in a contrib/sRGBtables sub-directory.
+
+Version 1.5.7beta03 [November 17, 2011]
+ Removed PNG_CONST from the sRGB table declarations in pngpriv.h and png.c
+ Added run-time detection of NEON support.
+ Added contrib/libtests; includes simplified API test and timing test and
+ a color conversion utility for rapid checking of failed 'pngstest' results.
+ Multiple transform bug fixes plus a work-round for double gamma correction.
+ libpng does not support more than one transform that requires linear data
+ at once - if this is tried typically the results is double gamma
+ correction. Since the simplified APIs can need rgb to gray combined with
+ a compose operation it is necessary to do one of these outside the main
+ libpng transform code. This check-in also contains fixes to various bugs
+ in the simplified APIs themselves and to some bugs in compose and rgb to
+ gray (on palette) itself.
+ Fixes for C++ compilation using g++ When libpng source is compiled
+ using g++. The compiler imposes C++ rules on the C source; thus it
+ is desireable to make the source work with either C or C++ rules
+ without throwing away useful error information. This change adds
+ png_voidcast to allow C semantic (void*) cases or the corresponding
+ C++ static_cast operation, as appropriate.
+ Added --noexecstack to assembler file compilation. GCC does not set
+ this on assembler compilation, even though it does on C compilation.
+ This creates security issues if assembler code is enabled; the
+ work-around is to set it by default in the flags for $(CCAS)
+ Work around compilers that don't support declaration of const data. Some
+ compilers fault 'extern const' data declarations (because the data is
+ not initialized); this turns on const-ness only for compilers where
+ this is known to work.
+
+Version 1.5.7beta04 [November 17, 2011]
+ Since the gcc driver does not recognize the --noexecstack flag, we must
+ use the -Wa prefix to have it passed through to the assembler.
+ Also removed a duplicate setting of this flag.
+ Added files that were omitted from the libpng-1.5.7beta03 zip distribution.
+
+Version 1.5.7beta05 [November 25, 2011]
+ Removed "zTXt" from warning in generic chunk decompression function.
+ Validate time settings passed to pngset() and png_convert_to_rfc1123()
+ (Frank Busse).
+ Added MINGW support to CMakeLists.txt
+ Reject invalid compression flag or method when reading the iTXt chunk.
+ Backed out 'simplified' API changes. The API seems too complex and there
+ is a lack of consensus or enthusiasm for the proposals. The API also
+ reveals significant bugs inside libpng (double gamma correction and the
+ known bug of being unable to retrieve a corrected palette). It seems
+ better to wait until the bugs, at least, are corrected.
+ Moved pngvalid.c into contrib/libtests
+ Rebuilt Makefile.in, configure, etc., with autoconf-2.68
+
+Version 1.5.7rc01 [December 1, 2011]
+ Replaced an "#if" with "#ifdef" in pngrtran.c
+ Revised #if PNG_DO_BC block in png.c (use #ifdef and add #else)
+
+Version 1.5.7rc02 [December 5, 2011]
+ Revised project files and contrib/pngvalid/pngvalid.c to account for
+ the relocation of pngvalid into contrib/libtests.
+ Revised pngconf.h to use " __declspec(restrict)" only when MSC_VER >= 1400,
+ as in libpng-1.5.4.
+ Put CRLF line endings in the owatcom project files.
+
+Version 1.5.7rc03 [December 7, 2011]
+ Updated CMakeLists.txt to account for the relocation of pngvalid.c
+
+Version 1.5.7 [December 15, 2011]
+ Minor fixes to pngvalid.c for gcc 4.6.2 compatibility to remove warnings
+ reported by earlier versions.
+
+Version 1.5.8beta01 [January 15, 2011]
+ Removed '#include config.h"' from contrib/libtests/pngvalid.c. It's not
+ needed and causes trouble for VPATH building.
+ Moved AC_MSG_CHECKING([if libraries can be versioned]) later to the proper
+ location in configure.ac (Gilles Espinasse).
+ Fix bug in pngerror.c: some long warnings were being improperly truncated
+ (CVE-2011-3464, bug introduced in libpng-1.5.3beta05).
+
+Version 1.5.8rc01 [January 21, 2012]
+ No changes.
+
+Version 1.5.8rc02 [January 25, 2012]
+ Fixed Min/GW uninstall to remove libpng.dll.a
+ Conditionalize the install rules for MINGW and CYGWIN in CMakeLists.txt
+
+Version 1.5.8 [February 1, 2012]
+ No changes.
+
+Version 1.5.9beta01 [February 3, 2012]
+ Rebuilt configure scripts in the tar distributions.
+
+Version 1.5.9beta02 [February 16, 2012]
+ Removed two unused definitions from scripts/pnglibconf.h.prebuilt
+ Removed some unused arrays (with #ifdef) from png_read_push_finish_row().
+ Removed tests for no-longer-used *_EMPTY_PLTE_SUPPORTED from pngstruct.h
+
+Version 1.5.9rc01 [February 17, 2012]
+ Fixed CVE-2011-3026 buffer overrun bug. This bug was introduced when
+ iCCP chunk support was added at libpng-1.0.6. Deal more correctly with the
+ test on iCCP chunk length. Also removed spurious casts that may hide
+ problems on 16-bit systems.
+
+Version 1.5.9 [February 18, 2012]
+ No changes.
+
+Version 1.5.10beta01 [February 24, 2012]
+ Removed two useless #ifdef directives from pngread.c and one from pngrutil.c
+ Always put the CMAKE_LIBRARY in "lib" (removed special WIN32 case).
+ Removed empty vstudio/pngstest directory (Clifford Yapp).
+ Eliminated redundant png_push_read_tEXt|zTXt|iTXt|unknown code from
+ pngpread.c and use the sequential png_handle_tEXt, etc., in pngrutil.c;
+ now that png_ptr->buffer is inaccessible to applications, the special
+ handling is no longer useful.
+ Fixed bug with png_handle_hIST with odd chunk length (Frank Busse).
+ Added PNG_SAFE_LIMITS feature to pnglibconf.dfa and code in pngconf.h
+ to reset the user limits to safe ones if PNG_SAFE_LIMITS is defined.
+ To enable, use "CPPFLAGS=-DPNG_SAFE_LIMITS_SUPPORTED" on the configure
+ command or put "#define PNG_SAFE_LIMITS_SUPPORTED" in pnglibconf.h.
+ Revised the SAFE_LIMITS feature to be the same as the feature in libpng16.
+ Added information about the new limits in the manual.
+
+Version 1.5.10beta02 [February 27, 2012]
+ Updated Makefile.in
+
+Version 1.5.10beta03 [March 6, 2012]
+ Removed unused "current_text" members of png_struct and the png_free()
+ of png_ptr->current_text from pngread.c
+ Added palette-index checking. Issue a png_warning() if an invalid index is
+ found.
+
+Version 1.5.10beta04 [March 10, 2012]
+ Fixed PNG_LIBPNG_BUILD_BASE_TYPE definition.
+ Fixed CMF optimization of non-IDAT compressed chunks, which was added at
+ libpng-1.5.4. It sometimes produced too small of a window.
+
+Version 1.5.10beta05 [March 10, 2012]
+ Reject all iCCP chunks after the first, even if the first one is invalid.
+ Issue a png_benign_error() instead of png_warning() about bad palette index.
+ Fixed an off-by-one error in the palette index checking function.
+ Revised example.c to put text strings in a temporary character array
+ instead of directly assigning string constants to png_textp members.
+ This avoids compiler warnings when -Wwrite-strings is enabled.
+
+Version 1.5.10 [March 29, 2012]
+ Prevent PNG_EXPAND+PNG_SHIFT doing the shift twice.
+ Revised png_set_text_2() to avoid potential memory corruption (fixes
+ CVE-2011-3048).
+
Send comments/corrections/commendations to png-mng-implement at lists.sf.net
(subscription required; visit
https://lists.sourceforge.net/lists/listinfo/png-mng-implement
@@ -3249,5 +3861,4 @@ to subscribe)
or to glennrp at users.sourceforge.net
Glenn R-P
-*/ }
#endif
diff --git a/src/3rdparty/libpng/CMakeLists.txt b/src/3rdparty/libpng/CMakeLists.txt
deleted file mode 100644
index 2ee5bf3384..0000000000
--- a/src/3rdparty/libpng/CMakeLists.txt
+++ /dev/null
@@ -1,406 +0,0 @@
-cmake_minimum_required(VERSION 2.4.4)
-set(CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS true)
-
-if(UNIX AND NOT DEFINED CMAKE_BUILD_TYPE)
- if(CMAKE_MAJOR_VERSION EQUAL 2 AND CMAKE_MINOR_VERSION EQUAL 4)
- # workaround CMake 2.4.x bug
- set(CMAKE_BUILD_TYPE "RelWithDebInfo" CACHE STRING
- "Choose the type of build, options are:
- None(CMAKE_CXX_FLAGS or CMAKE_C_FLAGS used)
- Debug
- Release
- RelWithDebInfo
- MinSizeRel.")
- else()
- set(CMAKE_BUILD_TYPE "RelWithDebInfo" CACHE STRING
- "Choose the type of build, options are:
- None(CMAKE_CXX_FLAGS or CMAKE_C_FLAGS used)
- Debug
- Release
- RelWithDebInfo
- MinSizeRel.")
- endif()
-endif()
-
-project(libpng C)
-enable_testing()
-
-# Copyright (C) 2007-2011 Glenn Randers-Pehrson
-
-# This code is released under the libpng license.
-# For conditions of distribution and use, see the disclaimer
-# and license in png.h
-
-set(PNGLIB_MAJOR 1)
-set(PNGLIB_MINOR 5)
-set(PNGLIB_RELEASE 1)
-set(PNGLIB_NAME libpng${PNGLIB_MAJOR}${PNGLIB_MINOR})
-set(PNGLIB_VERSION ${PNGLIB_MAJOR}.${PNGLIB_MINOR}.${PNGLIB_RELEASE})
-
-# needed packages
-find_package(ZLIB REQUIRED)
-include_directories(${ZLIB_INCLUDE_DIR})
-
-if(NOT WIN32)
- find_library(M_LIBRARY
- NAMES m
- PATHS /usr/lib /usr/local/lib
- )
- if(NOT M_LIBRARY)
- message(STATUS
- "math library 'libm' not found - floating point support disabled")
- endif()
-else()
- # not needed on windows
- set(M_LIBRARY "")
-endif()
-
-# COMMAND LINE OPTIONS
-if(DEFINED PNG_SHARED)
- option(PNG_SHARED "Build shared lib" ${PNG_SHARED})
-else()
- option(PNG_SHARED "Build shared lib" ON)
-endif()
-if(DEFINED PNG_STATIC)
- option(PNG_STATIC "Build static lib" ${PNG_STATIC})
-else()
- option(PNG_STATIC "Build static lib" ON)
-endif()
-
-if(MINGW)
- option(PNG_TESTS "Build pngtest" NO)
-else()
- option(PNG_TESTS "Build pngtest" YES)
-endif()
-
-option(PNG_NO_CONSOLE_IO "FIXME" YES)
-option(PNG_NO_STDIO "FIXME" YES)
-option(PNG_DEBUG "Build with debug output" NO)
-option(PNGARG "FIXME" YES)
-#TODO:
-# PNG_CONSOLE_IO_SUPPORTED
-
-# maybe needs improving, but currently I don't know when we can enable what :)
-set(png_asm_tmp "OFF")
-if(NOT WIN32)
- find_program(uname_executable NAMES uname PATHS /bin /usr/bin /usr/local/bin)
- if(uname_executable)
- exec_program(${uname_executable}
- ARGS --machine OUTPUT_VARIABLE uname_output)
- if("uname_output" MATCHES "^.*i[1-9]86.*$")
- set(png_asm_tmp "ON")
- else("uname_output" MATCHES "^.*i[1-9]86.*$")
- set(png_asm_tmp "OFF")
- endif("uname_output" MATCHES "^.*i[1-9]86.*$")
- endif(uname_executable)
-else()
- # this env var is normally only set on win64
- set(TEXT "ProgramFiles(x86)")
- if("$ENV{${TEXT}}" STREQUAL "")
- set(png_asm_tmp "ON")
- endif("$ENV{${TEXT}}" STREQUAL "")
-endif()
-
-# SET LIBNAME
-set(PNG_LIB_NAME png${PNGLIB_MAJOR}${PNGLIB_MINOR})
-
-# to distinguish between debug and release lib
-set(CMAKE_DEBUG_POSTFIX "d")
-
-# Use the prebuilt pnglibconf.h file from the scripts folder
-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/scripts/pnglibconf.h.prebuilt
- ${CMAKE_CURRENT_BINARY_DIR}/pnglibconf.h)
-include_directories(${CMAKE_CURRENT_BINARY_DIR})
-
-# OUR SOURCES
-set(libpng_public_hdrs
- png.h
- pngconf.h
- ${CMAKE_CURRENT_BINARY_DIR}/pnglibconf.h
-)
-set(libpng_sources
- ${libpng_public_hdrs}
- pngdebug.h
- pnginfo.h
- pngpriv.h
- pngstruct.h
- png.c
- pngerror.c
- pngget.c
- pngmem.c
- pngpread.c
- pngread.c
- pngrio.c
- pngrtran.c
- pngrutil.c
- pngset.c
- pngtrans.c
- pngwio.c
- pngwrite.c
- pngwtran.c
- pngwutil.c
-)
-set(pngtest_sources
- pngtest.c
-)
-# SOME NEEDED DEFINITIONS
-
-add_definitions(-DPNG_CONFIGURE_LIBPNG)
-
-if(_AIX)
- add_definitions(-D_ALL_SOURCE)
-endif(_AIX)
-
-if(MSVC)
- add_definitions(-DPNG_NO_MODULEDEF -D_CRT_SECURE_NO_DEPRECATE)
-endif(MSVC)
-
-if(PNG_SHARED OR NOT MSVC)
- #if building msvc static this has NOT to be defined
- add_definitions(-DZLIB_DLL)
-endif()
-
-
-if(PNG_CONSOLE_IO_SUPPORTED)
- add_definitions(-DPNG_CONSOLE_IO_SUPPORTED)
-endif()
-
-if(PNG_NO_CONSOLE_IO)
- add_definitions(-DPNG_NO_CONSOLE_IO)
-endif()
-
-if(PNG_NO_STDIO)
- add_definitions(-DPNG_NO_STDIO)
-endif()
-
-if(PNG_DEBUG)
- add_definitions(-DPNG_DEBUG)
-endif()
-
-if(NOT M_LIBRARY AND NOT WIN32)
- add_definitions(-DPNG_NO_FLOATING_POINT_SUPPORTED)
-endif()
-
-# NOW BUILD OUR TARGET
-include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${ZLIB_INCLUDE_DIR})
-
-if(PNG_SHARED)
- add_library(${PNG_LIB_NAME} SHARED ${libpng_sources})
- if(MSVC)
- # msvc does not append 'lib' - do it here to have consistent name
- set_target_properties(${PNG_LIB_NAME} PROPERTIES PREFIX "lib")
- set_target_properties(${PNG_LIB_NAME} PROPERTIES IMPORT_PREFIX "lib")
- endif()
- target_link_libraries(${PNG_LIB_NAME} ${ZLIB_LIBRARY} ${M_LIBRARY})
-endif()
-
-if(PNG_STATIC)
-# does not work without changing name
- set(PNG_LIB_NAME_STATIC ${PNG_LIB_NAME}_static)
- add_library(${PNG_LIB_NAME_STATIC} STATIC ${libpng_sources})
- if(MSVC)
- # msvc does not append 'lib' - do it here to have consistent name
- set_target_properties(${PNG_LIB_NAME_STATIC} PROPERTIES PREFIX "lib")
- endif()
- target_link_libraries(${PNG_LIB_NAME_STATIC} ${ZLIB_LIBRARY} ${M_LIBRARY})
-endif()
-
-
-if(PNG_SHARED AND WIN32)
- set_target_properties(${PNG_LIB_NAME} PROPERTIES DEFINE_SYMBOL PNG_BUILD_DLL)
-endif()
-
-if(PNG_TESTS AND PNG_SHARED)
- # does not work with msvc due to png_lib_ver issue
- add_executable(pngtest ${pngtest_sources})
- target_link_libraries(pngtest ${PNG_LIB_NAME})
- add_test(pngtest ./pngtest ${CMAKE_CURRENT_SOURCE_DIR}/pngtest.png)
-endif()
-
-#
-# Set a variable with CMake code which:
-# Creates a symlink from src to dest (if possible) or alternatively
-# copies if different.
-macro(_png_generate_symlink_code CODE SRC DEST)
- if(WIN32 AND NOT CYGWIN)
- set(_png_gsc_message "Copying ${SRC} to ${DEST} if needed")
- set(_png_gsc_operation "copy_if_different")
- else()
- set(_png_gsc_message "Symlinking ${SRC} to ${DEST}")
- set(_png_gsc_operation "create_symlink")
- endif()
-
- set(${CODE} "
- message(STATUS \"${_png_gsc_message}\")
- execute_process(COMMAND \${CMAKE_COMMAND} -E ${_png_gsc_operation}
- \"${SRC}\" \"${DEST}\")
- ")
-endmacro()
-
-# CREATE PKGCONFIG FILES
-# we use the same files like ./configure, so we have to set its vars
-if(NOT DEFINED CMAKE_INSTALL_LIBDIR)
- set(CMAKE_INSTALL_LIBDIR lib)
-endif(NOT DEFINED CMAKE_INSTALL_LIBDIR)
-set(prefix ${CMAKE_INSTALL_PREFIX})
-set(exec_prefix ${CMAKE_INSTALL_PREFIX})
-set(libdir ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR})
-set(includedir ${CMAKE_INSTALL_PREFIX}/include)
-set(LIBS "-lz -lm")
-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/libpng.pc.in
- ${CMAKE_CURRENT_BINARY_DIR}/${PNGLIB_NAME}.pc @ONLY)
-_png_generate_symlink_code(PNG_PC_INSTALL_CODE
- ${CMAKE_CURRENT_BINARY_DIR}/${PNGLIB_NAME}.pc
- ${CMAKE_CURRENT_BINARY_DIR}/libpng.pc)
-install(CODE ${PNG_PC_INSTALL_CODE})
-
-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/libpng-config.in
- ${CMAKE_CURRENT_BINARY_DIR}/${PNGLIB_NAME}-config @ONLY)
-_png_generate_symlink_code(PNG_CONFIG_INSTALL_CODE
- ${CMAKE_CURRENT_BINARY_DIR}/${PNGLIB_NAME}-config
- ${CMAKE_CURRENT_BINARY_DIR}/libpng-config)
-install(CODE ${PNG_CONFIG_INSTALL_CODE})
-
-# SET UP LINKS
-if(PNG_SHARED)
- set_target_properties(${PNG_LIB_NAME} PROPERTIES
-# VERSION 15.${PNGLIB_RELEASE}.1.5.1
- VERSION 15.${PNGLIB_RELEASE}.0
- SOVERSION 15
- CLEAN_DIRECT_OUTPUT 1)
-endif()
-if(PNG_STATIC)
- # MSVC doesn't use a different file extension for shared vs. static
- # libs. We are able to change OUTPUT_NAME to remove the _static
- # for all other platforms.
- if(NOT MSVC)
- set_target_properties(${PNG_LIB_NAME_STATIC} PROPERTIES
- OUTPUT_NAME ${PNG_LIB_NAME}
- CLEAN_DIRECT_OUTPUT 1)
- endif()
-endif()
-
-# If CMake > 2.4.x, we set a variable used below to export
-# targets to an export file.
-# TODO: Use VERSION_GREATER after our cmake_minimum_required >= 2.6.2
-if(CMAKE_MAJOR_VERSION GREATER 1 AND CMAKE_MINOR_VERSION GREATER 4)
- set(PNG_EXPORT_RULE EXPORT libpng)
-elseif(CMAKE_MAJOR_VERSION GREATER 2) # future proof
- set(PNG_EXPORT_RULE EXPORT libpng)
-endif()
-
-# INSTALL
-if(NOT SKIP_INSTALL_LIBRARIES AND NOT SKIP_INSTALL_ALL )
- if(PNG_SHARED)
- install(TARGETS ${PNG_LIB_NAME}
- ${PNG_EXPORT_RULE}
- RUNTIME DESTINATION bin
- LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
- ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
-
- # Create a symlink for libpng.dll.a => libpng15.dll.a on Cygwin
- if(CYGWIN)
- _png_generate_symlink_code(PNG_SHARED_IMPLIB_INSTALL_CODE
- ${PNGLIB_NAME}${CMAKE_IMPORT_LIBRARY_SUFFIX}
- libpng${CMAKE_IMPORT_LIBRARY_SUFFIX})
- install(CODE ${PNG_SHARED_IMPLIB_INSTALL_CODE})
- install(FILES
- ${CMAKE_CURRENT_BINARY_DIR}/libpng${CMAKE_IMPORT_LIBRARY_SUFFIX}
- DESTINATION ${CMAKE_INSTALL_LIBDIR})
- endif()
-
- if(NOT WIN32)
- IF(CMAKE_LIBRARY_OUTPUT_DIRECTORY)
- _png_generate_symlink_code(PNG_SHARED_INSTALL_CODE
- ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${PNGLIB_NAME}${CMAKE_SHARED_LIBRARY_SUFFIX}
- ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/libpng${CMAKE_SHARED_LIBRARY_SUFFIX})
- install(CODE ${PNG_SHARED_INSTALL_CODE})
- install(FILES
- ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/libpng${CMAKE_SHARED_LIBRARY_SUFFIX}
- DESTINATION ${CMAKE_INSTALL_LIBDIR})
- ELSE(CMAKE_LIBRARY_OUTPUT_DIRECTORY)
- _png_generate_symlink_code(PNG_SHARED_INSTALL_CODE
- ${PNGLIB_NAME}${CMAKE_SHARED_LIBRARY_SUFFIX}
- libpng${CMAKE_SHARED_LIBRARY_SUFFIX})
- install(CODE ${PNG_SHARED_INSTALL_CODE})
- install(FILES
- ${CMAKE_CURRENT_BINARY_DIR}/libpng${CMAKE_SHARED_LIBRARY_SUFFIX}
- DESTINATION ${CMAKE_INSTALL_LIBDIR})
- ENDIF(CMAKE_LIBRARY_OUTPUT_DIRECTORY)
- endif()
- endif()
-
- if(PNG_STATIC)
- install(TARGETS ${PNG_LIB_NAME_STATIC}
- ${PNG_EXPORT_RULE}
- LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
- ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
- if(NOT WIN32 OR CYGWIN)
- IF(CMAKE_ARCHIVE_OUTPUT_DIRECTORY)
- _png_generate_symlink_code(PNG_STATIC_INSTALL_CODE
-${CMAKE_ARCHIVE_OUTPUT_DIRECTORY}/${PNGLIB_NAME}${CMAKE_STATIC_LIBRARY_SUFFIX}
- ${CMAKE_ARCHIVE_OUTPUT_DIRECTORY}/libpng${CMAKE_STATIC_LIBRARY_SUFFIX})
- install(CODE ${PNG_STATIC_INSTALL_CODE})
- install(FILES
- ${CMAKE_ARCHIVE_OUTPUT_DIRECTORY}/libpng${CMAKE_STATIC_LIBRARY_SUFFIX}
- DESTINATION ${CMAKE_INSTALL_LIBDIR})
- ELSE(CMAKE_ARCHIVE_OUTPUT_DIRECTORY)
- _png_generate_symlink_code(PNG_STATIC_INSTALL_CODE
- ${PNGLIB_NAME}${CMAKE_STATIC_LIBRARY_SUFFIX}
- libpng${CMAKE_STATIC_LIBRARY_SUFFIX})
- install(CODE ${PNG_STATIC_INSTALL_CODE})
- install(FILES
- ${CMAKE_CURRENT_BINARY_DIR}/libpng${CMAKE_STATIC_LIBRARY_SUFFIX}
- DESTINATION ${CMAKE_INSTALL_LIBDIR})
- ENDIF(CMAKE_ARCHIVE_OUTPUT_DIRECTORY)
- endif()
- endif()
-endif()
-
-if(NOT SKIP_INSTALL_HEADERS AND NOT SKIP_INSTALL_ALL )
- install(FILES ${libpng_public_hdrs} DESTINATION include)
- install(FILES ${libpng_public_hdrs} DESTINATION include/${PNGLIB_NAME})
-endif()
-if(NOT SKIP_INSTALL_EXECUTABLES AND NOT SKIP_INSTALL_ALL )
- install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/libpng-config DESTINATION bin)
- install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/${PNGLIB_NAME}-config
- DESTINATION bin)
-endif()
-if(NOT SKIP_INSTALL_FILES AND NOT SKIP_INSTALL_ALL )
- # Install man pages
- if(NOT PNG_MAN_DIR)
- set(PNG_MAN_DIR "share/man")
- endif()
- install(FILES libpng.3 libpngpf.3 DESTINATION ${PNG_MAN_DIR}/man3)
- install(FILES png.5 DESTINATION ${PNG_MAN_DIR}/man5)
- # Install pkg-config files
- install(FILES ${CMAKE_CURRENT_BINARY_DIR}/libpng.pc
- DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
- install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/libpng-config
- DESTINATION bin)
- install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PNGLIB_NAME}.pc
- DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
- install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/${PNGLIB_NAME}-config
- DESTINATION bin)
-endif()
-
-# On versions of CMake that support it, create an export file CMake
-# users can include() to import our targets
-if(PNG_EXPORT_RULE AND NOT SKIP_INSTALL_EXPORT AND NOT SKIP_INSTALL_ALL )
- install(EXPORT libpng DESTINATION lib/libpng FILE lib${PNG_LIB_NAME}.cmake)
-endif()
-
-# what's with libpng-$VER%.txt and all the extra files?
-
-
-# UNINSTALL
-# do we need this?
-
-
-# DIST
-# do we need this?
-
-# to create msvc import lib for mingw compiled shared lib
-# pexports libpng.dll > libpng.def
-# lib /def:libpng.def /machine:x86
-
diff --git a/src/3rdparty/libpng/INSTALL b/src/3rdparty/libpng/INSTALL
index 353bfff326..e6979c6fb0 100644
--- a/src/3rdparty/libpng/INSTALL
+++ b/src/3rdparty/libpng/INSTALL
@@ -133,3 +133,23 @@ run "make install".
Further information can be found in the README and libpng-manual.txt
files, in the individual makefiles, in png.h, and the manual pages
libpng.3 and png.5.
+
+Using the ./configure script -- 16 December 2002.
+=================================================
+
+The ./configure script should work compatibly with what scripts/makefile.*
+did, however there are some options you might need to add to configure
+explicitly, which previously was done semi-automatically (if you didn't edit
+scripts/makefile.* yourself, that is)
+
+CFLAGS="-Wall -O -funroll-loops \
+-malign-loops=2 -malign-functions=2" ./configure --prefix=/usr/include \
+--with-pkgconfigdir=/usr/lib/pkgconfig --includedir=/usr/include
+
+You can alternatively specify --includedir=/usr/include, /usr/local/include,
+/usr/include/libpng%NN%, or whatever.
+
+If you find that the configure script is out-of-date or is not supporting
+your platform properly, try running autogen.sh to regenerate "configure",
+"Makefile.in", and the other configuration files. Then try configure again.
+
diff --git a/src/3rdparty/libpng/LICENSE b/src/3rdparty/libpng/LICENSE
index b28f15c74f..b72d1258e3 100644
--- a/src/3rdparty/libpng/LICENSE
+++ b/src/3rdparty/libpng/LICENSE
@@ -10,7 +10,7 @@ this sentence.
This code is released under the libpng license.
-libpng versions 1.2.6, August 15, 2004, through 1.5.1, February 3, 2011, are
+libpng versions 1.2.6, August 15, 2004, through 1.5.10, March 29, 2012, are
Copyright (c) 2004, 2006-2011 Glenn Randers-Pehrson, and are
distributed according to the same disclaimer and license as libpng-1.2.5
with the following individual added to the list of Contributing Authors
@@ -108,4 +108,4 @@ certification mark of the Open Source Initiative.
Glenn Randers-Pehrson
glennrp at users.sourceforge.net
-February 3, 2011
+March 29, 2012
diff --git a/src/3rdparty/libpng/README b/src/3rdparty/libpng/README
index 9dd6745f0a..e821ee4c87 100644
--- a/src/3rdparty/libpng/README
+++ b/src/3rdparty/libpng/README
@@ -1,4 +1,4 @@
-README for libpng version 1.5.1 - February 3, 2011 (shared library 15.0)
+README for libpng version 1.5.10 - March 29, 2012 (shared library 15.0)
See the note about version numbers near the top of png.h
See INSTALL for instructions on how to install libpng.
@@ -114,19 +114,16 @@ given in previous versions of this document. He and Andreas will
read mail addressed to the png-implement list, however.
Please do not send general questions about PNG. Send them to
-the (png-list at ccrc.wustl.edu, subscription required, write to
-majordomo at ccrc.wustl.edu with "subscribe png-list" in your message).
-On the other hand,
-please do not send libpng questions to that address, send them to me
-or to the png-implement list. I'll
-get them in the end anyway. If you have a question about something
+png-mng-misc at lists.sf.net (subscription required; visit
+https://lists.sourceforge.net/lists/listinfo/png-mng-misc to
+subscribe). If you have a question about something
in the PNG specification that is related to using libpng, send it
to me. Send me any questions that start with "I was using libpng,
and ...". If in doubt, send questions to me. I'll bounce them
to others, if necessary.
Please do not send suggestions on how to change PNG. We have
-been discussing PNG for nine years now, and it is official and
+been discussing PNG for sixteen years now, and it is official and
finished. If you have suggestions for libpng, however, I'll
gladly listen. Even if your suggestion is not used immediately,
it may be used later.
diff --git a/src/3rdparty/libpng/TODO b/src/3rdparty/libpng/TODO
deleted file mode 100644
index 6e1f028bd7..0000000000
--- a/src/3rdparty/libpng/TODO
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
-TODO - list of things to do for libpng:
-
-Final bug fixes.
-Better C++ wrapper/full C++ implementation?
-Fix problem with C++ and EXTERN "C".
-cHRM transformation.
-Remove setjmp/longjmp usage in favor of returning error codes.
-Add "grayscale->palette" transformation and "palette->grayscale" detection.
-Improved dithering.
-Multi-lingual error and warning message support.
-Complete sRGB transformation (presently it simply uses gamma=0.45455).
-Man pages for function calls.
-Better documentation.
-Better filter selection
- (counting huffman bits/precompression? filter inertia? filter costs?).
-Histogram creation.
-Text conversion between different code pages (Latin-1 -> Mac and DOS).
-Avoid building gamma tables whenever possible.
-Use greater precision when changing to linear gamma for compositing against
- background and doing rgb-to-gray transformation.
-Investigate pre-incremented loop counters and other loop constructions.
-Add interpolated method of handling interlacing.
-Switch to the simpler zlib (zlib/libpng) license if legally possible.
-Extend pngvalid.c to validate more of the libpng transformations.
-
-*/
diff --git a/src/3rdparty/libpng/config.guess b/src/3rdparty/libpng/config.guess
deleted file mode 100644
index dc84c68ef7..0000000000
--- a/src/3rdparty/libpng/config.guess
+++ /dev/null
@@ -1,1501 +0,0 @@
-#! /bin/sh
-# Attempt to guess a canonical system name.
-# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
-# Free Software Foundation, Inc.
-
-timestamp='2009-11-20'
-
-# This file is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
-# 02110-1301, USA.
-#
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-
-# Originally written by Per Bothner. Please send patches (context
-# diff format) to <config-patches@gnu.org> and include a ChangeLog
-# entry.
-#
-# This script attempts to guess a canonical system name similar to
-# config.sub. If it succeeds, it prints the system name on stdout, and
-# exits with 0. Otherwise, it exits with 1.
-#
-# You can get the latest version of this script from:
-# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
-
-me=`echo "$0" | sed -e 's,.*/,,'`
-
-usage="\
-Usage: $0 [OPTION]
-
-Output the configuration name of the system \`$me' is run on.
-
-Operation modes:
- -h, --help print this help, then exit
- -t, --time-stamp print date of last modification, then exit
- -v, --version print version number, then exit
-
-Report bugs and patches to <config-patches@gnu.org>."
-
-version="\
-GNU config.guess ($timestamp)
-
-Originally written by Per Bothner.
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
-2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
-
-This is free software; see the source for copying conditions. There is NO
-warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
-
-help="
-Try \`$me --help' for more information."
-
-# Parse command line
-while test $# -gt 0 ; do
- case $1 in
- --time-stamp | --time* | -t )
- echo "$timestamp" ; exit ;;
- --version | -v )
- echo "$version" ; exit ;;
- --help | --h* | -h )
- echo "$usage"; exit ;;
- -- ) # Stop option processing
- shift; break ;;
- - ) # Use stdin as input.
- break ;;
- -* )
- echo "$me: invalid option $1$help" >&2
- exit 1 ;;
- * )
- break ;;
- esac
-done
-
-if test $# != 0; then
- echo "$me: too many arguments$help" >&2
- exit 1
-fi
-
-trap 'exit 1' 1 2 15
-
-# CC_FOR_BUILD -- compiler used by this script. Note that the use of a
-# compiler to aid in system detection is discouraged as it requires
-# temporary files to be created and, as you can see below, it is a
-# headache to deal with in a portable fashion.
-
-# Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still
-# use `HOST_CC' if defined, but it is deprecated.
-
-# Portable tmp directory creation inspired by the Autoconf team.
-
-set_cc_for_build='
-trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ;
-trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ;
-: ${TMPDIR=/tmp} ;
- { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
- { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } ||
- { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } ||
- { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ;
-dummy=$tmp/dummy ;
-tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ;
-case $CC_FOR_BUILD,$HOST_CC,$CC in
- ,,) echo "int x;" > $dummy.c ;
- for c in cc gcc c89 c99 ; do
- if ($c -c -o $dummy.o $dummy.c) >/dev/null 2>&1 ; then
- CC_FOR_BUILD="$c"; break ;
- fi ;
- done ;
- if test x"$CC_FOR_BUILD" = x ; then
- CC_FOR_BUILD=no_compiler_found ;
- fi
- ;;
- ,,*) CC_FOR_BUILD=$CC ;;
- ,*,*) CC_FOR_BUILD=$HOST_CC ;;
-esac ; set_cc_for_build= ;'
-
-# This is needed to find uname on a Pyramid OSx when run in the BSD universe.
-# (ghazi@noc.rutgers.edu 1994-08-24)
-if (test -f /.attbin/uname) >/dev/null 2>&1 ; then
- PATH=$PATH:/.attbin ; export PATH
-fi
-
-UNAME_MACHINE=`(uname -m) 2>/dev/null` || UNAME_MACHINE=unknown
-UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown
-UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown
-UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
-
-# Note: order is significant - the case branches are not exclusive.
-
-case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
- *:NetBSD:*:*)
- # NetBSD (nbsd) targets should (where applicable) match one or
- # more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*,
- # *-*-netbsdecoff* and *-*-netbsd*. For targets that recently
- # switched to ELF, *-*-netbsd* would select the old
- # object file format. This provides both forward
- # compatibility and a consistent mechanism for selecting the
- # object file format.
- #
- # Note: NetBSD doesn't particularly care about the vendor
- # portion of the name. We always set it to "unknown".
- sysctl="sysctl -n hw.machine_arch"
- UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \
- /usr/sbin/$sysctl 2>/dev/null || echo unknown)`
- case "${UNAME_MACHINE_ARCH}" in
- armeb) machine=armeb-unknown ;;
- arm*) machine=arm-unknown ;;
- sh3el) machine=shl-unknown ;;
- sh3eb) machine=sh-unknown ;;
- sh5el) machine=sh5le-unknown ;;
- *) machine=${UNAME_MACHINE_ARCH}-unknown ;;
- esac
- # The Operating System including object format, if it has switched
- # to ELF recently, or will in the future.
- case "${UNAME_MACHINE_ARCH}" in
- arm*|i386|m68k|ns32k|sh3*|sparc|vax)
- eval $set_cc_for_build
- if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
- | grep -q __ELF__
- then
- # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
- # Return netbsd for either. FIX?
- os=netbsd
- else
- os=netbsdelf
- fi
- ;;
- *)
- os=netbsd
- ;;
- esac
- # The OS release
- # Debian GNU/NetBSD machines have a different userland, and
- # thus, need a distinct triplet. However, they do not need
- # kernel version information, so it can be replaced with a
- # suitable tag, in the style of linux-gnu.
- case "${UNAME_VERSION}" in
- Debian*)
- release='-gnu'
- ;;
- *)
- release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
- ;;
- esac
- # Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM:
- # contains redundant information, the shorter form:
- # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
- echo "${machine}-${os}${release}"
- exit ;;
- *:OpenBSD:*:*)
- UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
- echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}
- exit ;;
- *:ekkoBSD:*:*)
- echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
- exit ;;
- *:SolidBSD:*:*)
- echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE}
- exit ;;
- macppc:MirBSD:*:*)
- echo powerpc-unknown-mirbsd${UNAME_RELEASE}
- exit ;;
- *:MirBSD:*:*)
- echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
- exit ;;
- alpha:OSF1:*:*)
- case $UNAME_RELEASE in
- *4.0)
- UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
- ;;
- *5.*)
- UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
- ;;
- esac
- # According to Compaq, /usr/sbin/psrinfo has been available on
- # OSF/1 and Tru64 systems produced since 1995. I hope that
- # covers most systems running today. This code pipes the CPU
- # types through head -n 1, so we only detect the type of CPU 0.
- ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^ The alpha \(.*\) processor.*$/\1/p' | head -n 1`
- case "$ALPHA_CPU_TYPE" in
- "EV4 (21064)")
- UNAME_MACHINE="alpha" ;;
- "EV4.5 (21064)")
- UNAME_MACHINE="alpha" ;;
- "LCA4 (21066/21068)")
- UNAME_MACHINE="alpha" ;;
- "EV5 (21164)")
- UNAME_MACHINE="alphaev5" ;;
- "EV5.6 (21164A)")
- UNAME_MACHINE="alphaev56" ;;
- "EV5.6 (21164PC)")
- UNAME_MACHINE="alphapca56" ;;
- "EV5.7 (21164PC)")
- UNAME_MACHINE="alphapca57" ;;
- "EV6 (21264)")
- UNAME_MACHINE="alphaev6" ;;
- "EV6.7 (21264A)")
- UNAME_MACHINE="alphaev67" ;;
- "EV6.8CB (21264C)")
- UNAME_MACHINE="alphaev68" ;;
- "EV6.8AL (21264B)")
- UNAME_MACHINE="alphaev68" ;;
- "EV6.8CX (21264D)")
- UNAME_MACHINE="alphaev68" ;;
- "EV6.9A (21264/EV69A)")
- UNAME_MACHINE="alphaev69" ;;
- "EV7 (21364)")
- UNAME_MACHINE="alphaev7" ;;
- "EV7.9 (21364A)")
- UNAME_MACHINE="alphaev79" ;;
- esac
- # A Pn.n version is a patched version.
- # A Vn.n version is a released version.
- # A Tn.n version is a released field test version.
- # A Xn.n version is an unreleased experimental baselevel.
- # 1.2 uses "1.2" for uname -r.
- echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
- exit ;;
- Alpha\ *:Windows_NT*:*)
- # How do we know it's Interix rather than the generic POSIX subsystem?
- # Should we change UNAME_MACHINE based on the output of uname instead
- # of the specific Alpha model?
- echo alpha-pc-interix
- exit ;;
- 21064:Windows_NT:50:3)
- echo alpha-dec-winnt3.5
- exit ;;
- Amiga*:UNIX_System_V:4.0:*)
- echo m68k-unknown-sysv4
- exit ;;
- *:[Aa]miga[Oo][Ss]:*:*)
- echo ${UNAME_MACHINE}-unknown-amigaos
- exit ;;
- *:[Mm]orph[Oo][Ss]:*:*)
- echo ${UNAME_MACHINE}-unknown-morphos
- exit ;;
- *:OS/390:*:*)
- echo i370-ibm-openedition
- exit ;;
- *:z/VM:*:*)
- echo s390-ibm-zvmoe
- exit ;;
- *:OS400:*:*)
- echo powerpc-ibm-os400
- exit ;;
- arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
- echo arm-acorn-riscix${UNAME_RELEASE}
- exit ;;
- arm:riscos:*:*|arm:RISCOS:*:*)
- echo arm-unknown-riscos
- exit ;;
- SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
- echo hppa1.1-hitachi-hiuxmpp
- exit ;;
- Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*)
- # akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE.
- if test "`(/bin/universe) 2>/dev/null`" = att ; then
- echo pyramid-pyramid-sysv3
- else
- echo pyramid-pyramid-bsd
- fi
- exit ;;
- NILE*:*:*:dcosx)
- echo pyramid-pyramid-svr4
- exit ;;
- DRS?6000:unix:4.0:6*)
- echo sparc-icl-nx6
- exit ;;
- DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*)
- case `/usr/bin/uname -p` in
- sparc) echo sparc-icl-nx7; exit ;;
- esac ;;
- s390x:SunOS:*:*)
- echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
- exit ;;
- sun4H:SunOS:5.*:*)
- echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
- exit ;;
- sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
- echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
- exit ;;
- i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*)
- echo i386-pc-auroraux${UNAME_RELEASE}
- exit ;;
- i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
- eval $set_cc_for_build
- SUN_ARCH="i386"
- # If there is a compiler, see if it is configured for 64-bit objects.
- # Note that the Sun cc does not turn __LP64__ into 1 like gcc does.
- # This test works for both compilers.
- if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
- if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \
- (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
- grep IS_64BIT_ARCH >/dev/null
- then
- SUN_ARCH="x86_64"
- fi
- fi
- echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
- exit ;;
- sun4*:SunOS:6*:*)
- # According to config.sub, this is the proper way to canonicalize
- # SunOS6. Hard to guess exactly what SunOS6 will be like, but
- # it's likely to be more like Solaris than SunOS4.
- echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
- exit ;;
- sun4*:SunOS:*:*)
- case "`/usr/bin/arch -k`" in
- Series*|S4*)
- UNAME_RELEASE=`uname -v`
- ;;
- esac
- # Japanese Language versions have a version number like `4.1.3-JL'.
- echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'`
- exit ;;
- sun3*:SunOS:*:*)
- echo m68k-sun-sunos${UNAME_RELEASE}
- exit ;;
- sun*:*:4.2BSD:*)
- UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
- test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3
- case "`/bin/arch`" in
- sun3)
- echo m68k-sun-sunos${UNAME_RELEASE}
- ;;
- sun4)
- echo sparc-sun-sunos${UNAME_RELEASE}
- ;;
- esac
- exit ;;
- aushp:SunOS:*:*)
- echo sparc-auspex-sunos${UNAME_RELEASE}
- exit ;;
- # The situation for MiNT is a little confusing. The machine name
- # can be virtually everything (everything which is not
- # "atarist" or "atariste" at least should have a processor
- # > m68000). The system name ranges from "MiNT" over "FreeMiNT"
- # to the lowercase version "mint" (or "freemint"). Finally
- # the system name "TOS" denotes a system which is actually not
- # MiNT. But MiNT is downward compatible to TOS, so this should
- # be no problem.
- atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
- echo m68k-atari-mint${UNAME_RELEASE}
- exit ;;
- atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
- echo m68k-atari-mint${UNAME_RELEASE}
- exit ;;
- *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
- echo m68k-atari-mint${UNAME_RELEASE}
- exit ;;
- milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
- echo m68k-milan-mint${UNAME_RELEASE}
- exit ;;
- hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
- echo m68k-hades-mint${UNAME_RELEASE}
- exit ;;
- *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
- echo m68k-unknown-mint${UNAME_RELEASE}
- exit ;;
- m68k:machten:*:*)
- echo m68k-apple-machten${UNAME_RELEASE}
- exit ;;
- powerpc:machten:*:*)
- echo powerpc-apple-machten${UNAME_RELEASE}
- exit ;;
- RISC*:Mach:*:*)
- echo mips-dec-mach_bsd4.3
- exit ;;
- RISC*:ULTRIX:*:*)
- echo mips-dec-ultrix${UNAME_RELEASE}
- exit ;;
- VAX*:ULTRIX*:*:*)
- echo vax-dec-ultrix${UNAME_RELEASE}
- exit ;;
- 2020:CLIX:*:* | 2430:CLIX:*:*)
- echo clipper-intergraph-clix${UNAME_RELEASE}
- exit ;;
- mips:*:*:UMIPS | mips:*:*:RISCos)
- eval $set_cc_for_build
- sed 's/^ //' << EOF >$dummy.c
-#ifdef __cplusplus
-#include <stdio.h> /* for printf() prototype */
- int main (int argc, char *argv[]) {
-#else
- int main (argc, argv) int argc; char *argv[]; {
-#endif
- #if defined (host_mips) && defined (MIPSEB)
- #if defined (SYSTYPE_SYSV)
- printf ("mips-mips-riscos%ssysv\n", argv[1]); exit (0);
- #endif
- #if defined (SYSTYPE_SVR4)
- printf ("mips-mips-riscos%ssvr4\n", argv[1]); exit (0);
- #endif
- #if defined (SYSTYPE_BSD43) || defined(SYSTYPE_BSD)
- printf ("mips-mips-riscos%sbsd\n", argv[1]); exit (0);
- #endif
- #endif
- exit (-1);
- }
-EOF
- $CC_FOR_BUILD -o $dummy $dummy.c &&
- dummyarg=`echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` &&
- SYSTEM_NAME=`$dummy $dummyarg` &&
- { echo "$SYSTEM_NAME"; exit; }
- echo mips-mips-riscos${UNAME_RELEASE}
- exit ;;
- Motorola:PowerMAX_OS:*:*)
- echo powerpc-motorola-powermax
- exit ;;
- Motorola:*:4.3:PL8-*)
- echo powerpc-harris-powermax
- exit ;;
- Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*)
- echo powerpc-harris-powermax
- exit ;;
- Night_Hawk:Power_UNIX:*:*)
- echo powerpc-harris-powerunix
- exit ;;
- m88k:CX/UX:7*:*)
- echo m88k-harris-cxux7
- exit ;;
- m88k:*:4*:R4*)
- echo m88k-motorola-sysv4
- exit ;;
- m88k:*:3*:R3*)
- echo m88k-motorola-sysv3
- exit ;;
- AViiON:dgux:*:*)
- # DG/UX returns AViiON for all architectures
- UNAME_PROCESSOR=`/usr/bin/uname -p`
- if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ]
- then
- if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \
- [ ${TARGET_BINARY_INTERFACE}x = x ]
- then
- echo m88k-dg-dgux${UNAME_RELEASE}
- else
- echo m88k-dg-dguxbcs${UNAME_RELEASE}
- fi
- else
- echo i586-dg-dgux${UNAME_RELEASE}
- fi
- exit ;;
- M88*:DolphinOS:*:*) # DolphinOS (SVR3)
- echo m88k-dolphin-sysv3
- exit ;;
- M88*:*:R3*:*)
- # Delta 88k system running SVR3
- echo m88k-motorola-sysv3
- exit ;;
- XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3)
- echo m88k-tektronix-sysv3
- exit ;;
- Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD)
- echo m68k-tektronix-bsd
- exit ;;
- *:IRIX*:*:*)
- echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'`
- exit ;;
- ????????:AIX?:[12].1:2) # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX.
- echo romp-ibm-aix # uname -m gives an 8 hex-code CPU id
- exit ;; # Note that: echo "'`uname -s`'" gives 'AIX '
- i*86:AIX:*:*)
- echo i386-ibm-aix
- exit ;;
- ia64:AIX:*:*)
- if [ -x /usr/bin/oslevel ] ; then
- IBM_REV=`/usr/bin/oslevel`
- else
- IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
- fi
- echo ${UNAME_MACHINE}-ibm-aix${IBM_REV}
- exit ;;
- *:AIX:2:3)
- if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
- eval $set_cc_for_build
- sed 's/^ //' << EOF >$dummy.c
- #include <sys/systemcfg.h>
-
- main()
- {
- if (!__power_pc())
- exit(1);
- puts("powerpc-ibm-aix3.2.5");
- exit(0);
- }
-EOF
- if $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy`
- then
- echo "$SYSTEM_NAME"
- else
- echo rs6000-ibm-aix3.2.5
- fi
- elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then
- echo rs6000-ibm-aix3.2.4
- else
- echo rs6000-ibm-aix3.2
- fi
- exit ;;
- *:AIX:*:[456])
- IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
- if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
- IBM_ARCH=rs6000
- else
- IBM_ARCH=powerpc
- fi
- if [ -x /usr/bin/oslevel ] ; then
- IBM_REV=`/usr/bin/oslevel`
- else
- IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
- fi
- echo ${IBM_ARCH}-ibm-aix${IBM_REV}
- exit ;;
- *:AIX:*:*)
- echo rs6000-ibm-aix
- exit ;;
- ibmrt:4.4BSD:*|romp-ibm:BSD:*)
- echo romp-ibm-bsd4.4
- exit ;;
- ibmrt:*BSD:*|romp-ibm:BSD:*) # covers RT/PC BSD and
- echo romp-ibm-bsd${UNAME_RELEASE} # 4.3 with uname added to
- exit ;; # report: romp-ibm BSD 4.3
- *:BOSX:*:*)
- echo rs6000-bull-bosx
- exit ;;
- DPX/2?00:B.O.S.:*:*)
- echo m68k-bull-sysv3
- exit ;;
- 9000/[34]??:4.3bsd:1.*:*)
- echo m68k-hp-bsd
- exit ;;
- hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*)
- echo m68k-hp-bsd4.4
- exit ;;
- 9000/[34678]??:HP-UX:*:*)
- HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
- case "${UNAME_MACHINE}" in
- 9000/31? ) HP_ARCH=m68000 ;;
- 9000/[34]?? ) HP_ARCH=m68k ;;
- 9000/[678][0-9][0-9])
- if [ -x /usr/bin/getconf ]; then
- sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
- sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
- case "${sc_cpu_version}" in
- 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
- 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
- 532) # CPU_PA_RISC2_0
- case "${sc_kernel_bits}" in
- 32) HP_ARCH="hppa2.0n" ;;
- 64) HP_ARCH="hppa2.0w" ;;
- '') HP_ARCH="hppa2.0" ;; # HP-UX 10.20
- esac ;;
- esac
- fi
- if [ "${HP_ARCH}" = "" ]; then
- eval $set_cc_for_build
- sed 's/^ //' << EOF >$dummy.c
-
- #define _HPUX_SOURCE
- #include <stdlib.h>
- #include <unistd.h>
-
- int main ()
- {
- #if defined(_SC_KERNEL_BITS)
- long bits =