summaryrefslogtreecommitdiffstats
path: root/qmake/Makefile.win32-g++
Commit message (Collapse)AuthorAgeFilesLines
* Merge earth-team into origin/master'Olivier Goffart2011-04-121-1/+1
|\
| * Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-04-071-1/+1
| |\ | | | | | | | | | | | | | | | Conflicts: src/gui/text/qfontengine_mac.mm tests/auto/qdiriterator/tst_qdiriterator.cpp
| | * win32-g++: Correct the order of linked Windows librariesJonathan Liu2011-04-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On Windows 7, kernel32.dll exports many of the same functions as advapi32.dll. If executables link to these functions in kernel32.dll instead of advapi32.dll, running these executables on older versions of Windows will cause an entry point error. This would occur due to kernel32 being specified before advapi32. To resolve this issue, advapi32 is specified before kernel32 when linking. Task-number: QTBUG-18537 Merge-request: 1169 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* | | Merge remote branch 'earth-team/master-i18n' into 4.8-earthDenis Dzyubenko2011-03-241-0/+8
|\ \ \ | |/ / |/| | | | | | | | Conflicts: src/corelib/tools/tools.pri
| * | Split monolithic qlocale.cpp into platform-specific filesDenis Dzyubenko2011-02-241-0/+8
| | | | | | | | | | | | | | | | | | | | | This is just a refactoring change to split huge unreadable qlocale.cpp into multiple files. Reviewed-by: Zeno Albisser
* | | Ammend last INTEGRITY fixHarald Fernengel2011-02-241-1/+4
| | | | | | | | | | | | Also build gbuild.cpp on windows
* | | Fix qmake build on WindowsHarald Fernengel2011-02-241-1/+1
|/ / | | | | | | The INTEGRITY changes only modified the Unix makefile
* | Merge remote branch 'origin/master' into file-engine-refactorJoão Abecasis2010-12-021-1/+1
|\ \ | |/ | | | | | | | | | | | | | | | | | | master's version of conflicting def files picked. Conflicts: src/s60installs/bwins/QtCoreu.def src/s60installs/bwins/QtGuiu.def src/s60installs/bwins/QtNetworku.def src/s60installs/eabi/QtCoreu.def src/s60installs/eabi/QtGuiu.def
| * Resolve EPOCROOT in qt.conf using same logic as in .proMiikka Heikkinen2010-11-181-1/+1
| | | | | | | | | | | | | | | | | | | | Previously it was only possible to use EPOCROOT in qt.conf via env variable, while qmake & configure could resolve it also via devices.xml. Changed qt.conf parsing to support $${EPOCROOT} tag and use same resolving logic as qmake & configure. Task-number: QTBUG-15393 Reviewed-by: axis
* | Use QSystemError to return errors from QFileSystemEngineShane Kearns2010-10-121-0/+4
| | | | | | | | | | | | | | | | | | | | Testing done: win32-msvc2008 and Mac OS X - qfile, qfileinfo, qdir, qdiriterator, qtemporaryfile autotests symbian-sbsv2 - qtcore, qtgui, qtxml autotests win32-g++ - compilation test for qmake Reviewed-By: Thomas Zander
* | Merge commit 'origin/master' into fileEnginesOn47Thomas Zander2010-09-281-0/+4
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: qmake/Makefile.win32 qmake/qmake.pri src/corelib/io/qdir.cpp src/corelib/io/qfileinfo.cpp src/corelib/io/qfileinfo_p.h src/corelib/io/qfsfileengine_win.cpp src/s60installs/bwins/QtGuiu.def src/s60installs/eabi/QtCoreu.def src/s60installs/eabi/QtGuiu.def src/tools/bootstrap/bootstrap.pro tests/auto/qfileinfo/tst_qfileinfo.cpp
| * Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Thiago Macieira2010-09-071-0/+4
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: qmake/Makefile.win32 src/corelib/io/qfsfileengine_win.cpp src/corelib/kernel/qeventdispatcher_win.cpp src/gui/dialogs/qfiledialog_win.cpp src/gui/inputmethod/qcoefepinputcontext_s60.cpp src/gui/text/qfontdatabase_win.cpp src/gui/util/qsystemtrayicon_win.cpp src/script/utils/qscriptdate.cpp tests/auto/qinputcontext/tst_qinputcontext.cpp tests/auto/qscriptengine/tst_qscriptengine.cpp
| | * Compile fix MinGW, 5738dcd705e7edde816940f9c0ab2c364c81ad20 broke it.Jan-Arve Sæther2010-09-061-0/+4
| | | | | | | | | | | | Task-number: QT-3825
* | | Implement QFileSystemIterator for windows.Prasanth Ullattil2010-09-151-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The search is implemented using FindFirstFileEx(). Following optimizations are done * Using large Fetch buffer on Windows 7 * Querying only the long file name * Querying for directories only, depending on QDir::Filters Reviewed-by: Joao
* | | Adding minimal QFileSystemIterator APIJoão Abecasis2010-08-311-0/+4
| | | | | | | | | | | | | | | | | | Only stubs, for now, but it's a start. Reviewed-by: Thomas Zander
* | | Move canonicalPath() to the new qfilesystemengine_unixThomas Zander2010-08-301-0/+4
| | | | | | | | | | | | Reviewed-by: João Abecasis
* | | Adding QFileSystemEntry and QFileSystemEngine to build systemJoão Abecasis2010-08-301-0/+8
|/ / | | | | | | | | | | | | | | Since we're refactoring code out of QFSFileEngine the new internal classes have to be compiled in together with the old engines. For the time being, we'll assume Mac uses the unix version of the engine. We'll fork those only if and as needed.
* | qmake/MinGw: Link statically.Friedemann Kleint2010-05-181-1/+2
| | | | | | | | Reviewed-by: Thierry Bastian <thierry.bastian@nokia.com>
* | Fix all qmake Makefiles to include the MSBuild backendMarius Storm-Olsen2010-04-241-2/+8
| | | | | | | | Reviewed-by: trustme
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-publicaxis2010-03-111-1/+1
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: mkspecs/common/symbian/symbian.conf qmake/generators/makefile.h qmake/project.cpp src/3rdparty/webkit/WebCore/WebCore.pro src/src.pro
| * | qmake/MinGw: Link statically for Qt Creator to be able to detect it.Friedemann Kleint2010-03-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | Qt Creator detects Qt versions by running qmake. This fails if no MinGw setup is in the path as is usually the case when starting it from the menu. Make it possible to run qmake without setup. Strip executable. Reviewed-by: Thierry Bastian <thierry.bastian@nokia.com> Reviewed-by: mariusSO <qt-info@nokia.com>
* | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-publicaxis2010-02-231-1/+8
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: mkspecs/features/symbian/qt.prf qmake/Makefile.unix qmake/Makefile.win32 qmake/Makefile.win32-g++ qmake/Makefile.win32-g++-sh qmake/generators/symbian/initprojectdeploy_symbian.cpp src/src.pro
| * | Factored epocRoot implementation out of qmakeGareth Stockwell2010-02-231-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This function is now implemented in its own source file, rather than being embedded within the Symbian qmake generator. The motivation for this is to allow code to be shared between qmake and configure - the latter needs to determine the epoc root path in order to perform feature detection on Symbian SDKs. Reviewed-by: Miikka Heikkinen (cherry picked from commit 6ebcf2c24b43fdc1d6da50e9d7ec9dd63dd507d7)
| * | Factored readRegistryKey implementation out of qmakeaxis2010-02-231-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This function is now implemented with its own header and source files, rather than being embedded within the MSVC qmake generator. The motivation for this is to allow code to be shared between qmake and configure, both of which query the registry when built for Windows. Reviewed-by: Miikka Heikkinen (cherry picked from commit 5254184c07b4da800e29000a251ed2a026bd2be5) Conflicts: qmake/Makefile.unix
| * | Revert "Factored readRegistryKey implementation out of qmake"Thiago Macieira2010-02-211-5/+0
| | | | | | | | | | | | | | | | | | | | | | | | This reverts commit f641369ceb7b7e2f95b9d0656b34c0517c5b95f7. Conflicts: qmake/Makefile.unix
| * | Revert "Factored epocRoot implementation out of qmake"Thiago Macieira2010-02-211-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 13cb80be958c40077245cbc4b36448a661e30c64. Conflicts: qmake/Makefile.unix qmake/generators/symbian/symmake.cpp
| * | Merge remote branch 'origin/4.6' into qt-master-from-4.6Thiago Macieira2010-02-201-0/+9
| |\ \ | | |/ | | | | | | | | | | | | Conflicts: qmake/Makefile.unix qmake/generators/symbian/symmake.cpp
| | * Factored epocRoot implementation out of qmakeGareth Stockwell2010-02-191-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This function is now implemented in its own source file, rather than being embedded within the Symbian qmake generator. The motivation for this is to allow code to be shared between qmake and configure - the latter needs to determine the epoc root path in order to perform feature detection on Symbian SDKs. Reviewed-by: Miikka Heikkinen
| | * Factored readRegistryKey implementation out of qmakeGareth Stockwell2010-02-191-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This function is now implemented with its own header and source files, rather than being embedded within the MSVC qmake generator. The motivation for this is to allow code to be shared between qmake and configure, both of which query the registry when built for Windows. Reviewed-by: Miikka Heikkinen
| | * Revert "Factored readRegistryKey implementation out of qmake"axis2010-02-191-5/+0
| | | | | | | | | | | | | | | | | | This reverts commit f641369ceb7b7e2f95b9d0656b34c0517c5b95f7. It breaks non-Symbian platforms.
| | * Revert "Factored epocRoot implementation out of qmake"axis2010-02-191-4/+0
| | | | | | | | | | | | | | | | | | This reverts commit 13cb80be958c40077245cbc4b36448a661e30c64. It breaks non-Symbian platforms.
| | * Factored epocRoot implementation out of qmakeGareth Stockwell2010-02-181-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This function is now implemented in its own source file, rather than being embedded within the Symbian qmake generator. The motivation for this is to allow code to be shared between qmake and configure - the latter needs to determine the epoc root path in order to perform feature detection on Symbian SDKs. Reviewed-by: Miikka Heikkinen
| | * Factored readRegistryKey implementation out of qmakeGareth Stockwell2010-02-181-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This function is now implemented with its own header and source files, rather than being embedded within the MSVC qmake generator. The motivation for this is to allow code to be shared between qmake and configure, both of which query the registry when built for Windows. Reviewed-by: Miikka Heikkinen
* | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵axis2010-02-181-4/+1
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | merge-with-qt-master Conflicts: mkspecs/common/symbian/symbian.conf qmake/Makefile.unix qmake/generators/makefile.cpp
| * | purge msvc6 suppport from qmake. qt doesn't support it for quite a while now.Oswald Buddenhagen2010-02-121-4/+1
| |/ | | | | | | Acked-by: mariusSO
* | Implemented pkg generator for the symbian/linux-armcc mkspec.axis2010-02-041-2/+5
|/ | | | | | | | | | | | | It reuses almost everything from the original pkg generator, but the code had to be restructured to accomodate for the new makefile generator. In addition a few new codepaths and profile changes had to be introduced to cope with the fact that this mkspec puts files in different places than Symbian does (inside $QTDIR/lib instead of $EPOCROOT/...). This enables the pkg generator to generate correct pkg files for Qt itself, but applications will not work yet because they also require generated rss files.
* Merge commit 'qt/master'Jason Barron2009-08-211-155/+2
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * remove QtScript from includepathKent Hansen2009-08-191-1/+0
| | | | | | | | qmake no longer uses QtScript.
| * Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into ↵Kent Hansen2009-08-181-3/+3
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | qtscript-jsc-backend Conflicts: src/script/qscriptclass.cpp src/script/qscriptcontext.cpp src/script/qscriptengine.cpp src/script/qscriptvalue.cpp
| * \ Merge branch 'qtwebkit-4.6-staging' into qtscript-jsc-backendKent Hansen2009-07-281-2/+7
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/corelib/tools/qregexp.cpp src/script/qscriptengine.cpp src/script/qscriptvalue.cpp
| * | | Import JSC-based Qt Script from Kent's tree.Simon Hausmann2009-06-161-153/+1
| | | |
* | | | Merge commit 'qt/master'Jason Barron2009-08-181-3/+3
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/src/examples.qdoc doc/src/plugins-howto.qdoc doc/src/topics.qdoc examples/phonon/musicplayer/mainwindow.cpp src/3rdparty/freetype/src/base/ftobjs.c src/corelib/global/qglobal.h src/corelib/tools/qalgorithms.h src/corelib/tools/qshareddata.cpp src/corelib/tools/qsharedpointer.cpp src/corelib/tools/tools.pri src/corelib/xml/qxmlstream.h src/gui/painting/painting.pri src/gui/widgets/qdatetimeedit.cpp tests/auto/qdesktopservices/qdesktopservices.pro tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp tests/auto/qtextcodec/test/test.pro
| * | | CompileAnders Bakken2009-08-171-3/+3
| | |/ | |/| | | | | | | | | | | | | | | | After 843d2eed0ac10589a01d40bfdf88cb44c6a00b17 qmake didn't compile anymore. Reviewed-by: TrustMe
* | | Merge commit 'origin/master'Jason Barron2009-08-041-5/+5
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/corelib/global/qglobal.h src/corelib/kernel/qmetatype.cpp src/corelib/kernel/qobject.cpp src/corelib/thread/qthread_unix.cpp src/gui/graphicsview/qgraphicssceneevent.h src/gui/itemviews/qheaderview.h src/gui/kernel/qapplication_qws.cpp src/gui/kernel/qgesture.h src/gui/kernel/qgesturerecognizer.h src/gui/painting/qpaintengine_raster.cpp src/network/access/qhttpnetworkreply.cpp src/network/access/qnetworkcookie.h src/network/socket/qnativesocketengine_unix.cpp
| * | | Whitespace, comment, and dead code cleanup for qmakeMiikka Heikkinen2009-08-041-5/+5
| | | |
* | | | Merge commit 'qt/master-stable'Jason Barron2009-07-271-2/+7
|\ \ \ \ | |/ / / |/| / / | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure.exe qmake/Makefile.unix qmake/generators/makefile.cpp src/corelib/global/qglobal.h src/corelib/kernel/kernel.pri src/corelib/kernel/qcoreevent.cpp src/corelib/kernel/qsharedmemory_unix.cpp src/gui/graphicsview/qgraphicsscene.cpp src/gui/kernel/qaction.cpp src/gui/kernel/qaction.h src/gui/kernel/qaction_p.h src/gui/kernel/qapplication.cpp src/gui/kernel/qapplication.h src/gui/kernel/qwidget.cpp src/gui/kernel/qwidget.h src/gui/kernel/qwidget_mac.mm src/gui/painting/qgraphicssystemfactory.cpp src/gui/styles/qwindowsstyle.cpp src/gui/text/qfontengine_qpf.cpp src/gui/widgets/qabstractscrollarea_p.h src/network/access/qnetworkaccessdebugpipebackend.cpp src/network/socket/qlocalsocket_unix.cpp src/network/socket/qnativesocketengine_p.h src/network/socket/qnativesocketengine_unix.cpp src/openvg/qpaintengine_vg.cpp tests/auto/q3sqlcursor/tst_q3sqlcursor.cpp tests/auto/qcssparser/qcssparser.pro tests/auto/qdir/tst_qdir.cpp tests/auto/qfile/tst_qfile.cpp tests/auto/qobject/tst_qobject.cpp tests/auto/qpathclipper/qpathclipper.pro tests/auto/qprocess/tst_qprocess.cpp tests/auto/qsettings/tst_qsettings.cpp tests/auto/qsharedpointer/qsharedpointer.pro tests/auto/qsqlquerymodel/qsqlquerymodel.pro tests/auto/qsqlrelationaltablemodel/qsqlrelationaltablemodel.pro tests/auto/qsqltablemodel/qsqltablemodel.pro tests/auto/qsqlthread/qsqlthread.pro tests/auto/qwidget/tst_qwidget.cpp
| * | Compile fix on windows.Denis Dzyubenko2009-07-161-2/+2
| | |
| * | Changed the implementation of the unicode text codecs to share more code ↵Denis Dzyubenko2009-07-161-0/+5
| |/ | | | | | | | | | | | | | | | | | | with qstring. The qstring unicode conversion functions used to have its own implementation, which did the same as QUtf*Codecs, so with the change all of them will share the same implementation. Reviewed-by: Thiago Macieira
| * Long live Qt!Lars Knoll2009-03-231-0/+439
|
* Long live Qt for S60!axis2009-04-241-0/+463
generated by cgit v0.12 at 2024-12-03 01:32:03 (GMT)