Joerg Bornemann
d1ff829072
qmake: fix incrementalLinker option writing for vcxproj
...
Change-Id: I7d3b33a3a2e2f7c89ea956cd1304e7d2e365151f
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2011-10-14 19:42:32 +02:00
Tor Arne Vestbø
eba17baaed
Make CONFIG+=GNUmake respect shadow builds
...
Previously we were generating include lines based on the relative path of
the source file, which resulted in the .d files being placed in the source
dir as well. We now expect the .d files to live in the output dir, but keep
the dependency from the .d file to the original source file.
Before:
.deps/%.d: %.cpp
-include .deps/../../src/foo.d
After:
.deps/%.d: ../../src/%.cpp
-include .deps/foo.d
Change-Id: I749adeb671cf8424f0849521c5bb1489eb3e76d5
Reviewed-on: http://codereview.qt-project.org/6455
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
2011-10-11 21:00:07 +02:00
Gunnar Sletta
b62bd0584a
Merge branch 'refactor'
...
Conflicts:
mkspecs/qws/linux-lsb-g++/qmake.conf
src/gui/image/qpixmap_mac.cpp
src/gui/painting/qpaintengine_x11.cpp
src/gui/painting/qtessellator.cpp
src/gui/text/qfontengine_qws.cpp
src/gui/text/qfontengine_x11.cpp
src/gui/widgets/qlinecontrol.cpp
src/opengl/qgl.h
src/opengl/qgl_x11egl.cpp
src/plugins/plugins.pro
Change-Id: If52dcd55cd55f2983a756c2f843967702b60a310
2011-09-13 08:54:45 +02:00
Oswald Buddenhagen
0192bf919f
find qt.conf more reliably
...
a qmake invoked with a relative path would not find qt.conf, because it
already changed CWD, which would confuse our copy of
QCoreApplication::applicationFilePath() (see also QTBUG-21381).
we already have the absolute path to the qmake executable in
Option::qmake_abslocation, so just use it.
(cherry picked from commit c378e16e57e8ce2255116e7fdb5436524cccb8c7)
Change-Id: Icfe4254722e0855f6755b639f4c86f15bc7323ba
Reviewed-on: http://codereview.qt-project.org/4565
Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
2011-09-12 18:25:54 +02:00
Styopa Semenukha
c4c8bd26bd
Added missing no_include_pwd check
...
Merge-request: 2619
Reviewed-by: ossi
(cherry picked from commit 9db6959f8893a64146124db0cfafbcb154a9e105)
Change-Id: I096013754bd78f5fcf8afcc3ae8734abc959c107
Reviewed-on: http://codereview.qt-project.org/4582
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2011-09-12 16:03:47 +02:00
suzuki toshiya
5dd78ba08f
Replace 'i < len-1 && func(i+1)' by 'i+1 < len && func(i+1)'
...
Merge-request: 1299
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
(cherry picked from commit 81f0c44f6a4fd4cfa41af5d5b292008185bf3981)
Conflicts:
src/qt3support/itemviews/q3listbox.cpp
src/qt3support/sql/q3datatable.cpp
src/qt3support/text/q3richtext.cpp
src/scripttools/debugging/qscriptcompletiontask.cpp
src/scripttools/debugging/qscriptdebuggercodeview.cpp
Change-Id: Ie70590e77e69fbb9b2322c48c3963fd9cbba19e6
Reviewed-on: http://codereview.qt-project.org/4581
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2011-09-12 16:03:47 +02:00
Oswald Buddenhagen
ffd829e68f
qsystemlibrary needs no special treatment
...
this was just a merge artifact
(cherry picked from commit 4ac87b7042f7b08e8b427e21d74aa8d224b186bc)
Change-Id: Ifa0638982fe48fda2e8d9aa7ee43029187330f02
Reviewed-on: http://codereview.qt-project.org/4574
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2011-09-12 16:03:47 +02:00
Gunnar Sletta
a9ac6da893
Merge branch 'master' into refactor
...
Conflicts:
src/3rdparty/v8
src/gui/text/qfont_qpa.cpp
src/gui/widgets/qlinecontrol.cpp
src/plugins/platforms/fontdatabases/fontconfig/qfontconfigdatabase.cpp
tests/auto/gui.pro
tests/auto/network.pro
tests/auto/qstring/tst_qstring.cpp
Change-Id: Id118c172645303ccf06a207050d5bf1462ff57fe
2011-09-12 07:49:03 +02:00
Joerg Bornemann
13908a560b
qmake vcxproj generator: fix XML conversion for build events
...
Task-number: QTBUG-20419
Change-Id: I52069e0beb2b39ec4a67e83de583efd2926c6611
Reviewed-on: http://codereview.qt-project.org/4484
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
2011-09-08 19:50:28 +02:00
Samuel Rødal
92c998afb6
Merge remote branch 'gerrit/master' into refactor
...
Conflicts:
src/gui/kernel/qapplication_x11.cpp
src/gui/widgets/qlinecontrol.cpp
src/gui/widgets/qlinecontrol_p.h
src/gui/widgets/qtabwidget.h
Change-Id: I90ba893a5553b9ff5658ca0a3221ecf76be4c736
2011-08-03 11:03:22 +02:00
Marius Storm-Olsen
289d5aed37
Make qmake load default_pre.prf for each project, like default_post.prf
...
If you ran qmake with 'qmake -r', default_pre.prf would only be run once
while default_post.prf would run for every sub-project.
This makes it more symmetrical and correct.
Change-Id: I1d096c38dffb16f1d256c511ed9e2912cfaefe66
Reviewed-on: http://codereview.qt.nokia.com/1716
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2011-07-21 20:40:51 +02:00
Marius Storm-Olsen
5e4d13e55c
Remove loading "default" as a fall-back for missing "default_pre"
...
"default" was used a very long time ago, and it's time to let it go.
Change-Id: I230573ef778789f6e1a5a7df3543e660392da39b
Reviewed-on: http://codereview.qt.nokia.com/1746
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2011-07-21 20:40:51 +02:00
Samuel Rødal
7b3b6b5afa
Merge remote branch 'gerrit/master' into refactor
...
Conflicts:
examples/opengl/cube/main.cpp
examples/widgets/applicationicon/main.cpp
examples/widgets/orientation/main.cpp
src/gui/image/qicon.cpp
src/gui/image/qimage.h
src/gui/image/qpixmap.h
src/gui/image/qpixmap_mac.cpp
src/gui/kernel/qapplication.cpp
src/gui/kernel/qpalette.cpp
src/gui/kernel/qwidget.cpp
src/gui/styles/qmacstyle_mac.mm
src/gui/widgets/qmenubar.cpp
src/gui/widgets/qslider.cpp
src/opengl/qwindowsurface_gl.cpp
tests/auto/qvariant/qvariant.pro
tests/benchmarks/corelib/kernel/qobject/qobject.pro
tests/benchmarks/gui/animation/qanimation/qanimation.pro
tests/benchmarks/gui/graphicsview/qgraphicsanchorlayout/qgraphicsanchorlayout.pro
tests/benchmarks/gui/graphicsview/qgraphicsitem/qgraphicsitem.pro
tests/benchmarks/gui/graphicsview/qgraphicsscene/qgraphicsscene.pro
tests/benchmarks/gui/graphicsview/qgraphicsview/qgraphicsview.pro
tests/benchmarks/gui/graphicsview/qgraphicswidget/qgraphicswidget.pro
tests/benchmarks/gui/image/qimagereader/qimagereader.pro
tests/benchmarks/gui/itemviews/qtableview/qtableview.pro
tests/benchmarks/gui/kernel/qapplication/qapplication.pro
tests/benchmarks/gui/kernel/qwidget/qwidget.pro
tests/benchmarks/gui/painting/qpainter/qpainter.pro
tests/benchmarks/gui/painting/qtbench/qtbench.pro
tests/benchmarks/gui/painting/qtracebench/qtracebench.pro
tests/benchmarks/gui/text/qtext/qtext.pro
Change-Id: I4b911c795ecb29d73b6a7fd18819711b49478a30
2011-07-21 14:42:46 +02:00
Oswald Buddenhagen
68711f6ea7
fix access to free()d memory
...
the 'item' reference may become invalid inside the loop.
this approach was chosen (instead of making 'item' a non-reference) to
keep the code more in sync with creator (where the string type is more
complex).
Change-Id: I60a4b0654dc47c0e3466d43904c358eb7e3e64e2
Reviewed-By: Marius Storm-Olsen
Reviewed-on: http://codereview.qt.nokia.com/1702
Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
2011-07-15 16:00:06 +02:00
Samuel Rødal
2371147354
Merge remote branch 'gerrit/master' into refactor
...
Conflicts:
src/gui/image/qicon.cpp
src/gui/image/qicon.h
src/gui/image/qicon_p.h
src/gui/text/qfontdatabase.cpp
src/plugins/platforms/wayland/gl_integration/qwaylandglwindowsurface.cpp
src/plugins/platforms/wayland/gl_integration/wayland_egl/qwaylandglcontext.cpp
src/plugins/platforms/wayland/gl_integration/xcomposite_egl/qwaylandxcompositeeglwindow.cpp
sync.profile
Change-Id: Ie0a23a12177ff51bf562e15b2dd41f071afb19b4
2011-07-12 12:52:22 +02:00
Oswald Buddenhagen
fe9cb4a508
fix $$resolve_depends()
...
make it a proper topological sort. before, it could not resolve diamonds
correctly.
Change-Id: I17ffd81020ab36e7e5dbcfd120793ba8d9c6cf18
Reviewed-on: http://codereview.qt.nokia.com/1435
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
2011-07-11 18:58:41 +02:00
Oswald Buddenhagen
0f32f596ea
inline resoveDepends()
...
that's common practice for the expand functions, and that one isn't even
particularly big
Change-Id: I66c22e11edb66bd00d211fc1282eb75f5dd4832d
Reviewed-on: http://codereview.qt.nokia.com/1456
Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
2011-07-11 18:58:41 +02:00
Oswald Buddenhagen
1aa9affcf1
fix misnomer: $$resolve_depends() => $$sort_depends()
...
... and re-add a real $$resolve_depends(), just in case.
Change-Id: I489d6056546340ce95280fe7fd571e30c14470e7
Reviewed-on: http://codereview.qt.nokia.com/1455
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
2011-07-11 18:58:41 +02:00
Oswald Buddenhagen
fc42ffa15a
invert the output order of $$resolve_depends()
...
it needs to go from highest order to lowest order.
that's not relevant unless doing static linking.
Change-Id: Ieb69e3949b4d9cc2d2a62f5661f31e3dc88ac882
Reviewed-on: http://codereview.qt.nokia.com/1454
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
2011-07-11 18:58:41 +02:00
Oswald Buddenhagen
a84c87f1ad
make 1st argument of $$resolve_depends a variable
...
this is braindead, but it's consistent with the rest of qmake and more
performant. and the argument error message claimed it already anyway.
Change-Id: I973368acc6ffbff17107085ccd68b0334cc3e681
Reviewed-on: http://codereview.qt.nokia.com/1436
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
2011-07-11 18:58:41 +02:00
Oswald Buddenhagen
968596588b
make the non-bootstrapped build work again
...
Change-Id: I48d33bea7fd3081461e6edcf7077bfb749e2d2b7
Reviewed-on: http://codereview.qt.nokia.com/1433
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
2011-07-11 15:50:59 +02:00
Casper van Donderen
a97d4dcb24
Remove references to QT_INSTALL_DEMOS & DemosPath.
...
The distinction between 'examples' and 'demos' is completely blurred at
this point. We've decided, with the SDK people, to scrap the existing
terminology in favor of the word 'example' only -- distinguishing
between code snippets, walkthroughs, "demonstrations" can be done
via keywords or some other method.
Removing QT_INSTALL_DEMOS from all .pro files in Qt is still in
progress.
Change-Id: I86fc0e40d54baa54c5641fc6acbd8b67e4ad2789
Reviewed-on: http://codereview.qt.nokia.com/1034
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
2011-07-06 13:29:44 +02:00
Paul Olav Tvete
43b9a99983
Merge remote branch 'staging/master' into refactor
...
Conflicts:
examples/animation/animatedtiles/animatedtiles.pro
examples/animation/appchooser/appchooser.pro
examples/animation/easing/easing.pro
examples/animation/easing/window.h
examples/animation/moveblocks/moveblocks.pro
examples/animation/states/states.pro
examples/animation/stickman/stickman.pro
examples/dbus/dbus-chat/dbus-chat.pro
examples/dbus/dbus.pro
examples/dbus/remotecontrolledcar/car/car.pro
examples/dbus/remotecontrolledcar/controller/controller.pro
examples/dbus/remotecontrolledcar/remotecontrolledcar.pro
examples/desktop/desktop.pro
examples/desktop/screenshot/screenshot.pro
examples/dialogs/classwizard/classwizard.pro
examples/dialogs/configdialog/configdialog.pro
examples/dialogs/dialogs.pro
examples/dialogs/extension/extension.pro
examples/dialogs/findfiles/findfiles.pro
examples/dialogs/licensewizard/licensewizard.pro
examples/dialogs/sipdialog/sipdialog.pro
examples/dialogs/standarddialogs/standarddialogs.pro
examples/dialogs/tabdialog/tabdialog.pro
examples/dialogs/trivialwizard/trivialwizard.pro
examples/draganddrop/draggableicons/draggableicons.pro
examples/draganddrop/draggabletext/draggabletext.pro
examples/draganddrop/dropsite/dropsite.pro
examples/draganddrop/fridgemagnets/fridgemagnets.pro
examples/draganddrop/puzzle/puzzle.pro
examples/effects/blurpicker/blurpicker.pro
examples/effects/fademessage/fademessage.pro
examples/effects/lighting/lighting.pro
examples/examples.pro
examples/gestures/imagegestures/imagegestures.pro
examples/graphicsview/anchorlayout/anchorlayout.pro
examples/graphicsview/basicgraphicslayouts/basicgraphicslayouts.pro
examples/graphicsview/collidingmice/collidingmice.pro
examples/graphicsview/diagramscene/diagramscene.pro
examples/graphicsview/dragdroprobot/dragdroprobot.pro
examples/graphicsview/elasticnodes/elasticnodes.pro
examples/graphicsview/flowlayout/flowlayout.pro
examples/graphicsview/graphicsview.pro
examples/graphicsview/simpleanchorlayout/simpleanchorlayout.pro
examples/graphicsview/weatheranchorlayout/weatheranchorlayout.pro
examples/ipc/ipc.pro
examples/ipc/sharedmemory/sharedmemory.pro
examples/itemviews/addressbook/addressbook.pro
examples/itemviews/basicsortfiltermodel/basicsortfiltermodel.pro
examples/itemviews/chart/chart.pro
examples/itemviews/coloreditorfactory/coloreditorfactory.pro
examples/itemviews/combowidgetmapper/combowidgetmapper.pro
examples/itemviews/customsortfiltermodel/customsortfiltermodel.pro
examples/itemviews/dirview/dirview.pro
examples/itemviews/editabletreemodel/editabletreemodel.pro
examples/itemviews/fetchmore/fetchmore.pro
examples/itemviews/frozencolumn/frozencolumn.pro
examples/itemviews/itemviews.pro
examples/itemviews/pixelator/pixelator.pro
examples/itemviews/puzzle/puzzle.pro
examples/itemviews/simpletreemodel/simpletreemodel.pro
examples/itemviews/simplewidgetmapper/simplewidgetmapper.pro
examples/itemviews/spinboxdelegate/spinboxdelegate.pro
examples/itemviews/stardelegate/stardelegate.pro
examples/ja_JP/linguist/hellotr/hellotr.pro
examples/layouts/basiclayouts/basiclayouts.pro
examples/layouts/borderlayout/borderlayout.pro
examples/layouts/dynamiclayouts/dynamiclayouts.pro
examples/layouts/flowlayout/flowlayout.pro
examples/layouts/layouts.pro
examples/linguist/arrowpad/arrowpad.pro
examples/linguist/hellotr/hellotr.pro
examples/linguist/linguist.pro
examples/linguist/trollprint/trollprint.pro
examples/mainwindows/application/application.pro
examples/mainwindows/dockwidgets/dockwidgets.pro
examples/mainwindows/mainwindows.pro
examples/mainwindows/mdi/mdi.pro
examples/mainwindows/menus/menus.pro
examples/mainwindows/recentfiles/recentfiles.pro
examples/mainwindows/sdi/sdi.pro
examples/network/network.pro
examples/opengl/opengl.pro
examples/openvg/openvg.pro
examples/painting/basicdrawing/basicdrawing.pro
examples/painting/concentriccircles/concentriccircles.pro
examples/painting/fontsampler/fontsampler.pro
examples/painting/imagecomposition/imagecomposition.pro
examples/painting/painterpaths/painterpaths.pro
examples/painting/painting.pro
examples/painting/transformations/transformations.pro
examples/qtconcurrent/imagescaling/imagescaling.pro
examples/qtconcurrent/map/map.pro
examples/qtconcurrent/progressdialog/progressdialog.pro
examples/qtconcurrent/qtconcurrent.pro
examples/qtconcurrent/runfunction/runfunction.pro
examples/qtconcurrent/wordcount/wordcount.pro
examples/qtestlib/qtestlib.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/framebuffer/framebuffer.pro
examples/qws/mousecalibration/mousecalibration.pro
examples/qws/simpledecoration/simpledecoration.pro
examples/qws/svgalib/svgalib.pro
examples/richtext/calendar/calendar.pro
examples/richtext/orderform/orderform.pro
examples/richtext/richtext.pro
examples/richtext/syntaxhighlighter/syntaxhighlighter.pro
examples/sql/sql.pro
examples/statemachine/eventtransitions/eventtransitions.pro
examples/statemachine/rogue/rogue.pro
examples/statemachine/trafficlight/trafficlight.pro
examples/statemachine/twowaybutton/twowaybutton.pro
examples/threads/mandelbrot/mandelbrot.pro
examples/threads/queuedcustomtype/queuedcustomtype.pro
examples/threads/threads.pro
examples/tools/codecs/codecs.pro
examples/tools/completer/completer.pro
examples/tools/contiguouscache/contiguouscache.pro
examples/tools/customcompleter/customcompleter.pro
examples/tools/customtype/customtype.pro
examples/tools/customtypesending/customtypesending.pro
examples/tools/echoplugin/echoplugin.pro
examples/tools/echoplugin/echowindow/echowindow.pro
examples/tools/echoplugin/plugin/plugin.pro
examples/tools/i18n/i18n.pro
examples/tools/inputpanel/inputpanel.pro
examples/tools/plugandpaint/plugandpaint.pro
examples/tools/plugandpaintplugins/basictools/basictools.pro
examples/tools/plugandpaintplugins/extrafilters/extrafilters.pro
examples/tools/plugandpaintplugins/plugandpaintplugins.pro
examples/tools/regexp/regexp.pro
examples/tools/settingseditor/settingseditor.pro
examples/tools/styleplugin/plugin/plugin.pro
examples/tools/styleplugin/styleplugin.pro
examples/tools/styleplugin/stylewindow/stylewindow.pro
examples/tools/tools.pro
examples/tools/treemodelcompleter/treemodelcompleter.pro
examples/tools/undoframework/undoframework.pro
examples/touch/dials/dials.pro
examples/touch/fingerpaint/fingerpaint.pro
examples/touch/knobs/knobs.pro
examples/touch/pinchzoom/pinchzoom.pro
examples/tutorials/addressbook-fr/addressbook-fr.pro
examples/tutorials/addressbook-fr/part1/part1.pro
examples/tutorials/addressbook-fr/part2/part2.pro
examples/tutorials/addressbook-fr/part3/part3.pro
examples/tutorials/addressbook-fr/part4/part4.pro
examples/tutorials/addressbook-fr/part5/part5.pro
examples/tutorials/addressbook-fr/part6/part6.pro
examples/tutorials/addressbook-fr/part7/part7.pro
examples/tutorials/addressbook/addressbook.pro
examples/tutorials/addressbook/part1/part1.pro
examples/tutorials/addressbook/part2/part2.pro
examples/tutorials/addressbook/part3/part3.pro
examples/tutorials/addressbook/part4/part4.pro
examples/tutorials/addressbook/part5/part5.pro
examples/tutorials/addressbook/part6/part6.pro
examples/tutorials/addressbook/part7/part7.pro
examples/tutorials/modelview/1_readonly/1_readonly.pro
examples/tutorials/modelview/2_formatting/2_formatting.pro
examples/tutorials/modelview/3_changingmodel/3_changingmodel.pro
examples/tutorials/modelview/4_headers/4_headers.pro
examples/tutorials/modelview/5_edit/5_edit.pro
examples/tutorials/modelview/6_treeview/6_treeview.pro
examples/tutorials/modelview/7_selections/7_selections.pro
examples/tutorials/modelview/modelview.pro
examples/tutorials/widgets/childwidget/childwidget.pro
examples/tutorials/widgets/nestedlayouts/nestedlayouts.pro
examples/tutorials/widgets/toplevel/toplevel.pro
examples/tutorials/widgets/windowlayout/windowlayout.pro
examples/uitools/multipleinheritance/multipleinheritance.pro
examples/uitools/textfinder/textfinder.pro
examples/uitools/uitools.pro
examples/widgets/analogclock/analogclock.pro
examples/widgets/calculator/calculator.pro
examples/widgets/calendarwidget/calendarwidget.pro
examples/widgets/charactermap/charactermap.pro
examples/widgets/codeeditor/codeeditor.pro
examples/widgets/digitalclock/digitalclock.pro
examples/widgets/groupbox/groupbox.pro
examples/widgets/icons/icons.pro
examples/widgets/imageviewer/imageviewer.pro
examples/widgets/lineedits/lineedits.pro
examples/widgets/movie/movie.pro
examples/widgets/scribble/scribble.pro
examples/widgets/shapedclock/shapedclock.pro
examples/widgets/sliders/sliders.pro
examples/widgets/softkeys/softkeys.pro
examples/widgets/spinboxes/spinboxes.pro
examples/widgets/styles/styles.pro
examples/widgets/stylesheet/stylesheet.pro
examples/widgets/tablet/tablet.pro
examples/widgets/tetrix/tetrix.pro
examples/widgets/tooltips/tooltips.pro
examples/widgets/validators/validators.pro
examples/widgets/widgets.pro
examples/widgets/windowflags/windowflags.pro
examples/xml/xml.pro
mkspecs/qws/freebsd-generic-g++/qplatformdefs.h
mkspecs/qws/linux-arm-g++/qplatformdefs.h
mkspecs/qws/linux-arm-gnueabi-g++/qplatformdefs.h
mkspecs/qws/linux-armv6-g++/qplatformdefs.h
mkspecs/qws/linux-avr32-g++/qplatformdefs.h
mkspecs/qws/linux-cellon-g++/qplatformdefs.h
mkspecs/qws/linux-dm7000-g++/qplatformdefs.h
mkspecs/qws/linux-dm800-g++/qplatformdefs.h
mkspecs/qws/linux-generic-g++-32/qplatformdefs.h
mkspecs/qws/linux-generic-g++/qplatformdefs.h
mkspecs/qws/linux-ipaq-g++/qplatformdefs.h
mkspecs/qws/linux-lsb-g++/qplatformdefs.h
mkspecs/qws/linux-mips-g++/qplatformdefs.h
mkspecs/qws/linux-nacl-g++/qplatformdefs.h
mkspecs/qws/linux-powerpc-g++/qplatformdefs.h
mkspecs/qws/linux-sh-g++/qplatformdefs.h
mkspecs/qws/linux-sh4al-g++/qplatformdefs.h
mkspecs/qws/linux-sharp-g++/qplatformdefs.h
mkspecs/qws/linux-x86-g++/qplatformdefs.h
mkspecs/qws/linux-x86_64-g++/qplatformdefs.h
mkspecs/qws/linux-zylonite-g++/qplatformdefs.h
mkspecs/qws/macx-generic-g++/qplatformdefs.h
mkspecs/qws/macx-iphonedevice-g++/qplatformdefs.h
mkspecs/qws/macx-iphonesimulator-g++/qplatformdefs.h
mkspecs/qws/macx-nacl-g++/qplatformdefs.h
mkspecs/qws/solaris-generic-g++/qplatformdefs.h
src/gui/dialogs/qprintdialog_qws.cpp
src/gui/egl/qegl_qws.cpp
src/gui/embedded/qcopchannel_qws.cpp
src/gui/embedded/qcopchannel_qws.h
src/gui/embedded/qdecoration_qws.cpp
src/gui/embedded/qdecoration_qws.h
src/gui/embedded/qdecorationdefault_qws.cpp
src/gui/embedded/qdecorationdefault_qws.h
src/gui/embedded/qdecorationfactory_qws.cpp
src/gui/embedded/qdecorationfactory_qws.h
src/gui/embedded/qdecorationplugin_qws.cpp
src/gui/embedded/qdecorationplugin_qws.h
src/gui/embedded/qdecorationstyled_qws.cpp
src/gui/embedded/qdecorationstyled_qws.h
src/gui/embedded/qdecorationwindows_qws.cpp
src/gui/embedded/qdecorationwindows_qws.h
src/gui/embedded/qdirectpainter_qws.cpp
src/gui/embedded/qdirectpainter_qws.h
src/gui/embedded/qkbd_defaultmap_qws_p.h
src/gui/embedded/qkbd_qws.cpp
src/gui/embedded/qkbd_qws.h
src/gui/embedded/qkbd_qws_p.h
src/gui/embedded/qkbddriverfactory_qws.cpp
src/gui/embedded/qkbddriverfactory_qws.h
src/gui/embedded/qkbddriverplugin_qws.cpp
src/gui/embedded/qkbddriverplugin_qws.h
src/gui/embedded/qkbdintegrity_qws.cpp
src/gui/embedded/qkbdintegrity_qws.h
src/gui/embedded/qkbdlinuxinput_qws.cpp
src/gui/embedded/qkbdlinuxinput_qws.h
src/gui/embedded/qkbdqnx_qws.cpp
src/gui/embedded/qkbdqnx_qws.h
src/gui/embedded/qkbdtty_qws.cpp
src/gui/embedded/qkbdtty_qws.h
src/gui/embedded/qkbdum_qws.cpp
src/gui/embedded/qkbdum_qws.h
src/gui/embedded/qkbdvfb_qws.cpp
src/gui/embedded/qkbdvfb_qws.h
src/gui/embedded/qlock.cpp
src/gui/embedded/qlock_p.h
src/gui/embedded/qmouse_qws.cpp
src/gui/embedded/qmouse_qws.h
src/gui/embedded/qmousedriverfactory_qws.cpp
src/gui/embedded/qmousedriverfactory_qws.h
src/gui/embedded/qmousedriverplugin_qws.cpp
src/gui/embedded/qmousedriverplugin_qws.h
src/gui/embedded/qmouseintegrity_qws.cpp
src/gui/embedded/qmouseintegrity_qws.h
src/gui/embedded/qmouselinuxinput_qws.cpp
src/gui/embedded/qmouselinuxinput_qws.h
src/gui/embedded/qmouselinuxtp_qws.cpp
src/gui/embedded/qmouselinuxtp_qws.h
src/gui/embedded/qmousepc_qws.cpp
src/gui/embedded/qmousepc_qws.h
src/gui/embedded/qmouseqnx_qws.cpp
src/gui/embedded/qmouseqnx_qws.h
src/gui/embedded/qmousetslib_qws.cpp
src/gui/embedded/qmousetslib_qws.h
src/gui/embedded/qmousevfb_qws.cpp
src/gui/embedded/qmousevfb_qws.h
src/gui/embedded/qscreen_qws.cpp
src/gui/embedded/qscreen_qws.h
src/gui/embedded/qscreendriverfactory_qws.cpp
src/gui/embedded/qscreendriverfactory_qws.h
src/gui/embedded/qscreendriverplugin_qws.cpp
src/gui/embedded/qscreendriverplugin_qws.h
src/gui/embedded/qscreenintegrityfb_qws.cpp
src/gui/embedded/qscreenintegrityfb_qws.h
src/gui/embedded/qscreenlinuxfb_qws.cpp
src/gui/embedded/qscreenlinuxfb_qws.h
src/gui/embedded/qscreenmulti_qws.cpp
src/gui/embedded/qscreenmulti_qws_p.h
src/gui/embedded/qscreenproxy_qws.cpp
src/gui/embedded/qscreenproxy_qws.h
src/gui/embedded/qscreenqnx_qws.cpp
src/gui/embedded/qscreenqnx_qws.h
src/gui/embedded/qscreentransformed_qws.cpp
src/gui/embedded/qscreentransformed_qws.h
src/gui/embedded/qscreenvfb_qws.cpp
src/gui/embedded/qscreenvfb_qws.h
src/gui/embedded/qsoundqss_qws.cpp
src/gui/embedded/qsoundqss_qws.h
src/gui/embedded/qtransportauth_qws.cpp
src/gui/embedded/qtransportauth_qws.h
src/gui/embedded/qtransportauth_qws_p.h
src/gui/embedded/qtransportauthdefs_qws.h
src/gui/embedded/qunixsocket.cpp
src/gui/embedded/qunixsocket_p.h
src/gui/embedded/qunixsocketserver.cpp
src/gui/embedded/qunixsocketserver_p.h
src/gui/embedded/qvfbhdr.h
src/gui/embedded/qwindowsystem_p.h
src/gui/embedded/qwindowsystem_qws.cpp
src/gui/embedded/qwindowsystem_qws.h
src/gui/embedded/qwscommand_qws.cpp
src/gui/embedded/qwscommand_qws_p.h
src/gui/embedded/qwscursor_qws.cpp
src/gui/embedded/qwsdisplay_qws.h
src/gui/embedded/qwsdisplay_qws_p.h
src/gui/embedded/qwsembedwidget.cpp
src/gui/embedded/qwsevent_qws.cpp
src/gui/embedded/qwsevent_qws.h
src/gui/embedded/qwslock.cpp
src/gui/embedded/qwslock_p.h
src/gui/embedded/qwsmanager_p.h
src/gui/embedded/qwsmanager_qws.cpp
src/gui/embedded/qwsmanager_qws.h
src/gui/embedded/qwsproperty_qws.cpp
src/gui/embedded/qwsproperty_qws.h
src/gui/embedded/qwsprotocolitem_qws.h
src/gui/embedded/qwssharedmemory.cpp
src/gui/embedded/qwssharedmemory_p.h
src/gui/embedded/qwssignalhandler.cpp
src/gui/embedded/qwssignalhandler_p.h
src/gui/embedded/qwssocket_qws.cpp
src/gui/embedded/qwssocket_qws.h
src/gui/embedded/qwsutils_qws.h
src/gui/image/qpixmap_qws.cpp
src/gui/inputmethod/qwsinputcontext_p.h
src/gui/inputmethod/qwsinputcontext_qws.cpp
src/gui/kernel/qapplication_qpa.cpp
src/gui/kernel/qapplication_qws.cpp
src/gui/kernel/qclipboard_qws.cpp
src/gui/kernel/qcursor_qws.cpp
src/gui/kernel/qdesktopwidget_qws.cpp
src/gui/kernel/qeventdispatcher_glib_qws.cpp
src/gui/kernel/qeventdispatcher_glib_qws_p.h
src/gui/kernel/qeventdispatcher_qws.cpp
src/gui/kernel/qeventdispatcher_qws_p.h
src/gui/kernel/qplatformintegration_qpa.cpp
src/gui/kernel/qplatformwindowformat_qpa.cpp
src/gui/kernel/qplatformwindowformat_qpa.h
src/gui/kernel/qsessionmanager_qws.cpp
src/gui/kernel/qsound_qws.cpp
src/gui/kernel/qwidget_qws.cpp
src/gui/painting/qcolormap_qws.cpp
src/gui/painting/qgraphicssystem.cpp
src/gui/painting/qgraphicssystem_mac.cpp
src/gui/painting/qgraphicssystem_mac_p.h
src/gui/painting/qgraphicssystem_p.h
src/gui/painting/qgraphicssystem_qws.cpp
src/gui/painting/qgraphicssystem_qws_p.h
src/gui/painting/qgraphicssystem_raster.cpp
src/gui/painting/qgraphicssystem_raster_p.h
src/gui/painting/qgraphicssystem_runtime.cpp
src/gui/painting/qgraphicssystem_runtime_p.h
src/gui/painting/qgraphicssystemfactory.cpp
src/gui/painting/qgraphicssystemfactory_p.h
src/gui/painting/qgraphicssystemplugin.cpp
src/gui/painting/qgraphicssystemplugin_p.h
src/gui/painting/qpaintdevice_x11.cpp
src/gui/painting/qprintengine_ps.cpp
src/gui/painting/qprintengine_ps_p.h
src/gui/painting/qprintengine_qws.cpp
src/gui/painting/qprintengine_qws_p.h
src/gui/painting/qregion_qws.cpp
src/gui/painting/qunifiedtoolbarsurface_mac.cpp
src/gui/painting/qunifiedtoolbarsurface_mac_p.h
src/gui/painting/qwindowsurface_mac.cpp
src/gui/painting/qwindowsurface_qws.cpp
src/gui/painting/qwindowsurface_qws_p.h
src/gui/painting/qwindowsurface_raster.cpp
src/gui/painting/qwindowsurface_raster_p.h
src/gui/painting/qwindowsurface_s60.cpp
src/gui/painting/qwindowsurface_s60_p.h
src/gui/painting/qwindowsurface_x11.cpp
src/gui/painting/qwindowsurface_x11_p.h
src/gui/painting/qwmatrix.h
src/gui/text/qabstractfontengine_qws.cpp
src/gui/text/qabstractfontengine_qws.h
src/gui/text/qfont_qws.cpp
src/gui/text/qfontdatabase_qws.cpp
src/gui/text/qfontengine_qws.cpp
src/opengl/qgl_qpa.cpp
src/opengl/qgl_qws.cpp
src/opengl/qglscreen_qws.cpp
src/opengl/qglscreen_qws.h
src/opengl/qglwindowsurface_qws.cpp
src/opengl/qgraphicssystem_gl.cpp
src/opengl/qgraphicssystem_gl_p.h
src/openvg/qpaintengine_vg.cpp
src/openvg/qpaintengine_vg_p.h
src/openvg/qpixmapdata_vg.cpp
src/openvg/qpixmapdata_vg_p.h
src/openvg/qpixmapfilter_vg.cpp
src/openvg/qpixmapfilter_vg_p.h
src/openvg/qvg.h
src/openvg/qvg_p.h
src/openvg/qvg_symbian.cpp
src/openvg/qvgcompositionhelper_p.h
src/openvg/qvgfontglyphcache_p.h
src/openvg/qvgimagepool.cpp
src/openvg/qvgimagepool_p.h
src/openvg/qwindowsurface_vg.cpp
src/openvg/qwindowsurface_vg_p.h
src/openvg/qwindowsurface_vgegl.cpp
src/openvg/qwindowsurface_vgegl_p.h
src/plugins/decorations/default/main.cpp
src/plugins/decorations/styled/main.cpp
src/plugins/decorations/windows/main.cpp
src/plugins/gfxdrivers/ahi/qscreenahi_qws.cpp
src/plugins/gfxdrivers/ahi/qscreenahi_qws.h
src/plugins/gfxdrivers/ahi/qscreenahiplugin.cpp
src/plugins/gfxdrivers/directfb/qdirectfbkeyboard.cpp
src/plugins/gfxdrivers/directfb/qdirectfbkeyboard.h
src/plugins/gfxdrivers/directfb/qdirectfbmouse.cpp
src/plugins/gfxdrivers/directfb/qdirectfbmouse.h
src/plugins/gfxdrivers/directfb/qdirectfbpaintdevice.cpp
src/plugins/gfxdrivers/directfb/qdirectfbpaintdevice.h
src/plugins/gfxdrivers/directfb/qdirectfbpaintengine.cpp
src/plugins/gfxdrivers/directfb/qdirectfbpaintengine.h
src/plugins/gfxdrivers/directfb/qdirectfbpixmap.cpp
src/plugins/gfxdrivers/directfb/qdirectfbpixmap.h
src/plugins/gfxdrivers/directfb/qdirectfbscreen.cpp
src/plugins/gfxdrivers/directfb/qdirectfbscreen.h
src/plugins/gfxdrivers/directfb/qdirectfbscreenplugin.cpp
src/plugins/gfxdrivers/directfb/qdirectfbwindowsurface.cpp
src/plugins/gfxdrivers/directfb/qdirectfbwindowsurface.h
src/plugins/gfxdrivers/eglnullws/eglnullwsscreen.cpp
src/plugins/gfxdrivers/eglnullws/eglnullwsscreen.h
src/plugins/gfxdrivers/eglnullws/eglnullwsscreenplugin.cpp
src/plugins/gfxdrivers/eglnullws/eglnullwsscreenplugin.h
src/plugins/gfxdrivers/eglnullws/eglnullwswindowsurface.cpp
src/plugins/gfxdrivers/eglnullws/eglnullwswindowsurface.h
src/plugins/gfxdrivers/linuxfb/main.cpp
src/plugins/gfxdrivers/powervr/QWSWSEGL/pvrqwsdrawable.c
src/plugins/gfxdrivers/powervr/QWSWSEGL/pvrqwsdrawable.h
src/plugins/gfxdrivers/powervr/QWSWSEGL/pvrqwsdrawable_p.h
src/plugins/gfxdrivers/powervr/QWSWSEGL/pvrqwswsegl.c
src/plugins/gfxdrivers/powervr/pvreglscreen/pvreglscreen.cpp
src/plugins/gfxdrivers/powervr/pvreglscreen/pvreglscreen.h
src/plugins/gfxdrivers/powervr/pvreglscreen/pvreglscreenplugin.cpp
src/plugins/gfxdrivers/powervr/pvreglscreen/pvreglwindowsurface.cpp
src/plugins/gfxdrivers/powervr/pvreglscreen/pvreglwindowsurface.h
src/plugins/gfxdrivers/qvfb/main.cpp
src/plugins/gfxdrivers/transformed/main.cpp
src/plugins/gfxdrivers/vnc/main.cpp
src/plugins/gfxdrivers/vnc/qscreenvnc_p.h
src/plugins/gfxdrivers/vnc/qscreenvnc_qws.cpp
src/plugins/gfxdrivers/vnc/qscreenvnc_qws.h
src/plugins/graphicssystems/meego/dithering.cpp
src/plugins/graphicssystems/meego/qmeegoextensions.cpp
src/plugins/graphicssystems/meego/qmeegoextensions.h
src/plugins/graphicssystems/meego/qmeegographicssystem.cpp
src/plugins/graphicssystems/meego/qmeegographicssystem.h
src/plugins/graphicssystems/meego/qmeegographicssystemplugin.cpp
src/plugins/graphicssystems/meego/qmeegographicssystemplugin.h
src/plugins/graphicssystems/meego/qmeegolivepixmapdata.cpp
src/plugins/graphicssystems/meego/qmeegolivepixmapdata.h
src/plugins/graphicssystems/meego/qmeegopixmapdata.cpp
src/plugins/graphicssystems/meego/qmeegopixmapdata.h
src/plugins/graphicssystems/meego/qmeegorasterpixmapdata.cpp
src/plugins/graphicssystems/opengl/main.cpp
src/plugins/graphicssystems/openvg/qgraphicssystem_vg.cpp
src/plugins/graphicssystems/openvg/qgraphicssystem_vg_p.h
src/plugins/graphicssystems/shivavg/main.cpp
src/plugins/graphicssystems/shivavg/shivavggraphicssystem.cpp
src/plugins/graphicssystems/shivavg/shivavggraphicssystem.h
src/plugins/graphicssystems/shivavg/shivavgwindowsurface.cpp
src/plugins/graphicssystems/shivavg/shivavgwindowsurface.h
src/plugins/graphicssystems/trace/main.cpp
src/plugins/graphicssystems/trace/qgraphicssystem_trace.cpp
src/plugins/graphicssystems/trace/qgraphicssystem_trace_p.h
src/plugins/kbddrivers/linuxinput/main.cpp
src/plugins/mousedrivers/linuxtp/main.cpp
src/plugins/mousedrivers/pc/main.cpp
src/plugins/mousedrivers/tslib/main.cpp
src/widgets/kernel/qwidget_qpa.cpp
2011-05-24 15:22:06 +02:00
Jyri Tahtela
f9f395c28b
Update licenseheader text in source files for qtbase Qt module
...
Updated version of LGPL and FDL licenseheaders.
Apply release phase licenseheaders for all source files.
Reviewed-by: Trust Me
2011-05-24 12:34:08 +03:00
David Boddie
0748751c9f
Squashed commit of the changes from the mobile-examples repository
...
(4.7-generated-declarative branch).
2011-05-23 14:24:07 +02:00
Morten Sorvig
e0e696dd05
Remove QMAKE_MACOS_DEPLOYMENT_TARGET.
...
Not needed any more, 10.5 and up supports setting
the deployment target/minimum version on the
compiler command line.
2011-05-19 09:18:46 +02:00
Rohan McGovern
152a10012c
Ensure that recursive QMAKE_EXTRA_TARGETS use the correct makefile
...
Recursive QMAKE_EXTRA_TARGETS were omitting the `-f' option to make.
This would break in the case where the correct makefile was not named
`Makefile'. The included autotest demonstrates the problem.
Note that this was fixed for normal targets back in 2005
by faac7bd178654fd67a6f3f9cf4f6f2605071448d (p4 202370), but was not
fixed for extra targets.
Reviewed-by: ossi
(cherry picked from commit 96a3bf7a8bbc1e5361e16cbeeceb4be674b88c30)
2011-05-13 08:59:43 +10:00
Oswald Buddenhagen
c1077e9fb6
don't ignore create_prl for static plugins
...
Task-number: QTBUG-18436
Reviewed-by: joerg
(cherry picked from commit 2ca4ce848c63c9fa0a48c0f9f4e7fdbc90463bf1)
2011-05-11 16:39:47 +02:00
Christian Kandeler
bc88f528dc
qmake: Introduce new template type
...
The template type "aux" is intended for projects that do not require building anything, but may need to install stuff (e.g. applications with QML entry point).
Reviewed-by: Joerg Bornemann
(cherry picked from commit 56443421cb5e537e60abd7ced42c9ebf587683fe)
2011-05-10 12:54:55 +02:00
Marius Storm-Olsen
9fe4482de1
Fix Makefile subtargets
...
Commit c04b7a55d1
2011-05-07 03:19:51 +00:00
Joerg Bornemann
61e6639c82
qmake vc(x)proj generator: support x64 Qt builds
...
Task-number: QTBUG-17911
Reviewed-by: ossi
2011-05-06 11:50:15 +02:00
Joerg Bornemann
c6fc5395ad
qmake: remove dead code from VcxprojGenerator
...
Reviewed-by: ossi
2011-05-06 11:50:03 +02:00
Joerg Bornemann
c04b7a55d1
qmake nmake generator: pass MAKEFLAGS to sub-make calls
...
Unlike other make tools nmake doesn't do this automatically.
Reviewed-by: ossi
2011-05-03 13:31:12 +02:00
Marius Storm-Olsen
1287361f64
Move private headers into versioned subdirectory
...
This will allow us to expose private headers in a controlled manner,
and ensure that they are not used by accident. This also means that
we internally will have to enable the private headers for the
modules we wish to use in the project.
2011-05-02 15:30:08 +02:00
Marius Storm-Olsen
bd06459179
Make qmake respect <subdir>.CONFIG = no_default_install
...
It already respects no_default_target
2011-04-27 12:05:58 +02:00
Marius Storm-Olsen
bca5a5d6f6
Add resolve_depends(var, prefix) function to qmake
...
This function calculates the topological order of variables.
We will use it to determine which and in what order to link
module libraries.
The function is not tied to libraries/modules only, but requires
the variables to be ordered to have their dependencies in the
[prefix]<var>.depends subvariable.
Due to the recursive nature of the algorithm it was just much easier
to implement it directly in C++ rather than in a qmake-language
function.
2011-04-27 12:05:46 +02:00
Qt by Nokia
38be0d1383
Initial import from the monolithic Qt.
...
This is the beginning of revision history for this module. If you
want to look at revision history older than this, please refer to the
Qt Git wiki for how to use Git history grafting. At the time of
writing, this wiki is located here:
http://qt.gitorious.org/qt/pages/GitIntroductionWithQt
If you have already performed the grafting and you don't see any
history beyond this commit, try running "git log" with the "--follow"
argument.
Branched from the monolithic repo, Qt master branch, at commit
896db169ea224deb96c59ce8af800d019de63f12
2011-04-27 12:05:43 +02:00
