Jørgen Lind c70efdec0f Merge remote-tracking branch 'base/master' into refactor ... Conflicts: examples/animation/animatedtiles/animatedtiles.pro examples/animation/appchooser/appchooser.pro examples/animation/moveblocks/moveblocks.pro examples/animation/states/states.pro examples/animation/stickman/stickman.pro examples/dialogs/configdialog/configdialog.pro examples/dialogs/sipdialog/sipdialog.pro examples/dialogs/standarddialogs/standarddialogs.pro examples/dialogs/tabdialog/tabdialog.pro examples/draganddrop/draggableicons/draggableicons.pro examples/draganddrop/draggabletext/draggabletext.pro examples/draganddrop/fridgemagnets/fridgemagnets.pro examples/draganddrop/puzzle/puzzle.pro examples/gestures/imagegestures/imagegestures.pro examples/graphicsview/basicgraphicslayouts/basicgraphicslayouts.pro examples/graphicsview/collidingmice/collidingmice.pro examples/graphicsview/elasticnodes/elasticnodes.pro examples/graphicsview/weatheranchorlayout/weatheranchorlayout.pro examples/itemviews/addressbook/addressbook.pro examples/itemviews/chart/chart.pro examples/itemviews/fetchmore/fetchmore.pro examples/itemviews/puzzle/puzzle.pro examples/mainwindows/menus/menus.pro examples/painting/basicdrawing/basicdrawing.pro examples/painting/concentriccircles/concentriccircles.pro examples/painting/imagecomposition/imagecomposition.pro examples/painting/painterpaths/painterpaths.pro examples/painting/transformations/transformations.pro examples/qtconcurrent/imagescaling/imagescaling.pro examples/qtestlib/tutorial1/tutorial1.pro examples/qtestlib/tutorial2/tutorial2.pro examples/qtestlib/tutorial3/tutorial3.pro examples/qtestlib/tutorial4/tutorial4.pro examples/qtestlib/tutorial5/tutorial5.pro examples/qws/dbscreen/dbscreen.pro examples/qws/svgalib/svgalib.pro examples/richtext/syntaxhighlighter/syntaxhighlighter.pro examples/statemachine/rogue/rogue.pro examples/tools/plugandpaintplugins/extrafilters/extrafilters.pro examples/tools/styleplugin/plugin/plugin.pro examples/uitools/multipleinheritance/multipleinheritance.pro examples/widgets/analogclock/analogclock.pro examples/widgets/calculator/calculator.pro examples/widgets/calendarwidget/calendarwidget.pro examples/widgets/codeeditor/codeeditor.pro examples/widgets/icons/icons.pro examples/widgets/imageviewer/imageviewer.pro examples/widgets/lineedits/lineedits.pro examples/widgets/movie/movie.pro examples/widgets/shapedclock/shapedclock.pro examples/widgets/softkeys/softkeys.pro examples/widgets/tetrix/tetrix.pro src/gui/painting/qpaintengine_raster.cpp src/gui/painting/qpaintengine_raster_p.h src/openvg/openvg.pro src/openvg/qpaintengine_vg_p.h src/plugins/graphicssystems/meego/meego.pro src/plugins/platforms/fontdatabases/basicunix/basicunix.pri		2011-06-10 13:09:57 +02:00
..
mac	Initial import from the monolithic Qt.	2011-04-27 12:05:43 +02:00
qpa	Merge remote-tracking branch 'base/master' into refactor	2011-06-10 13:09:57 +02:00
symbian	Add enablers for Symbian App Booster	2011-05-10 12:54:55 +02:00
unix	Initial import from the monolithic Qt.	2011-04-27 12:05:43 +02:00
win32	Changed path references to ActiveQt.	2011-04-27 12:05:56 +02:00
build_pass.prf	Initial import from the monolithic Qt.	2011-04-27 12:05:43 +02:00
dbusadaptors.prf	Initial import from the monolithic Qt.	2011-04-27 12:05:43 +02:00
dbusinterfaces.prf	Initial import from the monolithic Qt.	2011-04-27 12:05:43 +02:00
debug_and_release.prf	Initial import from the monolithic Qt.	2011-04-27 12:05:43 +02:00
debug.prf	Initial import from the monolithic Qt.	2011-04-27 12:05:43 +02:00
default_post.prf	Initial import from the monolithic Qt.	2011-04-27 12:05:43 +02:00
default_pre.prf	Make qmake slightly more verbose with its syncqt output.	2011-06-06 10:42:13 +02:00
designer.prf	Add QtTools' include/QtDesigner as well as QtCore's include/QtDesigner	2011-05-26 13:32:08 +02:00
dll.prf	Initial import from the monolithic Qt.	2011-04-27 12:05:43 +02:00
egl.prf	Initial import from the monolithic Qt.	2011-04-27 12:05:43 +02:00
exclusive_builds.prf	Initial import from the monolithic Qt.	2011-04-27 12:05:43 +02:00
help.prf	Move private headers into versioned subdirectory	2011-05-02 15:30:08 +02:00
include_source_dir.prf	Initial import from the monolithic Qt.	2011-04-27 12:05:43 +02:00
incredibuild_xge.prf	Initial import from the monolithic Qt.	2011-04-27 12:05:43 +02:00
lex.prf	Initial import from the monolithic Qt.	2011-04-27 12:05:43 +02:00
link_pkgconfig.prf	Initial import from the monolithic Qt.	2011-04-27 12:05:43 +02:00
moc.prf	Initial import from the monolithic Qt.	2011-04-27 12:05:43 +02:00
module.prf	Fix framework absolute path issue	2011-05-04 15:55:51 +02:00
no_debug_info.prf	Initial import from the monolithic Qt.	2011-04-27 12:05:43 +02:00
qdbus.prf	Initial import from the monolithic Qt.	2011-04-27 12:05:43 +02:00
qmltestcase.prf	Fixed linking against QtQuickTest on mac.	2011-05-31 06:31:55 +02:00
qt_config.prf	Implemented module-local caching of module profiles.	2011-06-03 22:20:40 +02:00
qt_functions.prf	No -rpath-link on Mac.	2011-05-11 15:20:18 +02:00
qt_installs.prf	Moved common module profiles to be feature profiles.	2011-06-05 14:47:14 +02:00
qt_module_config.prf	Complain if we don't load(qt_module) first	2011-06-08 21:04:48 +02:00
qt_module.prf	Complain if we don't load(qt_module) first	2011-06-08 21:04:48 +02:00
qt_plugin.prf	Made qpluginbase.pri into a feature profile.	2011-05-31 12:51:29 +02:00
qt_targets.prf	Moved common module profiles to be feature profiles.	2011-06-05 14:47:14 +02:00
qt.prf	Only add dependent include when not already there	2011-05-27 22:22:40 +02:00
qtestlib.prf	Initial import from the monolithic Qt.	2011-04-27 12:05:43 +02:00
qtopia.prf	Initial import from the monolithic Qt.	2011-04-27 12:05:43 +02:00
qtopiainc.prf	Initial import from the monolithic Qt.	2011-04-27 12:05:43 +02:00
qtopialib.prf	Initial import from the monolithic Qt.	2011-04-27 12:05:43 +02:00
qttest_p4.prf	Initial import from the monolithic Qt.	2011-04-27 12:05:43 +02:00
release.prf	Initial import from the monolithic Qt.	2011-04-27 12:05:43 +02:00
resources.prf	Initial import from the monolithic Qt.	2011-04-27 12:05:43 +02:00
shared.prf	Initial import from the monolithic Qt.	2011-04-27 12:05:43 +02:00
silent.prf	Initial import from the monolithic Qt.	2011-04-27 12:05:43 +02:00
static_and_shared.prf	Initial import from the monolithic Qt.	2011-04-27 12:05:43 +02:00
static.prf	Initial import from the monolithic Qt.	2011-04-27 12:05:43 +02:00
staticlib.prf	Initial import from the monolithic Qt.	2011-04-27 12:05:43 +02:00
testcase.prf	tests: allow unstable tests to be marked with CONFIG+=insignificant_test	2011-05-19 13:56:28 +10:00
uic.prf	Initial import from the monolithic Qt.	2011-04-27 12:05:43 +02:00
uitools.prf	Corrected include path for UiTools.	2011-04-27 12:05:50 +02:00
use_c_linker.prf	Initial import from the monolithic Qt.	2011-04-27 12:05:43 +02:00
vxworks.prf	Initial import from the monolithic Qt.	2011-04-27 12:05:43 +02:00
warn_off.prf	Initial import from the monolithic Qt.	2011-04-27 12:05:43 +02:00
warn_on.prf	Initial import from the monolithic Qt.	2011-04-27 12:05:43 +02:00
yacc.prf	Initial import from the monolithic Qt.	2011-04-27 12:05:43 +02:00