summaryrefslogtreecommitdiffstats
path: root/configure
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into ↵Martin Jones2009-09-081-2/+2
|\ | | | | | | kinetic-declarativeui
| * Merge branch '4.5' into 4.6Rohan McGovern2009-09-071-2/+2
| |\
| | * Fixed compile on Solaris.Rohan McGovern2009-09-071-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The `test' builtin in Solaris' /bin/sh does not understand `-e', use `-f' instead. Fixes: configure: test: argument expected Note, using the `-nokia-developer' configure option hides this breakage. Reviewed-by: Rhys Weatherley
* | | Merge commit 'qt/4.6' into kinetic-declarativeuiBjørn Erik Nilsen2009-09-031-9/+40
|\ \ \ | |/ /
| * | Merge branch '4.5' into 4.6Thiago Macieira2009-09-031-9/+40
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/src/frameworks-technologies/dbus-adaptors.qdoc doc/src/qtdbus.qdoc src/gui/accessible/qaccessible_mac_cocoa.mm src/gui/kernel/qapplication_win.cpp src/xmlpatterns/parser/createTokenLookup.sh tests/auto/linguist/lupdate/testdata/good/merge_versions/project.ui tests/auto/linguist/lupdate/testdata/good/mergeui/project.ui tests/auto/linguist/lupdate/testdata/good/parseui/project.ui tests/auto/runQtXmlPatternsTests.sh tests/auto/test.pl tests/auto/uic/baseline/batchtranslation.ui tests/auto/uic/baseline/batchtranslation.ui.h tests/auto/uic/baseline/config.ui tests/auto/uic/baseline/config.ui.h tests/auto/uic/baseline/finddialog.ui tests/auto/uic/baseline/finddialog.ui.h tests/auto/uic/baseline/formwindowsettings.ui tests/auto/uic/baseline/formwindowsettings.ui.h tests/auto/uic/baseline/helpdialog.ui tests/auto/uic/baseline/helpdialog.ui.h tests/auto/uic/baseline/listwidgeteditor.ui tests/auto/uic/baseline/listwidgeteditor.ui.h tests/auto/uic/baseline/mainwindowbase.ui tests/auto/uic/baseline/mainwindowbase.ui.h tests/auto/uic/baseline/newactiondialog.ui tests/auto/uic/baseline/newactiondialog.ui.h tests/auto/uic/baseline/newform.ui tests/auto/uic/baseline/newform.ui.h tests/auto/uic/baseline/orderdialog.ui tests/auto/uic/baseline/orderdialog.ui.h tests/auto/uic/baseline/paletteeditor.ui tests/auto/uic/baseline/paletteeditor.ui.h tests/auto/uic/baseline/paletteeditoradvancedbase.ui tests/auto/uic/baseline/paletteeditoradvancedbase.ui.h tests/auto/uic/baseline/phrasebookbox.ui tests/auto/uic/baseline/phrasebookbox.ui.h tests/auto/uic/baseline/plugindialog.ui tests/auto/uic/baseline/plugindialog.ui.h tests/auto/uic/baseline/previewwidget.ui tests/auto/uic/baseline/previewwidget.ui.h tests/auto/uic/baseline/previewwidgetbase.ui tests/auto/uic/baseline/previewwidgetbase.ui.h tests/auto/uic/baseline/qfiledialog.ui tests/auto/uic/baseline/qfiledialog.ui.h tests/auto/uic/baseline/qtgradientdialog.ui tests/auto/uic/baseline/qtgradientdialog.ui.h tests/auto/uic/baseline/qtgradientviewdialog.ui tests/auto/uic/baseline/qtgradientviewdialog.ui.h tests/auto/uic/baseline/saveformastemplate.ui tests/auto/uic/baseline/saveformastemplate.ui.h tests/auto/uic/baseline/statistics.ui tests/auto/uic/baseline/statistics.ui.h tests/auto/uic/baseline/stringlisteditor.ui tests/auto/uic/baseline/stringlisteditor.ui.h tests/auto/uic/baseline/tabbedbrowser.ui tests/auto/uic/baseline/tabbedbrowser.ui.h tests/auto/uic/baseline/tablewidgeteditor.ui tests/auto/uic/baseline/tablewidgeteditor.ui.h tests/auto/uic/baseline/translatedialog.ui tests/auto/uic/baseline/translatedialog.ui.h tests/auto/uic/baseline/treewidgeteditor.ui tests/auto/uic/baseline/treewidgeteditor.ui.h tests/auto/uic/baseline/trpreviewtool.ui tests/auto/uic/baseline/trpreviewtool.ui.h tests/auto/uic3/baseline/about.ui tests/auto/uic3/baseline/about.ui.4 tests/auto/uic3/baseline/actioneditor.ui tests/auto/uic3/baseline/actioneditor.ui.4 tests/auto/uic3/baseline/config.ui tests/auto/uic3/baseline/config.ui.4 tests/auto/uic3/baseline/configtoolboxdialog.ui tests/auto/uic3/baseline/configtoolboxdialog.ui.4 tests/auto/uic3/baseline/connectiondialog.ui tests/auto/uic3/baseline/connectiondialog.ui.4 tests/auto/uic3/baseline/createtemplate.ui tests/auto/uic3/baseline/createtemplate.ui.4 tests/auto/uic3/baseline/customwidgeteditor.ui tests/auto/uic3/baseline/customwidgeteditor.ui.4 tests/auto/uic3/baseline/dbconnection.ui tests/auto/uic3/baseline/dbconnection.ui.4 tests/auto/uic3/baseline/dbconnectioneditor.ui tests/auto/uic3/baseline/dbconnectioneditor.ui.4 tests/auto/uic3/baseline/dbconnections.ui tests/auto/uic3/baseline/dbconnections.ui.4 tests/auto/uic3/baseline/editfunctions.ui tests/auto/uic3/baseline/editfunctions.ui.4 tests/auto/uic3/baseline/finddialog.ui tests/auto/uic3/baseline/finddialog.ui.4 tests/auto/uic3/baseline/formsettings.ui tests/auto/uic3/baseline/formsettings.ui.4 tests/auto/uic3/baseline/gotolinedialog.ui tests/auto/uic3/baseline/gotolinedialog.ui.4 tests/auto/uic3/baseline/helpdialog.ui tests/auto/uic3/baseline/helpdialog.ui.4 tests/auto/uic3/baseline/iconvieweditor.ui tests/auto/uic3/baseline/iconvieweditor.ui.4 tests/auto/uic3/baseline/listboxeditor.ui tests/auto/uic3/baseline/listboxeditor.ui.4 tests/auto/uic3/baseline/listeditor.ui tests/auto/uic3/baseline/listeditor.ui.4 tests/auto/uic3/baseline/listvieweditor.ui tests/auto/uic3/baseline/listvieweditor.ui.4 tests/auto/uic3/baseline/mainfilesettings.ui tests/auto/uic3/baseline/mainfilesettings.ui.4 tests/auto/uic3/baseline/mainwindowbase.ui tests/auto/uic3/baseline/mainwindowbase.ui.4 tests/auto/uic3/baseline/mainwindowwizard.ui tests/auto/uic3/baseline/mainwindowwizard.ui.4 tests/auto/uic3/baseline/multilineeditor.ui tests/auto/uic3/baseline/multilineeditor.ui.4 tests/auto/uic3/baseline/newform.ui tests/auto/uic3/baseline/newform.ui.4 tests/auto/uic3/baseline/paletteeditor.ui tests/auto/uic3/baseline/paletteeditor.ui.4 tests/auto/uic3/baseline/paletteeditoradvanced.ui tests/auto/uic3/baseline/paletteeditoradvanced.ui.4 tests/auto/uic3/baseline/paletteeditoradvancedbase.ui tests/auto/uic3/baseline/paletteeditoradvancedbase.ui.4 tests/auto/uic3/baseline/pixmapcollectioneditor.ui tests/auto/uic3/baseline/pixmapcollectioneditor.ui.4 tests/auto/uic3/baseline/pixmapfunction.ui tests/auto/uic3/baseline/pixmapfunction.ui.4 tests/auto/uic3/baseline/preferences.ui tests/auto/uic3/baseline/preferences.ui.4 tests/auto/uic3/baseline/previewwidget.ui tests/auto/uic3/baseline/previewwidget.ui.4 tests/auto/uic3/baseline/previewwidgetbase.ui tests/auto/uic3/baseline/previewwidgetbase.ui.4 tests/auto/uic3/baseline/projectsettings.ui tests/auto/uic3/baseline/projectsettings.ui.4 tests/auto/uic3/baseline/replacedialog.ui tests/auto/uic3/baseline/replacedialog.ui.4 tests/auto/uic3/baseline/richtextfontdialog.ui tests/auto/uic3/baseline/richtextfontdialog.ui.4 tests/auto/uic3/baseline/settingsdialog.ui tests/auto/uic3/baseline/settingsdialog.ui.4 tests/auto/uic3/baseline/sqlformwizard.ui tests/auto/uic3/baseline/sqlformwizard.ui.4 tests/auto/uic3/baseline/startdialog.ui tests/auto/uic3/baseline/startdialog.ui.4 tests/auto/uic3/baseline/statistics.ui tests/auto/uic3/baseline/statistics.ui.4 tests/auto/uic3/baseline/tabbedbrowser.ui tests/auto/uic3/baseline/tabbedbrowser.ui.4 tests/auto/uic3/baseline/tableeditor.ui tests/auto/uic3/baseline/tableeditor.ui.4 tests/auto/uic3/baseline/topicchooser.ui tests/auto/uic3/baseline/topicchooser.ui.4 tests/auto/uic3/baseline/variabledialog.ui tests/auto/uic3/baseline/variabledialog.ui.4 tests/auto/uic3/baseline/wizardeditor.ui.4 tests/auto/uiloader/baseline/batchtranslation.ui tests/auto/uiloader/baseline/config.ui tests/auto/uiloader/baseline/finddialog.ui tests/auto/uiloader/baseline/formwindowsettings.ui tests/auto/uiloader/baseline/helpdialog.ui tests/auto/uiloader/baseline/listwidgeteditor.ui tests/auto/uiloader/baseline/mainwindowbase.ui tests/auto/uiloader/baseline/newactiondialog.ui tests/auto/uiloader/baseline/newform.ui tests/auto/uiloader/baseline/orderdialog.ui tests/auto/uiloader/baseline/paletteeditor.ui tests/auto/uiloader/baseline/paletteeditoradvancedbase.ui tests/auto/uiloader/baseline/phrasebookbox.ui tests/auto/uiloader/baseline/plugindialog.ui tests/auto/uiloader/baseline/previewwidget.ui tests/auto/uiloader/baseline/previewwidgetbase.ui tests/auto/uiloader/baseline/qfiledialog.ui tests/auto/uiloader/baseline/qtgradientdialog.ui tests/auto/uiloader/baseline/qtgradienteditor.ui tests/auto/uiloader/baseline/qtgradientviewdialog.ui tests/auto/uiloader/baseline/saveformastemplate.ui tests/auto/uiloader/baseline/statistics.ui tests/auto/uiloader/baseline/stringlisteditor.ui tests/auto/uiloader/baseline/tabbedbrowser.ui tests/auto/uiloader/baseline/tablewidgeteditor.ui tests/auto/uiloader/baseline/translatedialog.ui tests/auto/uiloader/baseline/treewidgeteditor.ui tests/auto/uiloader/baseline/trpreviewtool.ui tools/assistant/compat/mainwindow.cpp tools/assistant/tools/assistant/mainwindow.cpp tools/designer/src/designer/versiondialog.cpp tools/linguist/linguist/mainwindow.cpp tools/linguist/shared/make-qscript.sh tools/qdbus/qdbusviewer/qdbusviewer.cpp
| | * Update license headers.Jason McDonald2009-09-021-9/+40
| | | | | | | | | | | | Reviewed-by: Trust Me
* | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into ↵Michael Brasser2009-09-011-6/+12
|\ \ \ | |/ / | | | | | | kinetic-declarativeui
| * | Add directfb to CFG_GFX_AVAILABLEAnders Bakken2009-09-011-1/+1
| | | | | | | | | | | | | | | | | | | | | This is a first step in making it possible to build DirectFB as part of QtGui. Reviewed-by: Thiago Macieira <thiago.macieira@nokia.com>
| * | Merge branch '4.5' into 4.6Thiago Macieira2009-09-011-1/+2
| |\ \ | | |/ | | | | | | | | | Conflicts: examples/qws/dbscreen/dbscreen.cpp
| | * Fix Solaris build: test isn't test.Thiago Macieira2009-09-011-1/+2
| | | | | | | | | | | | | | | | | | configure: test: argument expected Reviewed-by: TrustMe
| * | Merge branch '4.5' into 4.6Thiago Macieira2009-09-011-5/+10
| |\ \ | | |/ | | | | | | | | | | | | | | | Conflicts: src/network/access/qnetworkaccessbackend.cpp src/network/access/qnetworkreplyimpl.cpp tests/auto/qabstractnetworkcache/tst_qabstractnetworkcache.cpp
| | * Make the existence of the LICENSE.GPL3 file optionalThiago Macieira2009-09-011-5/+10
| | | | | | | | | | | | | | | | | | | | | | | | The repository no longer carries this license. The final releases will still have it. In any case, the LGPLv2.1 is compatible with the GPLv3. Required-By: Nokia Legal Reviewed-by: Marius Storm-Olsen
| | * Eliminate some mentions of Trolltech.Jason McDonald2009-08-111-7/+7
| | | | | | | | | | | | Reviewed-by: Trust Me
* | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into ↵Michael Brasser2009-08-251-17/+82
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | kinetic-declarativeui Conflicts: configure configure.exe mkspecs/features/qt.prf tools/configure/configureapp.cpp
| * | Silence linkerSupportsFlag test output.Morten Sørvig2009-08-251-1/+1
| | |
| * | Integrate QAbstractVideoSurface API.Andrew den Exter2009-08-241-13/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This introduces a QAbstractVideoSurface interface for implementing arbitrary video outputs, and a QVideoFrame type. Also included is the QVideoSurfaceFormat class which is used to configure the input to a video surface, and the QAbstractVideoBuffer class which allows QVideoFrames to be constructed from non-native frame types. Reviewed-by: Dmytro Poplavskiy
| * | Fix configure's support for traditional bourne shells.Thiago Macieira2009-08-241-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | not allowed: for flag; do allowed: for flag do Don't ask me why. The semi-colon should stand for a newline... Reviewed-by: Carlos Duclos
| * | Don't try to use -rpath to support link-time library searching.Thiago Macieira2009-08-211-2/+0
| | | | | | | | | | | | | | | | | | This is breaking the MacOS X build because -rpath is a supported option, but it conflicts with others (namely -mmacosx-version-min=10.4). So it's causing the Mac build to fail.
| * | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtaxis2009-08-211-1/+1
| |\ \ | | | | | | | | | | | | | | | | Conflicts: src/corelib/io/qprocess.h
| | * | Oops: fix compilerSupportsFlag: must return $ret, not $?Thiago Macieira2009-08-211-1/+1
| | | |
| * | | Merge commit 'qt/master'Jason Barron2009-08-211-0/+35
| |\ \ \ | | |/ /
| | * | Fix linking to uninstalled libraries after LIBS_PRIVATE.Thiago Macieira2009-08-211-0/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On ELF systems, the static linker isn't allowed to find a linked library's dependencies using the -L flag. That means if you're linking lib or app X against a library A, and library A links against library B, then -L$QTDIR/lib won't apply to B. Before LIBS_PRIVATE, we had -lB, so it did apply. Now we need to find another solution. The solution is one of: a) install the libraries before linking anything against them b) set LD_LIBRARY_PATH c) set -rpath or -rpath-link Reviewed-by: TrustMe
| * | | Merge commit 'qt/master'Jason Barron2009-08-211-4/+35
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure.exe examples/examples.pro qmake/Makefile.unix qmake/Makefile.win32 qmake/Makefile.win32-g++ qmake/Makefile.win32-g++-sh qmake/qmake.pro src/script/api/qscriptable.h src/script/api/qscriptclasspropertyiterator.h src/script/api/qscriptcontext.h src/script/api/qscriptengineagent.cpp src/script/api/qscriptstring.cpp src/script/api/qscriptstring.h src/script/api/qscriptvalueiterator.cpp src/script/api/qscriptvalueiterator.h src/script/qscriptclass.cpp src/script/qscriptcontext.cpp src/script/qscriptengine.cpp src/script/qscriptengine_p.cpp src/script/qscriptvalue.cpp src/script/qscriptvalue_p.h src/script/qscriptvalueimplfwd_p.h src/script/script.pro src/src.pro tests/auto/auto.pro tests/auto/qscriptv8testsuite/tst_qscriptv8testsuite.cpp tools/configure/configureapp.cpp
| | * | only enable QtScript on platforms where WebKit can be builtKent Hansen2009-08-201-1/+1
| | | | | | | | | | | | | | | | | | | | QtScript needs to build JavaScriptCore (part of WebKit). If WebKit can't be built, we assume that JavaScriptCore can't be built.
| | * | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into ↵Kent Hansen2009-08-121-11/+19
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | qtscript-jsc-backend Conflicts: configure src/script/qscriptarray_p.h src/script/qscriptasm.cpp src/script/qscriptasm_p.h src/script/qscriptbuffer_p.h src/script/qscriptclass.cpp src/script/qscriptclassdata.cpp src/script/qscriptclassdata_p.h src/script/qscriptclassinfo_p.h src/script/qscriptclasspropertyiterator_p.h src/script/qscriptcompiler.cpp src/script/qscriptcompiler_p.h src/script/qscriptcontext_p.cpp src/script/qscriptcontext_p.h src/script/qscriptcontextfwd_p.h src/script/qscriptcontextinfo_p.h src/script/qscriptecmaarray.cpp src/script/qscriptecmaarray_p.h src/script/qscriptecmaboolean.cpp src/script/qscriptecmaboolean_p.h src/script/qscriptecmacore.cpp src/script/qscriptecmacore_p.h src/script/qscriptecmadate.cpp src/script/qscriptecmadate_p.h src/script/qscriptecmaerror.cpp src/script/qscriptecmaerror_p.h src/script/qscriptecmafunction.cpp src/script/qscriptecmafunction_p.h src/script/qscriptecmaglobal.cpp src/script/qscriptecmaglobal_p.h src/script/qscriptecmamath.cpp src/script/qscriptecmamath_p.h src/script/qscriptecmanumber.cpp src/script/qscriptecmanumber_p.h src/script/qscriptecmaobject.cpp src/script/qscriptecmaobject_p.h src/script/qscriptecmaregexp.cpp src/script/qscriptecmaregexp_p.h src/script/qscriptecmastring.cpp src/script/qscriptecmastring_p.h src/script/qscriptengine.cpp src/script/qscriptengine_p.cpp src/script/qscriptengine_p.h src/script/qscriptengineagent_p.h src/script/qscriptenginefwd_p.h src/script/qscriptextenumeration.cpp src/script/qscriptextenumeration_p.h src/script/qscriptextqobject.cpp src/script/qscriptextqobject_p.h src/script/qscriptextvariant.cpp src/script/qscriptextvariant_p.h src/script/qscriptfunction.cpp src/script/qscriptfunction_p.h src/script/qscriptgc_p.h src/script/qscriptglobals_p.h src/script/qscriptmember_p.h src/script/qscriptnameid_p.h src/script/qscriptnodepool_p.h src/script/qscriptobject_p.h src/script/qscriptobjectfwd_p.h src/script/qscriptprettypretty.cpp src/script/qscriptprettypretty_p.h src/script/qscriptsyntaxcheckresult_p.h src/script/qscriptvalue.cpp src/script/qscriptvalue_p.h src/script/qscriptvaluefwd_p.h src/script/qscriptvalueimpl.cpp src/script/qscriptvalueimpl_p.h src/script/qscriptvalueimplfwd_p.h src/script/qscriptvalueiteratorimpl.cpp src/script/qscriptvalueiteratorimpl_p.h
| | * | | add configure options for (not) building the QtScript moduleKent Hansen2009-08-071-4/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | -script (default) and -no-script. This means we can get rid of the SCRIPT feature from qfeatures, since it's now handled by the new configure variable. It also allows us to get rid of all the QT_NO_SCRIPT ifdefs from the source files, since qmake isn't going to include those files for compilation when you configure with -no-script. The QtScriptTools module will be disabled if the QtScript module is not built. You'll have to build the old QtScript back-end (will be made available in a separate package), then build the QtScriptTools module yourself. Reviewed-by: Simon Hausmann
| * | | | Removing "Project ERROR: s60main.pro is intended only for Symbian!"Alessandro Portale2009-08-131-0/+1
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | It happens during the configure phase on Non-Windows. When making Qt for S60 build on Linux, we may want to revert the change or have a different fix. Reviewed-By: Jason Barron
* | | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into ↵Michael Brasser2009-08-131-19/+67
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | kinetic-declarativeui Conflicts: configure configure.exe mkspecs/features/qt.prf src/corelib/global/qglobal.h src/corelib/kernel/qobject_p.h
| * | | Replace some mentions of Trolltech with more appropriate terms.Jason McDonald2009-08-121-7/+7
| | | | | | | | | | | | | | | | Reviewed-by: Trust Me
| * | | Allow make utilities other than "make"Harald Fernengel2009-08-111-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of hard coding "make", use "$MAKE". If $MAKE is not set, configure will export it for us when searching for "make". Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
| * | | Merge branch '4.5'Thiago Macieira2009-08-111-4/+10
| |\ \ \ | | |/ / | |/| / | | |/ | | | | | | Conflicts: configure tests/auto/moc/tst_moc.cpp
| | * Add functionality tests for XSync.Thiago Macieira2009-08-071-1/+35
| | | | | | | | | | | | | | | | | | | | | | | | It was reported to be auto-detected, but wasn't. Apparently, AIX 6's X11 doesn't have this. Reviewed-By: Denis Dzyubenko <denis.dzyubenko@nokia.com> (cherry picked from commit 0a63875d787e1b035ace2c76fa1d0de6329127d7)
| | * Avoid compiling imageformats if you configure with -no-lib*Marius Storm-Olsen2009-08-071-3/+9
| | | | | | | | | | | | | | | Task-number: 239108 Reviewed-by: Andy Shaw
| * | Merge AudioServices into mainline.Justin McPherson2009-08-051-1/+35
| | |
| * | Make Cocoa builds 64-bit by default on snow leopard.Morten Sorvig2009-08-041-8/+14
| | |
| * | Fix spelling error.Morten Sorvig2009-08-031-3/+3
| | |
* | | Merge branch 'master' of ../qt into kinetic-declarativeuiAaron Kennedy2009-07-301-12/+53
|\ \ \ | |/ / | | | | | | | | | Conflicts: src/gui/widgets/qlinecontrol_p.h
| * | Remove "no-stl" from the build key and add compatibility for old plugins.Thiago Macieira2009-07-291-10/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | STL support hasn't had binary compatibility effects for the entire lifetime of Qt 4, so it should never have been there. It is a legacy thing I am now correcting. When inspecting a plugin, remove the "no-stl" from its loaded build key. That indicates a pre-4.6 build, since now Qt no longer adds it to its own build keys. Note that you have to remove the 4.6 plugin cache from $HOME/.config/Trolltech.conf or the registry for this change to work (if you compile Qt with -no-stl). Otherwise, plugins that have already been scanned will fail to load. Reviewed-by: Bradley T. Hughes
| * | Port of Qt to QNXHarald Fernengel2009-07-291-2/+37
| | | | | | | | | | | | | | | | | | | | | | | | This makes Qt work on QNX 6.4. * no q3support, no phonon * no QSharedMemory, no QSystemSemaphore, no QProcess Reviewed-By: Robert Griebl
| * | Port of Qt to VxWorksRobert Griebl2009-07-291-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This makes Qt work on VxWorks 6.6+ in native (kernel) mode. * compiles with the WindRiver GNU toolchain (Linux only) * works with QWS (tested with the VNC driver only) * tested on PPC hardware and the x86 VxWorks simulator * no q3support, no phonon, no webkit * no QSharedMemory, no QSystemSemaphore, no QProcess * only one QApplication instance (flat address space) * filesystem support depends heavily on the quality of the native driver * QLibrary is just a dummy to make plugins work at all * qmake transparently creates VxWorks munching rules for static ctors * made auto-test cope with missing OS features A special note regarding the Q_FOREACH patch for dcc: when calling foreach(a,c) with c being a function returning a container, the compiler would generate 5 references to some labels (.LXXXX), which are not there (so the linker complains in the end). Seems like dcc doesn't really like the 'true ? 0 : <function call to get type>' statement Reviewed-By: Harald Fernengel
* | | Merge branch 'master' of ../qt into kinetic-declarativeuiAaron Kennedy2009-07-291-2/+4
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure.exe src/gui/graphicsview/qgraphicsitem.cpp src/gui/graphicsview/qgraphicsitem.h src/gui/graphicsview/qgraphicsitem_p.h src/gui/graphicsview/qgraphicsscene.cpp src/gui/widgets/qlineedit.cpp
| * | Re-disable QtConcurrent build with Sun CC 5.9.Thiago Macieira2009-07-241-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QtCore compiled, but of course that means very little since most of QtConcurrent's problems are in the template code, which isn't instantiated inside QtCore. Examples and tests all failed to build... I'm almost done getting it to work with that compiler, but it will take me a little more time. I'm refactoring a bit of the QtConcurrent code, so that things compile more smoothly, using partial template specialisation. To be on the safe side, re-disable for xlC 7 too.
| * | Qt/EL mouse and keyboard driver cleanup.Robert Griebl2009-07-231-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | * removed the vr41xx, yopy and sl5000 drivers (old PDAs) * removed the bus mouse driver (ISA days should be over) * renamed the LinuxIS mouse driver to LinuxInput (consistency with the key driver) * unified the LinuxInput mouse and key driver I/O handling Reviewed-By: Paul
* | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into ↵Aaron Kennedy2009-07-231-16/+103
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | kinetic-declarativeui Conflicts: configure configure.exe src/gui/kernel/qaction.h
| * | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtRhys Weatherley2009-07-221-15/+59
| |\ \
| | * | Use the configure script to enable/disable QtConcurrent and QtXmlPatternsThiago Macieira2009-07-211-13/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Using qglobal.h and checking the compiler version with the preprocessor has the side-effect that moc won't generate proper code since it doesn't know about the compiler version. Enable both modules under Sun CC 5.9 and IBM xlC 7.0.
| | * | Add code to the Unix configure script to get the xlC version numberThiago Macieira2009-07-211-2/+28
| | | |
| | * | Match the behavior of the Windows configure and allow the user to typeBenjamin C Meyer2009-07-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 'y' rather then 'yes' Merge-request: 945 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
| * | | Make "-graphicssystem openvg" select OpenVG as default graphics systemRhys Weatherley2009-07-221-0/+9
| |/ / | | | | | | | | | Reviewed-by: Lincoln Ramsay
| * | Add functionality tests for XSync.Thiago Macieira2009-07-161-1/+35
| | | | | | | | | | | | | | | | | | | | | It was reported to be auto-detected, but wasn't. Apparently, AIX 6's X11 doesn't have this. Reviewed-By: Denis Dzyubenko <denis.dzyubenko@nokia.com>
generated by cgit v0.12 at 2024-11-12 02:39:42 (GMT)