You can subscribe to this list here.
2005 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
(42) |
Aug
(21) |
Sep
(430) |
Oct
(12) |
Nov
(100) |
Dec
(474) |
---|---|---|---|---|---|---|---|---|---|---|---|---|
2006 |
Jan
(21) |
Feb
(303) |
Mar
(12) |
Apr
(29) |
May
(361) |
Jun
(259) |
Jul
(4) |
Aug
(18) |
Sep
(2) |
Oct
(646) |
Nov
(4) |
Dec
(57) |
2007 |
Jan
(4) |
Feb
(9) |
Mar
(25) |
Apr
(8) |
May
(18) |
Jun
(8) |
Jul
|
Aug
(4) |
Sep
(4) |
Oct
|
Nov
|
Dec
|
2008 |
Jan
|
Feb
|
Mar
(1) |
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
2010 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(1) |
Dec
|
From: <che...@us...> - 2010-11-04 21:26:00
|
Revision: 2151 http://qtwin.svn.sourceforge.net/qtwin/?rev=2151&view=rev Author: chehrlic Date: 2010-11-04 21:25:54 +0000 (Thu, 04 Nov 2010) Log Message: ----------- msvc2008/2010 compile Modified Paths: -------------- qt-3/trunk/src/kernel/qaccessible_win.cpp Modified: qt-3/trunk/src/kernel/qaccessible_win.cpp =================================================================== --- qt-3/trunk/src/kernel/qaccessible_win.cpp 2008-03-06 18:12:38 UTC (rev 2150) +++ qt-3/trunk/src/kernel/qaccessible_win.cpp 2010-11-04 21:25:54 UTC (rev 2151) @@ -40,7 +40,7 @@ #include "qt_windows.h" #include "qwidget.h" -#include <winable.h> +#include <winuser.h> #include <mmsystem.h> void QAccessible::initialize() This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <che...@us...> - 2008-03-06 18:12:46
|
Revision: 2150 http://qtwin.svn.sourceforge.net/qtwin/?rev=2150&view=rev Author: chehrlic Date: 2008-03-06 10:12:38 -0800 (Thu, 06 Mar 2008) Log Message: ----------- fix for Stefan Jahn Modified Paths: -------------- qt-3/trunk/src/kernel/qprinter_win.cpp Modified: qt-3/trunk/src/kernel/qprinter_win.cpp =================================================================== --- qt-3/trunk/src/kernel/qprinter_win.cpp 2007-09-22 16:04:41 UTC (rev 2149) +++ qt-3/trunk/src/kernel/qprinter_win.cpp 2008-03-06 18:12:38 UTC (rev 2150) @@ -112,7 +112,7 @@ { int i = 0; while ((dmMapping[i].winSizeName > 0) && (dmMapping[i].qtSizeName != s)) - i++; + i++; return dmMapping[i].winSizeName; } @@ -328,13 +328,13 @@ resolution = dpi_display; stretch_x = dpi_x / double(dpi_display); stretch_y = dpi_y / double(dpi_display); - break; + break; case QPrinter::PrinterResolution: case QPrinter::HighResolution: resolution = dpi_y; stretch_x = 1; stretch_y = 1; - break; + break; default: break; } @@ -624,31 +624,31 @@ to_edge = FALSE; int psize,o,cm,psrc; - if ( QT_WA_INLINE( dW32->devModeW() != 0, dW32->devModeA() != 0 ) ) { - QT_WA( hdevmode = dW32->devModeW(); - psize = dW32->devModeW()->dmPaperSize; - o = dW32->devModeW()->dmOrientation; - cm = dW32->devModeW()->dmColor; - ncopies = dW32->devModeW()->dmCopies; - psrc = dW32->devModeW()->dmDefaultSource; - , - hdevmode = dW32->devModeA(); - psize = dW32->devModeA()->dmPaperSize; - o = dW32->devModeA()->dmOrientation; - cm = dW32->devModeA()->dmColor; - ncopies = dW32->devModeA()->dmCopies; - psrc = dW32->devModeA()->dmDefaultSource; - ) - } else { - hdevmode = 0; - psize = 0; - o = 0; - cm = 0; - ncopies = 0; - psrc = 0; - } + if ( QT_WA_INLINE( dW32->devModeW() != 0, dW32->devModeA() != 0 ) ) { + QT_WA( hdevmode = dW32->devModeW(); + psize = dW32->devModeW()->dmPaperSize; + o = dW32->devModeW()->dmOrientation; + cm = dW32->devModeW()->dmColor; + ncopies = dW32->devModeW()->dmCopies; + psrc = dW32->devModeW()->dmDefaultSource; + , + hdevmode = dW32->devModeA(); + psize = dW32->devModeA()->dmPaperSize; + o = dW32->devModeA()->dmOrientation; + cm = dW32->devModeA()->dmColor; + ncopies = dW32->devModeA()->dmCopies; + psrc = dW32->devModeA()->dmDefaultSource; + ) + } else { + hdevmode = 0; + psize = 0; + o = 0; + cm = 0; + ncopies = 0; + psrc = 0; + } - hdevnames = 0; + hdevnames = 0; page_size = mapDevmodePageSize( psize ); orient = o == DMORIENT_LANDSCAPE ? QPrinter::Landscape : QPrinter::Portrait; color_mode = cm == DMCOLOR_COLOR ? QPrinter::Color : QPrinter::GrayScale; @@ -784,8 +784,8 @@ if ( !dW32 ) return false; - if ( QT_WA_INLINE( dW32->devModeW() == 0, dW32->devModeA() == 0 ) ) - return false; + if ( QT_WA_INLINE( dW32->devModeW() == 0, dW32->devModeA() == 0 ) ) + return false; dW32->setParent( parent ); dW32->fromPage = fromPage(); @@ -798,11 +798,18 @@ if ( !dW32->showPrintDialog() ) return false; - setPrintRange( AllPages ); - if ( isOptionEnabled( QPrinter::PrintSelection ) ) - setPrintRange( Selection ); - else if ( isOptionEnabled( QPrinter::PrintPageRange ) ) - setPrintRange( PageRange ); + switch(dW32->printRange) { + case QPrinter::AllPages: + default: + setPrintRange( AllPages ); + break; + case QPrinter::PrintPageRange: + setPrintRange( PageRange ); + break; + case QPrinter::PrintSelection: + setPrintRange( Selection ); + break; + } setOutputToFile( isOptionEnabled( QPrinter::PrintToFile ) ); setFromTo( dW32->fromPage, dW32->toPage ); @@ -810,7 +817,7 @@ int psize,o,cm,psrc; - QT_WA( hdevmode = dW32->devModeW(); + QT_WA( hdevmode = dW32->devModeW(); psize = dW32->devModeW()->dmPaperSize; o = dW32->devModeW()->dmOrientation; cm = dW32->devModeW()->dmColor; @@ -825,7 +832,7 @@ psrc = dW32->devModeA()->dmDefaultSource; ) - hdevnames = 0; + hdevnames = 0; page_size = mapDevmodePageSize( psize ); orient = DMORIENT_LANDSCAPE ? QPrinter::Landscape : QPrinter::Portrait; color_mode = DMCOLOR_COLOR ? QPrinter::Color : QPrinter::GrayScale; @@ -1058,8 +1065,8 @@ ) } - hdevnames = 0; - QT_WA( hdevmode = dW32->devModeW();, hdevmode = dW32->devModeA(); ) + hdevnames = 0; + QT_WA( hdevmode = dW32->devModeW();, hdevmode = dW32->devModeA(); ) hdc = dW32->hdc; res = dW32->resolution; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <che...@us...> - 2007-09-22 16:04:47
|
Revision: 2149 http://qtwin.svn.sourceforge.net/qtwin/?rev=2149&view=rev Author: chehrlic Date: 2007-09-22 09:04:41 -0700 (Sat, 22 Sep 2007) Log Message: ----------- fix qdbus lib installation Modified Paths: -------------- qt-4/trunk/tools/qdbus/src/src.pro Modified: qt-4/trunk/tools/qdbus/src/src.pro =================================================================== --- qt-4/trunk/tools/qdbus/src/src.pro 2007-09-22 08:35:30 UTC (rev 2148) +++ qt-4/trunk/tools/qdbus/src/src.pro 2007-09-22 16:04:41 UTC (rev 2149) @@ -22,6 +22,10 @@ MOC_DIR = tmp DESTDIR = ../../../lib DLLDESTDIR = ../../../bin +win32 { + dlltarget.path=$$[QT_INSTALL_BINS] + INSTALLS += dlltarget +} isEmpty(QT_MAJOR_VERSION) { VERSION=4.3.0 } else { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <che...@us...> - 2007-09-22 08:35:33
|
Revision: 2148 http://qtwin.svn.sourceforge.net/qtwin/?rev=2148&view=rev Author: chehrlic Date: 2007-09-22 01:35:30 -0700 (Sat, 22 Sep 2007) Log Message: ----------- fix mingw install Modified Paths: -------------- qt-4/trunk/qmake/generators/win32/mingw_make.cpp qt-4/trunk/qmake/generators/win32/mingw_make.h qt-4/trunk/qmake/generators/win32/winmakefile.cpp qt-4/trunk/qmake/generators/win32/winmakefile.h Modified: qt-4/trunk/qmake/generators/win32/mingw_make.cpp =================================================================== --- qt-4/trunk/qmake/generators/win32/mingw_make.cpp 2007-09-17 07:06:47 UTC (rev 2147) +++ qt-4/trunk/qmake/generators/win32/mingw_make.cpp 2007-09-22 08:35:30 UTC (rev 2148) @@ -81,7 +81,7 @@ suffix = project->first("QMAKE_" + steam.toUpper() + "_SUFFIX"); QString extension; for (QList<QMakeLocalFileName>::Iterator dir_it = dirs.begin(); dir_it != dirs.end(); ++dir_it) { - int ver = findHighestVersion((*dir_it).local(), steam); + int ver = findHighestVersion((*dir_it).local(), steam, "dll.a|a"); if (ver != -1) { extension += QString::number(ver); break; @@ -134,7 +134,7 @@ return false; } -void createLdObjectScriptFile(const QString &fileName, const QStringList &objList) +static void createLdObjectScriptFile(const QString &fileName, const QStringList &objList) { QString filePath = Option::output_dir + QDir::separator() + fileName; QFile file(filePath); @@ -153,7 +153,7 @@ } } -void createArObjectScriptFile(const QString &fileName, const QString &target, const QStringList &objList) +static void createArObjectScriptFile(const QString &fileName, const QString &target, const QStringList &objList) { QString filePath = Option::output_dir + QDir::separator() + fileName; QFile file(filePath); @@ -427,3 +427,7 @@ return aList; } +QString MingwMakefileGenerator::getLibTarget() +{ + return QString("lib" + project->first("TARGET")+project->first("TARGET_VERSION_EXT")+".a"); +} Modified: qt-4/trunk/qmake/generators/win32/mingw_make.h =================================================================== --- qt-4/trunk/qmake/generators/win32/mingw_make.h 2007-09-17 07:06:47 UTC (rev 2147) +++ qt-4/trunk/qmake/generators/win32/mingw_make.h 2007-09-22 08:35:30 UTC (rev 2148) @@ -65,6 +65,7 @@ virtual bool findLibraries(); void fixTargetExt(); + virtual QString getLibTarget(); bool init_flag; QString objectsLinkLine; Modified: qt-4/trunk/qmake/generators/win32/winmakefile.cpp =================================================================== --- qt-4/trunk/qmake/generators/win32/winmakefile.cpp 2007-09-17 07:06:47 UTC (rev 2147) +++ qt-4/trunk/qmake/generators/win32/winmakefile.cpp 2007-09-22 08:35:30 UTC (rev 2148) @@ -53,7 +53,7 @@ } int -Win32MakefileGenerator::findHighestVersion(const QString &d, const QString &stem) +Win32MakefileGenerator::findHighestVersion(const QString &d, const QString &stem, const QString &ext) { QString bd = Option::fixPathToLocalOS(d, true); if(!exists(bd)) @@ -75,7 +75,7 @@ if(!project->isActiveConfig("no_versionlink")) { QDir dir(bd); QStringList entries = dir.entryList(); - QRegExp regx("((lib)?" + dllStem + "([0-9]*)).(a|lib|prl)$", Qt::CaseInsensitive); + QRegExp regx(QString("((lib)?" + dllStem + "([0-9]*)).(%1|prl)$").arg(ext), Qt::CaseInsensitive); for(QStringList::Iterator it = entries.begin(); it != entries.end(); ++it) { if(regx.exactMatch((*it))) { if (!regx.cap(3).isEmpty()) { @@ -719,6 +719,11 @@ } } +QString Win32MakefileGenerator::getLibTarget() +{ + return QString(project->first("TARGET")+project->first("TARGET_VERSION_EXT")+".lib"); +} + QString Win32MakefileGenerator::defaultInstall(const QString &t) { if((t != "target" && t != "dlltarget") || @@ -748,9 +753,14 @@ uninst.append("-$(DEL_FILE) \"" + dst_prl + "\""); } if(project->isActiveConfig("shared") && !project->isActiveConfig("plugin")) { - QString lib_target = QString(project->first("TARGET")+project->first("TARGET_VERSION_EXT")+".lib"); + QString lib_target = getLibTarget(); lib_target.remove('"'); - QString src_targ = "$(DESTDIR)" + lib_target; + QString src_targ; + if(!project->isEmpty("DESTDIR")) + src_targ = project->first("DESTDIR"); + else + src_targ = "$(DESTDIR)"; + src_targ += lib_target; QString dst_targ = filePrefixRoot(root, fileFixify(targetdir + lib_target, FileFixifyAbsolute)); if(!ret.isEmpty()) ret += "\n\t"; Modified: qt-4/trunk/qmake/generators/win32/winmakefile.h =================================================================== --- qt-4/trunk/qmake/generators/win32/winmakefile.h 2007-09-17 07:06:47 UTC (rev 2147) +++ qt-4/trunk/qmake/generators/win32/winmakefile.h 2007-09-22 08:35:30 UTC (rev 2148) @@ -68,7 +68,7 @@ virtual void writeRcFilePart(QTextStream &t); - int findHighestVersion(const QString &dir, const QString &stem); + int findHighestVersion(const QString &dir, const QString &stem, const QString &ext = QLatin1String("lib")); bool findLibraries(const QString &); virtual bool findLibraries(); @@ -77,6 +77,7 @@ virtual void fixTargetExt(); virtual void processRcFileVar(); virtual void processFileTagsVar(); + virtual QString getLibTarget(); }; inline Win32MakefileGenerator::~Win32MakefileGenerator() This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <che...@us...> - 2007-09-17 07:06:50
|
Revision: 2147 http://qtwin.svn.sourceforge.net/qtwin/?rev=2147&view=rev Author: chehrlic Date: 2007-09-17 00:06:47 -0700 (Mon, 17 Sep 2007) Log Message: ----------- use static msvc runtime here Modified Paths: -------------- qt-4/trunk/qmake/Makefile.win32-msvc qt-4/trunk/qmake/Makefile.win32-msvc.net qt-4/trunk/qmake/Makefile.win32-msvc2005 Modified: qt-4/trunk/qmake/Makefile.win32-msvc =================================================================== --- qt-4/trunk/qmake/Makefile.win32-msvc 2007-09-16 11:28:21 UTC (rev 2146) +++ qt-4/trunk/qmake/Makefile.win32-msvc 2007-09-17 07:06:47 UTC (rev 2147) @@ -11,8 +11,8 @@ CC = cl CXX = cl DEFINES = -DUNICODE -DQT_LARGEFILE_SUPPORT -DWIN32 -DQT_BUILD_QMAKE -DQT_BOOTSTRAPPED -DQT_NO_TEXTCODEC -DQT_NO_LIBRARY -DQT_NO_STL -DQT_NO_COMPRESS -DQT_NO_UNICODETABLES -DQT_NO_GEOM_VARIANT -DQT_NO_DATASTREAM -DQMAKE_OPENSOURCE_EDITION -DQT_NODLL -DQT_NO_THREAD -DQT_NO_QOBJECT -CFLAGS = -nologo -Zm200 -O1 -MD -DNDEBUG -W3 $(DEFINES) -CXXFLAGS = -nologo -Zm200 -O1 -MD -DNDEBUG -GR -GX -W3 $(DEFINES) +CFLAGS = -nologo -Zm200 -O1 -MT -DNDEBUG -W3 $(DEFINES) +CXXFLAGS = -nologo -Zm200 -O1 -MT -DNDEBUG -GR -GX -W3 $(DEFINES) INCPATH = -I"..\src\corelib\arch\generic" -I"generators" -I"generators\unix" -I"generators\win32" -I"generators\mac" -I"..\include" -I"..\include\QtCore" -I"." -I"..\include\QtScript" -I"..\src\script" -I"..\mkspecs\win32-msvc" LINK = link LFLAGS = /NOLOGO /SUBSYSTEM:CONSOLE /incremental:no Modified: qt-4/trunk/qmake/Makefile.win32-msvc.net =================================================================== --- qt-4/trunk/qmake/Makefile.win32-msvc.net 2007-09-16 11:28:21 UTC (rev 2146) +++ qt-4/trunk/qmake/Makefile.win32-msvc.net 2007-09-17 07:06:47 UTC (rev 2147) @@ -11,8 +11,8 @@ CC = cl CXX = cl DEFINES = -DUNICODE -DQT_LARGEFILE_SUPPORT -DWIN32 -DQT_BUILD_QMAKE -DQT_BOOTSTRAPPED -DQT_NO_TEXTCODEC -DQT_NO_LIBRARY -DQT_NO_STL -DQT_NO_COMPRESS -DQT_NO_UNICODETABLES -DQT_NO_GEOM_VARIANT -DQT_NO_DATASTREAM -DQMAKE_OPENSOURCE_EDITION -DQT_NODLL -DQT_NO_THREAD -DQT_NO_QOBJECT -CFLAGS = -nologo -Zm200 -O1 -MD -DNDEBUG -W3 $(DEFINES) -CXXFLAGS = -nologo -Zm200 -O1 -MD -DNDEBUG -GR -EHsc -W3 $(DEFINES) +CFLAGS = -nologo -Zm200 -O1 -MT -DNDEBUG -W3 $(DEFINES) +CXXFLAGS = -nologo -Zm200 -O1 -MT -DNDEBUG -GR -EHsc -W3 $(DEFINES) INCPATH = -I"..\src\corelib\arch\generic" -I"generators" -I"generators\unix" -I"generators\win32" -I"generators\mac" -I"..\include" -I"..\include\QtCore" -I"." -I"..\include\QtScript" -I"..\src\script" -I"..\mkspecs\win32-msvc.net" LINK = link LFLAGS = /NOLOGO /SUBSYSTEM:CONSOLE /incremental:no Modified: qt-4/trunk/qmake/Makefile.win32-msvc2005 =================================================================== --- qt-4/trunk/qmake/Makefile.win32-msvc2005 2007-09-16 11:28:21 UTC (rev 2146) +++ qt-4/trunk/qmake/Makefile.win32-msvc2005 2007-09-17 07:06:47 UTC (rev 2147) @@ -11,8 +11,8 @@ CC = cl CXX = cl DEFINES = -DUNICODE -DQT_LARGEFILE_SUPPORT -DWIN32 -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE -DQT_BUILD_QMAKE -DQT_BOOTSTRAPPED -DQT_NO_TEXTCODEC -DQT_NO_LIBRARY -DQT_NO_STL -DQT_NO_COMPRESS -DQT_NO_UNICODETABLES -DQT_NO_GEOM_VARIANT -DQT_NO_DATASTREAM -DQMAKE_OPENSOURCE_EDITION -DQT_NODLL -DQT_NO_THREAD -DQT_NO_QOBJECT -CFLAGS = -nologo -Zm200 -GS -O2 -MD -DNDEBUG -W3 $(DEFINES) -CXXFLAGS = -nologo -Zm200 -GS -O2 -MD -DNDEBUG -GR -EHsc -W3 $(DEFINES) +CFLAGS = -nologo -Zm200 -GS -O2 -MT -DNDEBUG -W3 $(DEFINES) +CXXFLAGS = -nologo -Zm200 -GS -O2 -MT -DNDEBUG -GR -EHsc -W3 $(DEFINES) INCPATH = -I"..\src\corelib\arch\generic" -I"generators" -I"generators\unix" -I"generators\win32" -I"generators\mac" -I"..\include" -I"..\include\QtCore" -I"." -I"..\include\QtScript" -I"..\src\script" -I"..\mkspecs\win32-msvc2005" LINK = link LFLAGS = /NOLOGO /SUBSYSTEM:CONSOLE /incremental:no @@ -494,8 +494,6 @@ directory: @$(CHK_DIR_EXISTS) $(OBJECTS_DIR) $(MKDIR) $(OBJECTS_DIR) -$(DESTDIR_TARGET).manifest: - $(DESTDIR_TARGET): $(OBJECTS) $(LINK) $(LFLAGS) /OUT:"$(DESTDIR_TARGET)" @<< $(OBJECTS) $(LIBS) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <che...@us...> - 2007-09-16 11:28:24
|
Revision: 2146 http://qtwin.svn.sourceforge.net/qtwin/?rev=2146&view=rev Author: chehrlic Date: 2007-09-16 04:28:21 -0700 (Sun, 16 Sep 2007) Log Message: ----------- mode_t is not needed Modified Paths: -------------- qt-4/trunk/mkspecs/win32-msvc/qplatformdefs.h qt-4/trunk/mkspecs/win32-msvc.net/qplatformdefs.h qt-4/trunk/mkspecs/win32-msvc2005/qplatformdefs.h Modified: qt-4/trunk/mkspecs/win32-msvc/qplatformdefs.h =================================================================== --- qt-4/trunk/mkspecs/win32-msvc/qplatformdefs.h 2007-08-20 16:18:58 UTC (rev 2145) +++ qt-4/trunk/mkspecs/win32-msvc/qplatformdefs.h 2007-09-16 11:28:21 UTC (rev 2146) @@ -99,7 +99,4 @@ # define W_OK 2 # define R_OK 4 -typedef int mode_t; - - #endif // QPLATFORMDEFS_H Modified: qt-4/trunk/mkspecs/win32-msvc.net/qplatformdefs.h =================================================================== --- qt-4/trunk/mkspecs/win32-msvc.net/qplatformdefs.h 2007-08-20 16:18:58 UTC (rev 2145) +++ qt-4/trunk/mkspecs/win32-msvc.net/qplatformdefs.h 2007-09-16 11:28:21 UTC (rev 2146) @@ -103,7 +103,4 @@ # define W_OK 2 # define R_OK 4 -typedef int mode_t; - - #endif // QPLATFORMDEFS_H Modified: qt-4/trunk/mkspecs/win32-msvc2005/qplatformdefs.h =================================================================== --- qt-4/trunk/mkspecs/win32-msvc2005/qplatformdefs.h 2007-08-20 16:18:58 UTC (rev 2145) +++ qt-4/trunk/mkspecs/win32-msvc2005/qplatformdefs.h 2007-09-16 11:28:21 UTC (rev 2146) @@ -102,7 +102,4 @@ # define W_OK 2 # define R_OK 4 -typedef int mode_t; - - #endif // QPLATFORMDEFS_H This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <che...@us...> - 2007-08-14 18:18:27
|
Revision: 2133 http://qtwin.svn.sourceforge.net/qtwin/?rev=2133&view=rev Author: chehrlic Date: 2007-08-14 11:18:25 -0700 (Tue, 14 Aug 2007) Log Message: ----------- 4.3.1 Added Paths: ----------- qt-4/tags/qt_4_3_1/ Copied: qt-4/tags/qt_4_3_1 (from rev 2132, qt-4/tags/qt_4_3_0) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <che...@us...> - 2007-08-13 11:45:49
|
Revision: 2132 http://qtwin.svn.sourceforge.net/qtwin/?rev=2132&view=rev Author: chehrlic Date: 2007-08-13 04:45:44 -0700 (Mon, 13 Aug 2007) Log Message: ----------- fix compile with gcc4.2.1 Modified Paths: -------------- qt-4/trunk/qmake/generators/win32/borland_bmake.cpp qt-4/trunk/qmake/generators/win32/borland_bmake.h Modified: qt-4/trunk/qmake/generators/win32/borland_bmake.cpp =================================================================== --- qt-4/trunk/qmake/generators/win32/borland_bmake.cpp 2007-08-09 12:10:52 UTC (rev 2131) +++ qt-4/trunk/qmake/generators/win32/borland_bmake.cpp 2007-08-13 11:45:44 UTC (rev 2132) @@ -65,7 +65,7 @@ Option::res_ext = ".res"; } -void BorlandMakefileGenerator::writeFixedMake(QTextStream &t, QByteArray &content) +void BorlandMakefileGenerator::writeFixedMake(QTextStream &t, const QByteArray &content) { /* Fix incompatibilities like "&&" and empty targets */ QList<QByteArray> sl = content.split('\n'); Modified: qt-4/trunk/qmake/generators/win32/borland_bmake.h =================================================================== --- qt-4/trunk/qmake/generators/win32/borland_bmake.h 2007-08-09 12:10:52 UTC (rev 2131) +++ qt-4/trunk/qmake/generators/win32/borland_bmake.h 2007-08-13 11:45:44 UTC (rev 2132) @@ -113,7 +113,7 @@ ~BorlandMakefileGenerator() {}; protected: QString var(const QString &var); - void BorlandMakefileGenerator::writeFixedMake(QTextStream &t, QByteArray &content); + void writeFixedMake(QTextStream &t, const QByteArray &content); inline bool generateCBX() const { return project && (project->first("TEMPLATE").indexOf(QRegExp("^cbx.*")) != -1); } private: QStringList &findDependencies(const QString &file); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <che...@us...> - 2007-08-09 12:10:55
|
Revision: 2131 http://qtwin.svn.sourceforge.net/qtwin/?rev=2131&view=rev Author: chehrlic Date: 2007-08-09 05:10:52 -0700 (Thu, 09 Aug 2007) Log Message: ----------- fix handling '-L c:\foo' command line option Modified Paths: -------------- qt-4/trunk/qmake/generators/win32/msvc_vcproj.cpp Modified: qt-4/trunk/qmake/generators/win32/msvc_vcproj.cpp =================================================================== --- qt-4/trunk/qmake/generators/win32/msvc_vcproj.cpp 2007-08-01 11:37:35 UTC (rev 2130) +++ qt-4/trunk/qmake/generators/win32/msvc_vcproj.cpp 2007-08-09 12:10:52 UTC (rev 2131) @@ -1274,18 +1274,24 @@ for ( it = libList.begin(); it != libList.end(); ++it ) { QString s = *it; s.replace( "&", "&" ); - if ( s.startsWith( "-l" ) ) { + if ( s.startsWith( QLatin1String( "-l" ) ) ) { s = s.mid( 2 ); - *it = s + ".lib"; + if( !s.endsWith( QLatin1String( ".lib" ) ) ) + *it = s + ".lib"; + else + *it = s; } else if ( s.startsWith( "-L" ) ) { s = s.mid( 2 ); - if(s.startsWith("\"") && !s.endsWith("\"")) { + project->variables() [ "QMAKE_LIBS" ].removeAll( *it ); + if( s.startsWith( QLatin1String( "\"" ) ) && + !s.endsWith( QLatin1String( "\"" ) ) ) { do { ++it; + project->variables() [ "QMAKE_LIBS" ].removeAll( *it ); if(it == libList.end()) break; s += ' ' + *it; - } while( !s.endsWith("\"") ); + } while( !s.endsWith( QLatin1String( "\"" ) ) ); } project->variables() [ "QMAKE_LIBDIR" ] += s; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <che...@us...> - 2007-08-01 11:37:38
|
Revision: 2130 http://qtwin.svn.sourceforge.net/qtwin/?rev=2130&view=rev Author: chehrlic Date: 2007-08-01 04:37:35 -0700 (Wed, 01 Aug 2007) Log Message: ----------- applied http://dist.trolltech.com/developer/download/170529.diff Modified Paths: -------------- qt-3/trunk/src/sql/qdatatable.cpp qt-3/trunk/src/sql/qsqldatabase.cpp qt-3/trunk/src/sql/qsqlindex.cpp qt-3/trunk/src/sql/qsqlrecord.cpp qt-3/trunk/src/tools/qglobal.cpp qt-3/trunk/src/widgets/qtextedit.cpp qt-3/trunk/src/xml/qsvgdevice.cpp Modified: qt-3/trunk/src/sql/qdatatable.cpp =================================================================== --- qt-3/trunk/src/sql/qdatatable.cpp 2007-06-15 14:42:45 UTC (rev 2129) +++ qt-3/trunk/src/sql/qdatatable.cpp 2007-08-01 11:37:35 UTC (rev 2130) @@ -1043,8 +1043,8 @@ return FALSE; if ( !sqlCursor()->canInsert() ) { #ifdef QT_CHECK_RANGE - qWarning("QDataTable::insertCurrent: insert not allowed for " + - sqlCursor()->name() ); + qWarning("QDataTable::insertCurrent: insert not allowed for %s", + sqlCursor()->name().latin1() ); #endif endInsert(); return FALSE; @@ -1117,16 +1117,16 @@ return FALSE; if ( sqlCursor()->primaryIndex().count() == 0 ) { #ifdef QT_CHECK_RANGE - qWarning("QDataTable::updateCurrent: no primary index for " + - sqlCursor()->name() ); + qWarning("QDataTable::updateCurrent: no primary index for %s", + sqlCursor()->name().latin1() ); #endif endUpdate(); return FALSE; } if ( !sqlCursor()->canUpdate() ) { #ifdef QT_CHECK_RANGE - qWarning("QDataTable::updateCurrent: updates not allowed for " + - sqlCursor()->name() ); + qWarning("QDataTable::updateCurrent: updates not allowed for %s", + sqlCursor()->name().latin1() ); #endif endUpdate(); return FALSE; @@ -1191,8 +1191,8 @@ return FALSE; if ( sqlCursor()->primaryIndex().count() == 0 ) { #ifdef QT_CHECK_RANGE - qWarning("QDataTable::deleteCurrent: no primary index " + - sqlCursor()->name() ); + qWarning("QDataTable::deleteCurrent: no primary index %s", + sqlCursor()->name().latin1() ); #endif return FALSE; } Modified: qt-3/trunk/src/sql/qsqldatabase.cpp =================================================================== --- qt-3/trunk/src/sql/qsqldatabase.cpp 2007-06-15 14:42:45 UTC (rev 2129) +++ qt-3/trunk/src/sql/qsqldatabase.cpp 2007-08-01 11:37:35 UTC (rev 2130) @@ -234,7 +234,8 @@ db->open(); #ifdef QT_CHECK_RANGE if ( !db->isOpen() ) - qWarning("QSqlDatabaseManager::database: unable to open database: " + db->lastError().databaseText() + ": " + db->lastError().driverText() ); + qWarning("QSqlDatabaseManager::database: unable to open database: %s: %s", + db->lastError().databaseText().latin1(), db->lastError().driverText().latin1() ); #endif } return db; @@ -686,7 +687,7 @@ if ( !d->driver ) { #ifdef QT_CHECK_RANGE qWarning( "QSqlDatabase: %s driver not loaded", type.latin1() ); - qWarning( "QSqlDatabase: available drivers: " + drivers().join(" ") ); + qWarning( "QSqlDatabase: available drivers: %s", drivers().join(" ").latin1() ); #endif d->driver = new QNullDriver(); d->driver->setLastError( QSqlError( "Driver not loaded", "Driver not loaded" ) ); Modified: qt-3/trunk/src/sql/qsqlindex.cpp =================================================================== --- qt-3/trunk/src/sql/qsqlindex.cpp 2007-06-15 14:42:45 UTC (rev 2129) +++ qt-3/trunk/src/sql/qsqlindex.cpp 2007-08-01 11:37:35 UTC (rev 2130) @@ -273,7 +273,7 @@ if ( field ) newSort.append( *field, desc ); else - qWarning( "QSqlIndex::fromStringList: unknown field: '" + f + "'" ); + qWarning( "QSqlIndex::fromStringList: unknown field: '%s'", f.latin1()); } return newSort; } Modified: qt-3/trunk/src/sql/qsqlrecord.cpp =================================================================== --- qt-3/trunk/src/sql/qsqlrecord.cpp 2007-06-15 14:42:45 UTC (rev 2129) +++ qt-3/trunk/src/sql/qsqlrecord.cpp 2007-08-01 11:37:35 UTC (rev 2130) @@ -298,7 +298,7 @@ return i; } #ifdef QT_CHECK_RANGE - qWarning( "QSqlRecord::position: unable to find field " + name ); + qWarning( "QSqlRecord::position: unable to find field %s", name.latin1() ); #endif return -1; } @@ -313,7 +313,7 @@ checkDetach(); if ( !sh->d->contains( i ) ) { #ifdef QT_CHECK_RANGE - qWarning( "QSqlRecord::field: index out of range: " + QString::number( i ) ); + qWarning( "QSqlRecord::field: index out of range: %d", i ); #endif return 0; } @@ -344,7 +344,7 @@ { if ( !sh->d->contains( i ) ) { #ifdef QT_CHECK_RANGE - qWarning( "QSqlRecord::field: index out of range: " + QString::number( i ) ); + qWarning( "QSqlRecord::field: index out of range: %d", i ); #endif // QT_CHECK_RANGE return 0; } Modified: qt-3/trunk/src/tools/qglobal.cpp =================================================================== --- qt-3/trunk/src/tools/qglobal.cpp 2007-06-15 14:42:45 UTC (rev 2129) +++ qt-3/trunk/src/tools/qglobal.cpp 2007-08-01 11:37:35 UTC (rev 2130) @@ -680,7 +680,7 @@ if ( code != -1 ) qWarning( "%s\n\tError code %d - %s", msg, code, strerror( code ) ); else - qWarning( msg ); + qWarning( "%s", msg ); #endif #else Q_UNUSED( msg ); Modified: qt-3/trunk/src/widgets/qtextedit.cpp =================================================================== --- qt-3/trunk/src/widgets/qtextedit.cpp 2007-06-15 14:42:45 UTC (rev 2129) +++ qt-3/trunk/src/widgets/qtextedit.cpp 2007-08-01 11:37:35 UTC (rev 2130) @@ -6349,7 +6349,7 @@ cur = tag->prev; if ( !cur ) { #ifdef QT_CHECK_RANGE - qWarning( "QTextEdit::optimParseTags: no left-tag for '<" + tag->tag + ">' in line %d.", tag->line + 1 ); + qWarning( "QTextEdit::optimParseTags: no left-tag for '<%s>' in line %d.", tag->tag.ascii(), tag->line + 1 ); #endif return; // something is wrong - give up } @@ -6372,7 +6372,7 @@ break; } else if ( !cur->leftTag ) { #ifdef QT_CHECK_RANGE - qWarning( "QTextEdit::optimParseTags: mismatching %s-tag for '<" + cur->tag + ">' in line %d.", cur->tag[0] == '/' ? "left" : "right", cur->line + 1 ); + qWarning( "QTextEdit::optimParseTags: mismatching %s-tag for '<%s>' in line %d.", cur->tag[0] == '/' ? "left" : "right", cur->tag.ascii(), cur->line + 1 ); #endif return; // something is amiss - give up } Modified: qt-3/trunk/src/xml/qsvgdevice.cpp =================================================================== --- qt-3/trunk/src/xml/qsvgdevice.cpp 2007-06-15 14:42:45 UTC (rev 2129) +++ qt-3/trunk/src/xml/qsvgdevice.cpp 2007-08-01 11:37:35 UTC (rev 2130) @@ -978,7 +978,7 @@ // ### catch references to embedded .svg files QPixmap pix; if ( !pix.load( href ) ) { - qWarning( "QSvgDevice::play: Couldn't load image "+href ); + qWarning( "QSvgDevice::play: Couldn't load image %s", href.latin1() ); break; } pt->drawPixmap( QRect( x1, y1, w, h ), pix ); @@ -1024,8 +1024,8 @@ break; } case InvalidElement: - qWarning( "QSvgDevice::play: unknown element type " + - node.nodeName() ); + qWarning( "QSvgDevice::play: unknown element type %s", + node.nodeName().latin1() ); break; }; @@ -1111,7 +1111,7 @@ { QRegExp reg( QString::fromLatin1("([+-]?\\d*\\.*\\d*[Ee]?[+-]?\\d*)(em|ex|px|%|pt|pc|cm|mm|in|)$") ); if ( reg.search( str ) == -1 ) { - qWarning( "QSvgDevice::parseLen: couldn't parse " + str ); + qWarning( "QSvgDevice::parseLen: couldn't parse %s ", str.latin1() ); if ( ok ) *ok = FALSE; return 0.0; @@ -1140,7 +1140,7 @@ else if ( u == "pc" ) dbl *= m.logicalDpiX() / 6.0; else - qWarning( "QSvgDevice::parseLen: Unknown unit " + u ); + qWarning( "QSvgDevice::parseLen: Unknown unit %s", u.latin1() ); } if ( ok ) *ok = TRUE; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <che...@us...> - 2007-06-15 14:42:51
|
Revision: 2129 http://qtwin.svn.sourceforge.net/qtwin/?rev=2129&view=rev Author: chehrlic Date: 2007-06-15 07:42:45 -0700 (Fri, 15 Jun 2007) Log Message: ----------- fix an issue found by nitor in qtcentre Modified Paths: -------------- qt-4/trunk/mkspecs/win32-msvc/qmake.conf qt-4/trunk/mkspecs/win32-msvc.net/qmake.conf qt-4/trunk/mkspecs/win32-msvc2005/qmake.conf qt-4/trunk/qmake/generators/win32/msvc_nmake.cpp Modified: qt-4/trunk/mkspecs/win32-msvc/qmake.conf =================================================================== --- qt-4/trunk/mkspecs/win32-msvc/qmake.conf 2007-06-08 09:13:50 UTC (rev 2128) +++ qt-4/trunk/mkspecs/win32-msvc/qmake.conf 2007-06-15 14:42:45 UTC (rev 2129) @@ -71,6 +71,7 @@ QMAKE_IDC = $$[QT_INSTALL_BINS]\idc.exe QMAKE_COPY = copy /y +QMAKE_COPY_FILE = copy /y QMAKE_COPY_DIR = xcopy /s /q /y /i QMAKE_MOVE = move QMAKE_DEL_FILE = del Modified: qt-4/trunk/mkspecs/win32-msvc.net/qmake.conf =================================================================== --- qt-4/trunk/mkspecs/win32-msvc.net/qmake.conf 2007-06-08 09:13:50 UTC (rev 2128) +++ qt-4/trunk/mkspecs/win32-msvc.net/qmake.conf 2007-06-15 14:42:45 UTC (rev 2129) @@ -70,6 +70,7 @@ QMAKE_IDC = $$[QT_INSTALL_BINS]\idc.exe QMAKE_COPY = copy /y +QMAKE_COPY_FILE = copy /y QMAKE_COPY_DIR = xcopy /s /q /y /i QMAKE_MOVE = move QMAKE_DEL_FILE = del Modified: qt-4/trunk/mkspecs/win32-msvc2005/qmake.conf =================================================================== --- qt-4/trunk/mkspecs/win32-msvc2005/qmake.conf 2007-06-08 09:13:50 UTC (rev 2128) +++ qt-4/trunk/mkspecs/win32-msvc2005/qmake.conf 2007-06-15 14:42:45 UTC (rev 2129) @@ -71,6 +71,7 @@ QMAKE_IDC = $$[QT_INSTALL_BINS]\idc.exe QMAKE_COPY = copy /y +QMAKE_COPY_FILE = copy /y QMAKE_COPY_DIR = xcopy /s /q /y /i QMAKE_MOVE = move QMAKE_DEL_FILE = del Modified: qt-4/trunk/qmake/generators/win32/msvc_nmake.cpp =================================================================== --- qt-4/trunk/qmake/generators/win32/msvc_nmake.cpp 2007-06-08 09:13:50 UTC (rev 2128) +++ qt-4/trunk/qmake/generators/win32/msvc_nmake.cpp 2007-06-15 14:42:45 UTC (rev 2129) @@ -73,6 +73,8 @@ if ( project->first( "TEMPLATE" ) == "app" ) project->values("QMAKE_APP_FLAG") += "1"; + processVars(); + /* this should probably not be here, but I'm using it to wrap the .t files */ if ( project->first( "TEMPLATE" ) == "subdirs" ) { MakefileGenerator::init(); @@ -85,7 +87,6 @@ project->values ( "TARGET_PRL" ).append( project->first( "TARGET" ) ); - processVars(); #ifdef MSVC_USE_MSC_VER // otherwise we'll get Compiler errors with MSVC 2003.net and above in some cases switch ( getCurrentMsvcVersion( project->first( "MAKEFILE_GENERATOR" ) ) ) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <che...@us...> - 2007-06-08 09:13:52
|
Revision: 2128 http://qtwin.svn.sourceforge.net/qtwin/?rev=2128&view=rev Author: chehrlic Date: 2007-06-08 02:13:50 -0700 (Fri, 08 Jun 2007) Log Message: ----------- regenerate with current qmake Modified Paths: -------------- qt-4/trunk/qmake/Makefile.win32-msvc qt-4/trunk/qmake/Makefile.win32-msvc.net qt-4/trunk/qmake/Makefile.win32-msvc2005 Modified: qt-4/trunk/qmake/Makefile.win32-msvc =================================================================== --- qt-4/trunk/qmake/Makefile.win32-msvc 2007-06-08 08:59:31 UTC (rev 2127) +++ qt-4/trunk/qmake/Makefile.win32-msvc 2007-06-08 09:13:50 UTC (rev 2128) @@ -1,23 +1,19 @@ ############################################################################# # Makefile for building: qmake -# Generated by qmake (2.01a) (Qt 4.3.0beta) on: Mo 26. Mrz 18:51:11 2007 +# Generated by qmake (2.01a) (Qt 4.3.0) on: Fr 8. Jun 11:10:36 2007 # Project: qmake.pro # Template: app -# Command: ../bin\qmake.exe -nodepend -spec ..\mkspecs\win32-msvc -win32 -o Makefile.win32-msvc qmake.pro +# Command: ..\bin\qmake.exe -nodepend -spec ..\mkspecs\win32-msvc -win32 -o Makefile.win32-msvc qmake.pro ############################################################################# ####### Compiler, tools and options CC = cl CXX = cl -LEX = flex -YACC = byacc DEFINES = -DUNICODE -DQT_LARGEFILE_SUPPORT -DWIN32 -DQT_BUILD_QMAKE -DQT_BOOTSTRAPPED -DQT_NO_TEXTCODEC -DQT_NO_LIBRARY -DQT_NO_STL -DQT_NO_COMPRESS -DQT_NO_UNICODETABLES -DQT_NO_GEOM_VARIANT -DQT_NO_DATASTREAM -DQMAKE_OPENSOURCE_EDITION -DQT_NODLL -DQT_NO_THREAD -DQT_NO_QOBJECT CFLAGS = -nologo -Zm200 -O1 -MD -DNDEBUG -W3 $(DEFINES) CXXFLAGS = -nologo -Zm200 -O1 -MD -DNDEBUG -GR -GX -W3 $(DEFINES) -LEXFLAGS = -YACCFLAGS = -d -INCPATH = -I"../src/corelib/arch/generic" -I"generators" -I"generators\unix" -I"generators\win32" -I"generators\mac" -I"../include" -I"../include/QtCore" -I"../qmake" -I"../include/QtScript" -I"../src/script" -I"..\mkspecs\win32-msvc" +INCPATH = -I"..\src\corelib\arch\generic" -I"generators" -I"generators\unix" -I"generators\win32" -I"generators\mac" -I"..\include" -I"..\include\QtCore" -I"." -I"..\include\QtScript" -I"..\src\script" -I"..\mkspecs\win32-msvc" LINK = link LFLAGS = /NOLOGO /SUBSYSTEM:CONSOLE /incremental:no LIBS = ole32.lib advapi32.lib @@ -250,22 +246,22 @@ $< << -{tmp/rcc/debug_shared}.cpp{tmp\}.obj:: +{tmp\rcc\debug_shared}.cpp{tmp\}.obj:: $(CXX) -c -FIqmake_pch.h -Yuqmake_pch.h -Fptmp\qmake_pch.pch $(CXXFLAGS) $(INCPATH) -Fotmp\ @<< $< << -{tmp/rcc/debug_shared}.cc{tmp\}.obj:: +{tmp\rcc\debug_shared}.cc{tmp\}.obj:: $(CXX) -c -FIqmake_pch.h -Yuqmake_pch.h -Fptmp\qmake_pch.pch $(CXXFLAGS) $(INCPATH) -Fotmp\ @<< $< << -{tmp/rcc/debug_shared}.cxx{tmp\}.obj:: +{tmp\rcc\debug_shared}.cxx{tmp\}.obj:: $(CXX) -c -FIqmake_pch.h -Yuqmake_pch.h -Fptmp\qmake_pch.pch $(CXXFLAGS) $(INCPATH) -Fotmp\ @<< $< << -{tmp/rcc/debug_shared}.c{tmp\}.obj:: +{tmp\rcc\debug_shared}.c{tmp\}.obj:: $(CC) -c $(CFLAGS) $(INCPATH) -Fotmp\ @<< $< << @@ -506,18 +502,24 @@ dist: - $(ZIP) qmake.zip $(SOURCES) $(DIST) qmake.pro ..\mkspecs\features\exclusive_builds.prf ..\mkspecs\features\default_pre.prf ..\mkspecs\features\win32\default_pre.prf ../.qmake.cache ../mkspecs/qconfig.pri ..\mkspecs\features\qt_functions.prf ..\mkspecs\features\qt_config.prf ../src/script/script.pri qmake.pri ..\mkspecs\features\release.prf ..\mkspecs\features\default_post.prf ..\mkspecs\features\win32\console.prf ..\mkspecs\features\win32\rtti.prf ..\mkspecs\features\win32\exceptions.prf ..\mkspecs\features\win32\stl.prf ..\mkspecs\features\warn_on.prf ..\mkspecs\features\win32\thread_off.prf ..\mkspecs\features\resources.prf RESOURCES + $(ZIP) qmake.zip $(SOURCES) $(DIST) qmake.pro ..\mkspecs\features\exclusive_builds.prf ..\mkspecs\features\default_pre.prf ..\mkspecs\features\win32\default_pre.prf ..\.qmake.cache ..\mkspecs\qconfig.pri ..\mkspecs\features\qt_functions.prf ..\mkspecs\features\qt_config.prf ..\src\script\script.pri qmake.pri ..\mkspecs\features\release.prf ..\mkspecs\features\default_post.prf ..\mkspecs\features\win32\console.prf ..\mkspecs\features\win32\rtti.prf ..\mkspecs\features\win32\exceptions.prf ..\mkspecs\features\win32\stl.prf ..\mkspecs\features\warn_on.prf ..\mkspecs\features\win32\thread_off.prf ..\mkspecs\features\resources.prf ..\mkspecs\features\yacc.prf ..\mkspecs\features\lex.prf RESOURCES YACCSOURCES YACCSOURCES LEXSOURCES clean: compiler_clean -$(DEL_FILE) tmp\project.obj tmp\property.obj tmp\main.obj tmp\makefile.obj tmp\unixmake2.obj tmp\unixmake.obj tmp\meta.obj tmp\option.obj tmp\winmakefile.obj tmp\mingw_make.obj tmp\makefiledeps.obj tmp\metamakefile.obj tmp\pbuilder_pbx.obj tmp\xmloutput.obj tmp\borland_bmake.obj tmp\msvc_nmake.obj tmp\projectgenerator.obj tmp\msvc_vcproj.obj tmp\msvc_objectmodel.obj tmp\qbitarray.obj tmp\qbuffer.obj tmp\qbytearray.obj tmp\qbytearraymatcher.obj tmp\qcryptographichash.obj tmp\qdatetime.obj tmp\qdir.obj tmp\qdiriterator.obj tmp\qfile.obj tmp\qabstractfileengine.obj tmp\qfileinfo.obj tmp\qfsfileengine.obj tmp\qfsfileengine_iterator.obj tmp\qglobal.obj tmp\qnumeric.obj tmp\qhash.obj tmp\qiodevice.obj tmp\qlistdata.obj tmp\qlinkedlist.obj tmp\qlocale.obj tmp\qmap.obj tmp\qmetatype.obj tmp\qregexp.obj tmp\qstring.obj tmp\qstringlist.obj tmp\qtemporaryfile.obj tmp\qtextstream.obj tmp\qurl.obj tmp\quuid.obj tmp\qsettings.obj tmp\qlibraryinfo.obj tmp\qvariant.obj tmp\qvector.obj tmp\qvsnprintf.obj tmp\qfsfileengine_win.obj tmp\qfsfileengine_iterator_win.obj tmp\qsettings_win.obj tmp\qscriptasm.obj tmp\qscriptast.obj tmp\qscriptastvisitor.obj tmp\qscriptcompiler.obj tmp\qscriptecmaarray.obj tmp\qscriptecmaboolean.obj tmp\qscriptecmacore.obj tmp\qscriptecmadate.obj tmp\qscriptecmafunction.obj tmp\qscriptecmaglobal.obj tmp\qscriptecmamath.obj tmp\qscriptecmanumber.obj tmp\qscriptecmaobject.obj tmp\qscriptecmaregexp.obj tmp\qscriptecmastring.obj tmp\qscriptecmaerror.obj tmp\qscriptcontext_p.obj tmp\qscriptengine.obj tmp\qscriptengine_p.obj tmp\qscriptextenumeration.obj tmp\qscriptextvariant.obj tmp\qscriptcontext.obj tmp\qscriptfunction.obj tmp\qscriptgrammar.obj tmp\qscriptlexer.obj tmp\qscriptclassdata.obj tmp\qscriptparser.obj tmp\qscriptprettypretty.obj tmp\qscriptsyntaxchecker.obj tmp\qscriptvalueiterator.obj tmp\qscriptvalueimpl.obj tmp\qscriptvalue.obj tmp\qmake_pch.obj -$(DEL_FILE) tmp\qmake_pch.pch distclean: clean - -$(DEL_FILE) "$(DESTDIR_TARGET)" + -$(DEL_FILE) $(DESTDIR_TARGET) compiler_rcc_make_all: compiler_rcc_clean: -compiler_clean: compiler_rcc_clean +compiler_yacc_decl_make_all: +compiler_yacc_decl_clean: +compiler_yacc_impl_make_all: +compiler_yacc_impl_clean: +compiler_lex_make_all: +compiler_lex_clean: +compiler_clean: @@ -848,6 +850,7 @@ ..\src\script\qscriptengine_p.h \ ..\src\script\qscriptextenumeration_p.h \ ..\src\script\qscriptmember_p.h \ + ..\src\script\qscriptnodepool_p.h \ ..\src\script\qscriptobject_p.h \ ..\src\script\qscriptprettypretty_p.h \ ..\src\script\qscriptvalueimpl_p.h @@ -871,6 +874,7 @@ ..\src\script\qscriptextenumeration_p.h \ ..\src\script\qscriptlexer_p.h \ ..\src\script\qscriptmember_p.h \ + ..\src\script\qscriptnodepool_p.h \ ..\src\script\qscriptobject_p.h \ ..\src\script\qscriptparser_p.h \ ..\src\script\qscriptvalueimpl_p.h Modified: qt-4/trunk/qmake/Makefile.win32-msvc.net =================================================================== --- qt-4/trunk/qmake/Makefile.win32-msvc.net 2007-06-08 08:59:31 UTC (rev 2127) +++ qt-4/trunk/qmake/Makefile.win32-msvc.net 2007-06-08 09:13:50 UTC (rev 2128) @@ -1,23 +1,19 @@ ############################################################################# # Makefile for building: qmake -# Generated by qmake (2.01a) (Qt 4.3.0beta) on: Mo 26. Mrz 18:51:23 2007 +# Generated by qmake (2.01a) (Qt 4.3.0) on: Fr 8. Jun 11:09:17 2007 # Project: qmake.pro # Template: app -# Command: ../bin\qmake.exe -nodepend -spec ..\mkspecs\win32-msvc.net -win32 -o Makefile.win32-msvc.net qmake.pro +# Command: ..\bin\qmake.exe -nodepend -spec ..\mkspecs\win32-msvc.net -win32 -o Makefile.win32-msvc.net qmake.pro ############################################################################# ####### Compiler, tools and options CC = cl CXX = cl -LEX = flex -YACC = byacc DEFINES = -DUNICODE -DQT_LARGEFILE_SUPPORT -DWIN32 -DQT_BUILD_QMAKE -DQT_BOOTSTRAPPED -DQT_NO_TEXTCODEC -DQT_NO_LIBRARY -DQT_NO_STL -DQT_NO_COMPRESS -DQT_NO_UNICODETABLES -DQT_NO_GEOM_VARIANT -DQT_NO_DATASTREAM -DQMAKE_OPENSOURCE_EDITION -DQT_NODLL -DQT_NO_THREAD -DQT_NO_QOBJECT CFLAGS = -nologo -Zm200 -O1 -MD -DNDEBUG -W3 $(DEFINES) CXXFLAGS = -nologo -Zm200 -O1 -MD -DNDEBUG -GR -EHsc -W3 $(DEFINES) -LEXFLAGS = -YACCFLAGS = -d -INCPATH = -I"../src/corelib/arch/generic" -I"generators" -I"generators\unix" -I"generators\win32" -I"generators\mac" -I"../include" -I"../include/QtCore" -I"../qmake" -I"../include/QtScript" -I"../src/script" -I"..\mkspecs\win32-msvc.net" +INCPATH = -I"..\src\corelib\arch\generic" -I"generators" -I"generators\unix" -I"generators\win32" -I"generators\mac" -I"..\include" -I"..\include\QtCore" -I"." -I"..\include\QtScript" -I"..\src\script" -I"..\mkspecs\win32-msvc.net" LINK = link LFLAGS = /NOLOGO /SUBSYSTEM:CONSOLE /incremental:no LIBS = ole32.lib advapi32.lib @@ -250,22 +246,22 @@ $< << -{tmp/rcc/debug_shared}.cpp{tmp\}.obj:: +{tmp\rcc\debug_shared}.cpp{tmp\}.obj:: $(CXX) -c -FIqmake_pch.h -Yuqmake_pch.h -Fptmp\qmake_pch.pch $(CXXFLAGS) $(INCPATH) -Fotmp\ @<< $< << -{tmp/rcc/debug_shared}.cc{tmp\}.obj:: +{tmp\rcc\debug_shared}.cc{tmp\}.obj:: $(CXX) -c -FIqmake_pch.h -Yuqmake_pch.h -Fptmp\qmake_pch.pch $(CXXFLAGS) $(INCPATH) -Fotmp\ @<< $< << -{tmp/rcc/debug_shared}.cxx{tmp\}.obj:: +{tmp\rcc\debug_shared}.cxx{tmp\}.obj:: $(CXX) -c -FIqmake_pch.h -Yuqmake_pch.h -Fptmp\qmake_pch.pch $(CXXFLAGS) $(INCPATH) -Fotmp\ @<< $< << -{tmp/rcc/debug_shared}.c{tmp\}.obj:: +{tmp\rcc\debug_shared}.c{tmp\}.obj:: $(CC) -c $(CFLAGS) $(INCPATH) -Fotmp\ @<< $< << @@ -506,18 +502,24 @@ dist: - $(ZIP) qmake.zip $(SOURCES) $(DIST) qmake.pro ..\mkspecs\features\exclusive_builds.prf ..\mkspecs\features\default_pre.prf ..\mkspecs\features\win32\default_pre.prf ../.qmake.cache ../mkspecs/qconfig.pri ..\mkspecs\features\qt_functions.prf ..\mkspecs\features\qt_config.prf ../src/script/script.pri qmake.pri ..\mkspecs\features\release.prf ..\mkspecs\features\default_post.prf ..\mkspecs\features\win32\console.prf ..\mkspecs\features\win32\rtti.prf ..\mkspecs\features\win32\exceptions.prf ..\mkspecs\features\win32\stl.prf ..\mkspecs\features\warn_on.prf ..\mkspecs\features\win32\thread_off.prf ..\mkspecs\features\resources.prf RESOURCES + $(ZIP) qmake.zip $(SOURCES) $(DIST) qmake.pro ..\mkspecs\features\exclusive_builds.prf ..\mkspecs\features\default_pre.prf ..\mkspecs\features\win32\default_pre.prf ..\.qmake.cache ..\mkspecs\qconfig.pri ..\mkspecs\features\qt_functions.prf ..\mkspecs\features\qt_config.prf ..\src\script\script.pri qmake.pri ..\mkspecs\features\release.prf ..\mkspecs\features\default_post.prf ..\mkspecs\features\win32\console.prf ..\mkspecs\features\win32\rtti.prf ..\mkspecs\features\win32\exceptions.prf ..\mkspecs\features\win32\stl.prf ..\mkspecs\features\warn_on.prf ..\mkspecs\features\win32\thread_off.prf ..\mkspecs\features\resources.prf ..\mkspecs\features\yacc.prf ..\mkspecs\features\lex.prf RESOURCES YACCSOURCES YACCSOURCES LEXSOURCES clean: compiler_clean -$(DEL_FILE) tmp\project.obj tmp\property.obj tmp\main.obj tmp\makefile.obj tmp\unixmake2.obj tmp\unixmake.obj tmp\meta.obj tmp\option.obj tmp\winmakefile.obj tmp\mingw_make.obj tmp\makefiledeps.obj tmp\metamakefile.obj tmp\pbuilder_pbx.obj tmp\xmloutput.obj tmp\borland_bmake.obj tmp\msvc_nmake.obj tmp\projectgenerator.obj tmp\msvc_vcproj.obj tmp\msvc_objectmodel.obj tmp\qbitarray.obj tmp\qbuffer.obj tmp\qbytearray.obj tmp\qbytearraymatcher.obj tmp\qcryptographichash.obj tmp\qdatetime.obj tmp\qdir.obj tmp\qdiriterator.obj tmp\qfile.obj tmp\qabstractfileengine.obj tmp\qfileinfo.obj tmp\qfsfileengine.obj tmp\qfsfileengine_iterator.obj tmp\qglobal.obj tmp\qnumeric.obj tmp\qhash.obj tmp\qiodevice.obj tmp\qlistdata.obj tmp\qlinkedlist.obj tmp\qlocale.obj tmp\qmap.obj tmp\qmetatype.obj tmp\qregexp.obj tmp\qstring.obj tmp\qstringlist.obj tmp\qtemporaryfile.obj tmp\qtextstream.obj tmp\qurl.obj tmp\quuid.obj tmp\qsettings.obj tmp\qlibraryinfo.obj tmp\qvariant.obj tmp\qvector.obj tmp\qvsnprintf.obj tmp\qfsfileengine_win.obj tmp\qfsfileengine_iterator_win.obj tmp\qsettings_win.obj tmp\qscriptasm.obj tmp\qscriptast.obj tmp\qscriptastvisitor.obj tmp\qscriptcompiler.obj tmp\qscriptecmaarray.obj tmp\qscriptecmaboolean.obj tmp\qscriptecmacore.obj tmp\qscriptecmadate.obj tmp\qscriptecmafunction.obj tmp\qscriptecmaglobal.obj tmp\qscriptecmamath.obj tmp\qscriptecmanumber.obj tmp\qscriptecmaobject.obj tmp\qscriptecmaregexp.obj tmp\qscriptecmastring.obj tmp\qscriptecmaerror.obj tmp\qscriptcontext_p.obj tmp\qscriptengine.obj tmp\qscriptengine_p.obj tmp\qscriptextenumeration.obj tmp\qscriptextvariant.obj tmp\qscriptcontext.obj tmp\qscriptfunction.obj tmp\qscriptgrammar.obj tmp\qscriptlexer.obj tmp\qscriptclassdata.obj tmp\qscriptparser.obj tmp\qscriptprettypretty.obj tmp\qscriptsyntaxchecker.obj tmp\qscriptvalueiterator.obj tmp\qscriptvalueimpl.obj tmp\qscriptvalue.obj tmp\qmake_pch.obj -$(DEL_FILE) tmp\qmake_pch.pch distclean: clean - -$(DEL_FILE) "$(DESTDIR_TARGET)" + -$(DEL_FILE) $(DESTDIR_TARGET) compiler_rcc_make_all: compiler_rcc_clean: -compiler_clean: compiler_rcc_clean +compiler_yacc_decl_make_all: +compiler_yacc_decl_clean: +compiler_yacc_impl_make_all: +compiler_yacc_impl_clean: +compiler_lex_make_all: +compiler_lex_clean: +compiler_clean: @@ -848,6 +850,7 @@ ..\src\script\qscriptengine_p.h \ ..\src\script\qscriptextenumeration_p.h \ ..\src\script\qscriptmember_p.h \ + ..\src\script\qscriptnodepool_p.h \ ..\src\script\qscriptobject_p.h \ ..\src\script\qscriptprettypretty_p.h \ ..\src\script\qscriptvalueimpl_p.h @@ -871,6 +874,7 @@ ..\src\script\qscriptextenumeration_p.h \ ..\src\script\qscriptlexer_p.h \ ..\src\script\qscriptmember_p.h \ + ..\src\script\qscriptnodepool_p.h \ ..\src\script\qscriptobject_p.h \ ..\src\script\qscriptparser_p.h \ ..\src\script\qscriptvalueimpl_p.h Modified: qt-4/trunk/qmake/Makefile.win32-msvc2005 =================================================================== --- qt-4/trunk/qmake/Makefile.win32-msvc2005 2007-06-08 08:59:31 UTC (rev 2127) +++ qt-4/trunk/qmake/Makefile.win32-msvc2005 2007-06-08 09:13:50 UTC (rev 2128) @@ -1,6 +1,6 @@ ############################################################################# # Makefile for building: qmake -# Generated by qmake (2.01a) (Qt 4.2.3) on: So 25. Mrz 22:30:02 2007 +# Generated by qmake (2.01a) (Qt 4.3.0) on: Fr 8. Jun 11:05:20 2007 # Project: qmake.pro # Template: app # Command: ..\bin\qmake.exe -nodepend -win32 -o Makefile.win32-msvc2005 qmake.pro @@ -10,14 +10,10 @@ CC = cl CXX = cl -LEX = flex -YACC = byacc DEFINES = -DUNICODE -DQT_LARGEFILE_SUPPORT -DWIN32 -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE -DQT_BUILD_QMAKE -DQT_BOOTSTRAPPED -DQT_NO_TEXTCODEC -DQT_NO_LIBRARY -DQT_NO_STL -DQT_NO_COMPRESS -DQT_NO_UNICODETABLES -DQT_NO_GEOM_VARIANT -DQT_NO_DATASTREAM -DQMAKE_OPENSOURCE_EDITION -DQT_NODLL -DQT_NO_THREAD -DQT_NO_QOBJECT CFLAGS = -nologo -Zm200 -GS -O2 -MD -DNDEBUG -W3 $(DEFINES) CXXFLAGS = -nologo -Zm200 -GS -O2 -MD -DNDEBUG -GR -EHsc -W3 $(DEFINES) -LEXFLAGS = -YACCFLAGS = -d -INCPATH = -I"../src/corelib/arch/generic" -I"generators" -I"generators\unix" -I"generators\win32" -I"generators\mac" -I"../include" -I"../include/QtCore" -I"../qmake" -I"../include/QtScript" -I"../src/script" -I"..\mkspecs\win32-msvc2005" +INCPATH = -I"..\src\corelib\arch\generic" -I"generators" -I"generators\unix" -I"generators\win32" -I"generators\mac" -I"..\include" -I"..\include\QtCore" -I"." -I"..\include\QtScript" -I"..\src\script" -I"..\mkspecs\win32-msvc2005" LINK = link LFLAGS = /NOLOGO /SUBSYSTEM:CONSOLE /incremental:no LIBS = ole32.lib advapi32.lib @@ -250,22 +246,22 @@ $< << -{tmp/rcc/debug_shared}.cpp{tmp\}.obj:: +{tmp\rcc\debug_shared}.cpp{tmp\}.obj:: $(CXX) -c -FIqmake_pch.h -Yuqmake_pch.h -Fptmp\qmake_pch.pch $(CXXFLAGS) $(INCPATH) -Fotmp\ @<< $< << -{tmp/rcc/debug_shared}.cc{tmp\}.obj:: +{tmp\rcc\debug_shared}.cc{tmp\}.obj:: $(CXX) -c -FIqmake_pch.h -Yuqmake_pch.h -Fptmp\qmake_pch.pch $(CXXFLAGS) $(INCPATH) -Fotmp\ @<< $< << -{tmp/rcc/debug_shared}.cxx{tmp\}.obj:: +{tmp\rcc\debug_shared}.cxx{tmp\}.obj:: $(CXX) -c -FIqmake_pch.h -Yuqmake_pch.h -Fptmp\qmake_pch.pch $(CXXFLAGS) $(INCPATH) -Fotmp\ @<< $< << -{tmp/rcc/debug_shared}.c{tmp\}.obj:: +{tmp\rcc\debug_shared}.c{tmp\}.obj:: $(CC) -c $(CFLAGS) $(INCPATH) -Fotmp\ @<< $< << @@ -508,18 +504,24 @@ dist: - $(ZIP) qmake.zip $(SOURCES) $(DIST) qmake.pro ..\mkspecs\features\exclusive_builds.prf ..\mkspecs\features\default_pre.prf ..\mkspecs\features\win32\default_pre.prf ../.qmake.cache ../mkspecs/qconfig.pri ..\mkspecs\features\qt_functions.prf ..\mkspecs\features\qt_config.prf ../src/script/script.pri qmake.pri ..\mkspecs\features\release.prf ..\mkspecs\features\default_post.prf ..\mkspecs\features\win32\console.prf ..\mkspecs\features\win32\rtti.prf ..\mkspecs\features\win32\exceptions.prf ..\mkspecs\features\win32\stl.prf ..\mkspecs\features\win32\embed_manifest_dll.prf ..\mkspecs\features\warn_on.prf ..\mkspecs\features\win32\thread_off.prf ..\mkspecs\features\resources.prf RESOURCES + $(ZIP) qmake.zip $(SOURCES) $(DIST) qmake.pro ..\mkspecs\features\exclusive_builds.prf ..\mkspecs\features\default_pre.prf ..\mkspecs\features\win32\default_pre.prf ..\.qmake.cache ..\mkspecs\qconfig.pri ..\mkspecs\features\qt_functions.prf ..\mkspecs\features\qt_config.prf ..\src\script\script.pri qmake.pri ..\mkspecs\features\release.prf ..\mkspecs\features\default_post.prf ..\mkspecs\features\win32\console.prf ..\mkspecs\features\win32\rtti.prf ..\mkspecs\features\win32\exceptions.prf ..\mkspecs\features\win32\stl.prf ..\mkspecs\features\win32\embed_manifest_dll.prf ..\mkspecs\features\warn_on.prf ..\mkspecs\features\win32\thread_off.prf ..\mkspecs\features\resources.prf ..\mkspecs\features\yacc.prf ..\mkspecs\features\lex.prf RESOURCES YACCSOURCES YACCSOURCES LEXSOURCES -clean: compiler_clean +clean: compiler_clean -$(DEL_FILE) tmp\project.obj tmp\property.obj tmp\main.obj tmp\makefile.obj tmp\unixmake2.obj tmp\unixmake.obj tmp\meta.obj tmp\option.obj tmp\winmakefile.obj tmp\mingw_make.obj tmp\makefiledeps.obj tmp\metamakefile.obj tmp\pbuilder_pbx.obj tmp\xmloutput.obj tmp\borland_bmake.obj tmp\msvc_nmake.obj tmp\projectgenerator.obj tmp\msvc_vcproj.obj tmp\msvc_objectmodel.obj tmp\qbitarray.obj tmp\qbuffer.obj tmp\qbytearray.obj tmp\qbytearraymatcher.obj tmp\qcryptographichash.obj tmp\qdatetime.obj tmp\qdir.obj tmp\qdiriterator.obj tmp\qfile.obj tmp\qabstractfileengine.obj tmp\qfileinfo.obj tmp\qfsfileengine.obj tmp\qfsfileengine_iterator.obj tmp\qglobal.obj tmp\qnumeric.obj tmp\qhash.obj tmp\qiodevice.obj tmp\qlistdata.obj tmp\qlinkedlist.obj tmp\qlocale.obj tmp\qmap.obj tmp\qmetatype.obj tmp\qregexp.obj tmp\qstring.obj tmp\qstringlist.obj tmp\qtemporaryfile.obj tmp\qtextstream.obj tmp\qurl.obj tmp\quuid.obj tmp\qsettings.obj tmp\qlibraryinfo.obj tmp\qvariant.obj tmp\qvector.obj tmp\qvsnprintf.obj tmp\qfsfileengine_win.obj tmp\qfsfileengine_iterator_win.obj tmp\qsettings_win.obj tmp\qscriptasm.obj tmp\qscriptast.obj tmp\qscriptastvisitor.obj tmp\qscriptcompiler.obj tmp\qscriptecmaarray.obj tmp\qscriptecmaboolean.obj tmp\qscriptecmacore.obj tmp\qscriptecmadate.obj tmp\qscriptecmafunction.obj tmp\qscriptecmaglobal.obj tmp\qscriptecmamath.obj tmp\qscriptecmanumber.obj tmp\qscriptecmaobject.obj tmp\qscriptecmaregexp.obj tmp\qscriptecmastring.obj tmp\qscriptecmaerror.obj tmp\qscriptcontext_p.obj tmp\qscriptengine.obj tmp\qscriptengine_p.obj tmp\qscriptextenumeration.obj tmp\qscriptextvariant.obj tmp\qscriptcontext.obj tmp\qscriptfunction.obj tmp\qscriptgrammar.obj tmp\qscriptlexer.obj tmp\qscriptclassdata.obj tmp\qscriptparser.obj tmp\qscriptprettypretty.obj tmp\qscriptsyntaxchecker.obj tmp\qscriptvalueiterator.obj tmp\qscriptvalueimpl.obj tmp\qscriptvalue.obj tmp\qmake_pch.obj -$(DEL_FILE) tmp\qmake_pch.pch distclean: clean - -$(DEL_FILE) "$(DESTDIR_TARGET)" + -$(DEL_FILE) $(DESTDIR_TARGET) compiler_rcc_make_all: compiler_rcc_clean: -compiler_clean: compiler_rcc_clean +compiler_yacc_decl_make_all: +compiler_yacc_decl_clean: +compiler_yacc_impl_make_all: +compiler_yacc_impl_clean: +compiler_lex_make_all: +compiler_lex_clean: +compiler_clean: @@ -850,6 +852,7 @@ ..\src\script\qscriptengine_p.h \ ..\src\script\qscriptextenumeration_p.h \ ..\src\script\qscriptmember_p.h \ + ..\src\script\qscriptnodepool_p.h \ ..\src\script\qscriptobject_p.h \ ..\src\script\qscriptprettypretty_p.h \ ..\src\script\qscriptvalueimpl_p.h @@ -873,6 +876,7 @@ ..\src\script\qscriptextenumeration_p.h \ ..\src\script\qscriptlexer_p.h \ ..\src\script\qscriptmember_p.h \ + ..\src\script\qscriptnodepool_p.h \ ..\src\script\qscriptobject_p.h \ ..\src\script\qscriptparser_p.h \ ..\src\script\qscriptvalueimpl_p.h This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <che...@us...> - 2007-06-08 08:59:32
|
Revision: 2127 http://qtwin.svn.sourceforge.net/qtwin/?rev=2127&view=rev Author: chehrlic Date: 2007-06-08 01:59:31 -0700 (Fri, 08 Jun 2007) Log Message: ----------- no _fseeki64/_ftelli64 for msvc6/.net 2003 :-( Modified Paths: -------------- qt-4/trunk/mkspecs/win32-msvc/qplatformdefs.h qt-4/trunk/mkspecs/win32-msvc.net/qplatformdefs.h Modified: qt-4/trunk/mkspecs/win32-msvc/qplatformdefs.h =================================================================== --- qt-4/trunk/mkspecs/win32-msvc/qplatformdefs.h 2007-06-08 07:58:14 UTC (rev 2126) +++ qt-4/trunk/mkspecs/win32-msvc/qplatformdefs.h 2007-06-08 08:59:31 UTC (rev 2127) @@ -74,18 +74,19 @@ #define QT_FOPEN ::fopen -#ifdef QT_LARGEFILE_SUPPORT -#define QT_FSEEK ::_fseeki64 -#define QT_FTELL ::_ftelli64 -#else +// need VS2005 for _fseeki64 / _ftelli64 :( +//#ifdef QT_LARGEFILE_SUPPORT +//#define QT_FSEEK ::_fseeki64 +//#define QT_FTELL ::_ftelli64 +//#else #define QT_FSEEK ::fseek #define QT_FTELL ::ftell -#endif -#ifdef QT_LARGEFILE_SUPPORT -#define QT_OFF_T __int64 -#else +//#endif +//#ifdef QT_LARGEFILE_SUPPORT +//#define QT_OFF_T __int64 +//#else #define QT_OFF_T long -#endif +//#endif #define QT_SIGNAL_ARGS int Modified: qt-4/trunk/mkspecs/win32-msvc.net/qplatformdefs.h =================================================================== --- qt-4/trunk/mkspecs/win32-msvc.net/qplatformdefs.h 2007-06-08 07:58:14 UTC (rev 2126) +++ qt-4/trunk/mkspecs/win32-msvc.net/qplatformdefs.h 2007-06-08 08:59:31 UTC (rev 2127) @@ -78,18 +78,19 @@ #define QT_FOPEN ::fopen -#ifdef QT_LARGEFILE_SUPPORT -#define QT_FSEEK ::_fseeki64 -#define QT_FTELL ::_ftelli64 -#else +// need VS2005 for _fseeki64 / _ftelli64 :( +//#ifdef QT_LARGEFILE_SUPPORT +//#define QT_FSEEK ::_fseeki64 +//#define QT_FTELL ::_ftelli64 +//#else #define QT_FSEEK ::fseek #define QT_FTELL ::ftell -#endif -#ifdef QT_LARGEFILE_SUPPORT -#define QT_OFF_T __int64 -#else +//#endif +//#ifdef QT_LARGEFILE_SUPPORT +//#define QT_OFF_T __int64 +//#else #define QT_OFF_T long -#endif +//#endif #define QT_SIGNAL_ARGS int This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <che...@us...> - 2007-06-08 07:58:16
|
Revision: 2126 http://qtwin.svn.sourceforge.net/qtwin/?rev=2126&view=rev Author: chehrlic Date: 2007-06-08 00:58:14 -0700 (Fri, 08 Jun 2007) Log Message: ----------- forgot some underscores :( Modified Paths: -------------- qt-4/trunk/mkspecs/win32-msvc/qplatformdefs.h qt-4/trunk/mkspecs/win32-msvc.net/qplatformdefs.h Modified: qt-4/trunk/mkspecs/win32-msvc/qplatformdefs.h =================================================================== --- qt-4/trunk/mkspecs/win32-msvc/qplatformdefs.h 2007-06-06 15:58:13 UTC (rev 2125) +++ qt-4/trunk/mkspecs/win32-msvc/qplatformdefs.h 2007-06-08 07:58:14 UTC (rev 2126) @@ -75,8 +75,8 @@ #define QT_FOPEN ::fopen #ifdef QT_LARGEFILE_SUPPORT -#define QT_FSEEK ::fseeki64 -#define QT_FTELL ::ftelli64 +#define QT_FSEEK ::_fseeki64 +#define QT_FTELL ::_ftelli64 #else #define QT_FSEEK ::fseek #define QT_FTELL ::ftell Modified: qt-4/trunk/mkspecs/win32-msvc.net/qplatformdefs.h =================================================================== --- qt-4/trunk/mkspecs/win32-msvc.net/qplatformdefs.h 2007-06-06 15:58:13 UTC (rev 2125) +++ qt-4/trunk/mkspecs/win32-msvc.net/qplatformdefs.h 2007-06-08 07:58:14 UTC (rev 2126) @@ -79,8 +79,8 @@ #define QT_FOPEN ::fopen #ifdef QT_LARGEFILE_SUPPORT -#define QT_FSEEK ::fseeki64 -#define QT_FTELL ::ftelli64 +#define QT_FSEEK ::_fseeki64 +#define QT_FTELL ::_ftelli64 #else #define QT_FSEEK ::fseek #define QT_FTELL ::ftell This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <che...@us...> - 2007-06-06 15:58:14
|
Revision: 2125 http://qtwin.svn.sourceforge.net/qtwin/?rev=2125&view=rev Author: chehrlic Date: 2007-06-06 08:58:13 -0700 (Wed, 06 Jun 2007) Log Message: ----------- some fixes for 4.3.0 Modified Paths: -------------- qt-4/trunk/qconfigure.bat qt-4/trunk/src/network/network.pro Added Paths: ----------- qt-4/trunk/qtwin_patch/patch.exe Modified: qt-4/trunk/qconfigure.bat =================================================================== --- qt-4/trunk/qconfigure.bat 2007-06-04 20:31:39 UTC (rev 2124) +++ qt-4/trunk/qconfigure.bat 2007-06-06 15:58:13 UTC (rev 2125) @@ -33,7 +33,8 @@ :VALIDSPEC -configure.exe -qt-zlib -qt-libmng -qt-libpng -qt-libjpeg -openssl -no-qmake -dont-process -platform win32-g++ %configvars% +SET QMAKESPEC=win32-%1 +configure-opensource.exe -no-qmake -dont-process %configvars% if "%1" == "--help" goto QuitNoCD if "%1" == "-help" goto QuitNoCD if "%1" == "-h" goto QuitNoCD @@ -41,20 +42,6 @@ if "%1" == "-?" goto QuitNoCD if "%1" == "/?" goto QuitNoCD -SET QMAKESPEC=win32-%1 - -:: fix qconfig.h build key (but not for mingw) -if "%1" == "g++" goto EndFixQConfig_h -echo "Fixing qconfig.h" -copy src\corelib\global\qconfig.h src\corelib\global\qconfig.h.mingw -qtwin_patch\sed.exe s/mingw/os-%1/g src\corelib\global\qconfig.h.mingw > src\corelib\global\qconfig.h - -echo "Fixing .qmake.cache" -copy .qmake.cache .qmake.cache.mingw -qtwin_patch\sed.exe s/\//\\/g .qmake.cache.mingw > .qmake.cache - -:EndFixQConfig_h - SET MAKE=nmake if "%1" == "borland" SET MAKE=make if "%1" == "g++" SET MAKE=mingw32-make.exe Copied: qt-4/trunk/qtwin_patch/patch.exe (from rev 2122, qt-4/trunk/qtwin_patch/patch.exe) =================================================================== (Binary files differ) Modified: qt-4/trunk/src/network/network.pro =================================================================== --- qt-4/trunk/src/network/network.pro 2007-06-04 20:31:39 UTC (rev 2124) +++ qt-4/trunk/src/network/network.pro 2007-06-06 15:58:13 UTC (rev 2125) @@ -53,18 +53,7 @@ # OpenSSL support; compile in QSslSocket. contains(QT_CONFIG, openssl) { - win32 { - OPENSSL_INSTALL_DIR=$$(OPENSSLDIR) - isEmpty(OPENSSL_INSTALL_DIR) { - OPENSSL_INSTALL_DIR = "$$(PROGRAMFILES)/openssl" - message("OPENSSLDIR not specified. Using $$OPENSSL_INSTALL_DIR") - } - message("Using $$OPENSSL_INSTALL_DIR") - INCLUDEPATH += $$OPENSSL_INSTALL_DIR/include - win32-msvc*:LIBS += $$OPENSSL_INSTALL_DIR/lib/ssleay32MD.lib $$OPENSSL_INSTALL_DIR/lib/libeay32MD.lib - win32-g++:LIBS += -L\"$$OPENSSL_INSTALL_DIR/lib\" -lssleay32 -leay32 - } - else:include($$QT_SOURCE_TREE/config.tests/unix/openssl/openssl.pri) + include($$QT_SOURCE_TREE/config.tests/unix/openssl/openssl.pri) HEADERS += qssl.h \ qsslcertificate.h \ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ah...@us...> - 2007-06-04 20:31:40
|
Revision: 2124 http://qtwin.svn.sourceforge.net/qtwin/?rev=2124&view=rev Author: ahuser Date: 2007-06-04 13:31:39 -0700 (Mon, 04 Jun 2007) Log Message: ----------- Removed bccx. CodeGear no longer ships this compiler Modified Paths: -------------- qt-4/trunk/qconfigure.bat Modified: qt-4/trunk/qconfigure.bat =================================================================== --- qt-4/trunk/qconfigure.bat 2007-06-04 07:35:01 UTC (rev 2123) +++ qt-4/trunk/qconfigure.bat 2007-06-04 20:31:39 UTC (rev 2124) @@ -8,7 +8,6 @@ if "%1" == "msvc.net" goto VALIDSPEC8 if "%1" == "msvc2005" goto VALIDSPEC8 if "%1" == "borland" goto VALIDSPEC7 -if "%1" == "bccx" goto VALIDSPEC4 goto ERROR This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <che...@us...> - 2007-06-04 07:35:04
|
Revision: 2123 http://qtwin.svn.sourceforge.net/qtwin/?rev=2123&view=rev Author: chehrlic Date: 2007-06-04 00:35:01 -0700 (Mon, 04 Jun 2007) Log Message: ----------- update for 4.3.0 Modified Paths: -------------- qt-4/trunk/qtwin_patch/installpatch43.bat qt-4/trunk/qtwin_patch/removepatch43.bat Added Paths: ----------- qt-4/trunk/qtwin_patch/configure-opensource.exe Removed Paths: ------------- qt-4/trunk/qtwin_patch/libiconv2.dll qt-4/trunk/qtwin_patch/libintl3.dll qt-4/trunk/qtwin_patch/patch.exe qt-4/trunk/qtwin_patch/sed.exe Added: qt-4/trunk/qtwin_patch/configure-opensource.exe =================================================================== (Binary files differ) Property changes on: qt-4/trunk/qtwin_patch/configure-opensource.exe ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: qt-4/trunk/qtwin_patch/installpatch43.bat =================================================================== --- qt-4/trunk/qtwin_patch/installpatch43.bat 2007-06-04 07:20:40 UTC (rev 2122) +++ qt-4/trunk/qtwin_patch/installpatch43.bat 2007-06-04 07:35:01 UTC (rev 2123) @@ -1,3 +1,4 @@ @echo off +copy /y qtwin_patch\configure-opensource.exe . qtwin_patch\patch.exe -p1 -i qtwin_patch\msvc_bcc32_43.patch pause Deleted: qt-4/trunk/qtwin_patch/libiconv2.dll =================================================================== (Binary files differ) Deleted: qt-4/trunk/qtwin_patch/libintl3.dll =================================================================== (Binary files differ) Deleted: qt-4/trunk/qtwin_patch/patch.exe =================================================================== (Binary files differ) Modified: qt-4/trunk/qtwin_patch/removepatch43.bat =================================================================== --- qt-4/trunk/qtwin_patch/removepatch43.bat 2007-06-04 07:20:40 UTC (rev 2122) +++ qt-4/trunk/qtwin_patch/removepatch43.bat 2007-06-04 07:35:01 UTC (rev 2123) @@ -1,3 +1,4 @@ @echo off qtwin_patch\patch.exe -R -p1 -i qtwin_patch\msvc_bcc32_43.patch +del /F configure-opensource.exe pause Deleted: qt-4/trunk/qtwin_patch/sed.exe =================================================================== (Binary files differ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <che...@us...> - 2007-06-04 07:20:42
|
Revision: 2122 http://qtwin.svn.sourceforge.net/qtwin/?rev=2122&view=rev Author: chehrlic Date: 2007-06-04 00:20:40 -0700 (Mon, 04 Jun 2007) Log Message: ----------- some changes to allow compile with msvc Modified Paths: -------------- qt-4/trunk/tools/configure/configure.pro qt-4/trunk/tools/configure/configureapp.cpp Modified: qt-4/trunk/tools/configure/configure.pro =================================================================== --- qt-4/trunk/tools/configure/configure.pro 2007-06-03 16:24:34 UTC (rev 2121) +++ qt-4/trunk/tools/configure/configure.pro 2007-06-04 07:20:40 UTC (rev 2122) @@ -1,11 +1,12 @@ -TARGET = configure +TARGET = configure-opensource DESTDIR = ../.. -CONFIG += console flat -CONFIG -= moc qt +CONFIG += console flat release +CONFIG -= moc qt debug_and_release debug DEFINES = QT_NODLL QT_NO_CODECS QT_NO_TEXTCODEC QT_NO_UNICODETABLES QT_LITE_COMPONENT QT_NO_STL QT_NO_COMPRESS QT_BUILD_QMAKE QT_NO_THREAD QT_NO_QOBJECT _CRT_SECURE_NO_DEPRECATE +OBJECTS_DIR = tmp +MOC_DIR = tmp - win32 : LIBS += -lole32 -ladvapi32 win32-msvc.net : QMAKE_CXXFLAGS += /EHsc win32-g++ : LIBS += -luuid @@ -16,10 +17,10 @@ QMAKE_CXXFLAGS_RELEASE -= -MD QMAKE_CXXFLAGS_DEBUG -= -MDd - QMAKE_CFLAGS_RELEASE += -ML - QMAKE_CFLAGS_DEBUG += -MLd - QMAKE_CXXFLAGS_RELEASE += -ML - QMAKE_CXXFLAGS_DEBUG += -MLd + QMAKE_CFLAGS_RELEASE += -MTd + QMAKE_CFLAGS_DEBUG += -MTd + QMAKE_CXXFLAGS_RELEASE += -MT + QMAKE_CXXFLAGS_DEBUG += -MTd } PRECOMPILED_HEADER = configure_pch.h Modified: qt-4/trunk/tools/configure/configureapp.cpp =================================================================== --- qt-4/trunk/tools/configure/configureapp.cpp 2007-06-03 16:24:34 UTC (rev 2121) +++ qt-4/trunk/tools/configure/configureapp.cpp 2007-06-04 07:20:40 UTC (rev 2122) @@ -1278,7 +1278,7 @@ return false; } -bool Configure::findFile( const QString &fileName ) +bool Configure::findFile( const QString &fileName, const QStringList &morePathes ) { QString file = fileName.toLower(); QStringList paths; @@ -1557,7 +1557,7 @@ { QString spec = dictionary["QMAKESPEC"]; - QString compiler = "msvc"; // ICC is compatible + QString compiler = "os-msvc"; // ICC is compatible if (spec.endsWith("-g++")) compiler = "mingw"; else if (spec.endsWith("-borland")) @@ -2679,12 +2679,14 @@ licenseInfo["LICENSEE"] = "Open Source"; dictionary["EDITION"] = "OpenSource"; dictionary["QT_EDITION"] = "QT_EDITION_OPENSOURCE"; +/* // Ensure that the right QMAKESPEC is used for the Open Source version if (!dictionary["QMAKESPEC"].endsWith("-g++")) { cout << "The Qt/Windows Open Source Edition only supports the MinGW compiler." << endl; dictionary["DONE"] = "error"; return; } +*/ cout << endl; if (!showLicense(dictionary["LICENSE FILE"])) { cout << "Configuration aborted since license was not accepted"; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <che...@us...> - 2007-05-31 19:42:22
|
Revision: 2116 http://qtwin.svn.sourceforge.net/qtwin/?rev=2116&view=rev Author: chehrlic Date: 2007-05-31 12:42:21 -0700 (Thu, 31 May 2007) Log Message: ----------- Renamed remotely Added Paths: ----------- qt-4/branches/qt_4_import/ Removed Paths: ------------- qt-4/branches/qt_4_3_0/ Copied: qt-4/branches/qt_4_import (from rev 2115, qt-4/branches/qt_4_3_0) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <che...@us...> - 2007-05-31 19:40:37
|
Revision: 2115 http://qtwin.svn.sourceforge.net/qtwin/?rev=2115&view=rev Author: chehrlic Date: 2007-05-31 12:40:36 -0700 (Thu, 31 May 2007) Log Message: ----------- Copied remotely Added Paths: ----------- qt-4/branches/qt_4_3_0/ Copied: qt-4/branches/qt_4_3_0 (from rev 2114, qt-4/tags/qt_4_3_0) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <che...@us...> - 2007-05-31 19:39:29
|
Revision: 2114 http://qtwin.svn.sourceforge.net/qtwin/?rev=2114&view=rev Author: chehrlic Date: 2007-05-31 12:39:29 -0700 (Thu, 31 May 2007) Log Message: ----------- Removed file/folder Removed Paths: ------------- qt-4/branches/unlabeled-1.1.2/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <che...@us...> - 2007-05-31 19:39:23
|
Revision: 2113 http://qtwin.svn.sourceforge.net/qtwin/?rev=2113&view=rev Author: chehrlic Date: 2007-05-31 12:39:19 -0700 (Thu, 31 May 2007) Log Message: ----------- Removed file/folder Removed Paths: ------------- qt-4/branches/QT_IMPORT/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <che...@us...> - 2007-05-31 19:38:48
|
Revision: 2112 http://qtwin.svn.sourceforge.net/qtwin/?rev=2112&view=rev Author: chehrlic Date: 2007-05-31 12:38:44 -0700 (Thu, 31 May 2007) Log Message: ----------- Renamed remotely Added Paths: ----------- qt-4/tags/qt_4_3_0_b1/ Removed Paths: ------------- qt-4/tags/qt_4_3_0_b1_backup/ Copied: qt-4/tags/qt_4_3_0_b1 (from rev 2111, qt-4/tags/qt_4_3_0_b1_backup) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <che...@us...> - 2007-05-31 19:37:28
|
Revision: 2111 http://qtwin.svn.sourceforge.net/qtwin/?rev=2111&view=rev Author: chehrlic Date: 2007-05-31 12:37:27 -0700 (Thu, 31 May 2007) Log Message: ----------- Renamed remotely Added Paths: ----------- qt-4/tags/qt_4_3_0/ Removed Paths: ------------- qt-4/tags/qt_4_3_0_b1/ Copied: qt-4/tags/qt_4_3_0 (from rev 2110, qt-4/tags/qt_4_3_0_b1) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <che...@us...> - 2007-05-31 16:14:05
|
Revision: 2106 http://qtwin.svn.sourceforge.net/qtwin/?rev=2106&view=rev Author: chehrlic Date: 2007-05-31 08:50:08 -0700 (Thu, 31 May 2007) Log Message: ----------- some changes for 4.3 Modified Paths: -------------- qt-4/trunk/qmake/generators/win32/msvc_nmake.cpp Modified: qt-4/trunk/qmake/generators/win32/msvc_nmake.cpp =================================================================== --- qt-4/trunk/qmake/generators/win32/msvc_nmake.cpp 2007-05-31 15:49:46 UTC (rev 2105) +++ qt-4/trunk/qmake/generators/win32/msvc_nmake.cpp 2007-05-31 15:50:08 UTC (rev 2106) @@ -24,7 +24,6 @@ #include <stdlib.h> #include <time.h> -extern void removeDuplicates( QStringList &list ); #ifdef MSVC_USE_MSC_VER extern int getCurrentMsvcVersion( const QString &generator = QString() ); #endif @@ -39,7 +38,7 @@ bool NmakeMakefileGenerator::writeMakefile( QTextStream &t ) { writeHeader( t ); - if ( !project->variables() [ "QMAKE_FAILED_REQUIREMENTS" ].isEmpty() ) { + if ( !project->values("QMAKE_FAILED_REQUIREMENTS").isEmpty() ) { t << "all clean:" << "\n\t" << "@echo \"Some of the required modules (" << var( "QMAKE_FAILED_REQUIREMENTS" ) << ") are not available.\"" << "\n\t" @@ -72,60 +71,60 @@ init_flag = true; if ( project->first( "TEMPLATE" ) == "app" ) - project->variables()["QMAKE_APP_FLAG"] += "1"; + project->values("QMAKE_APP_FLAG") += "1"; /* this should probably not be here, but I'm using it to wrap the .t files */ if ( project->first( "TEMPLATE" ) == "subdirs" ) { MakefileGenerator::init(); - if ( project->variables() [ "MAKEFILE" ].isEmpty() ) - project->variables() [ "MAKEFILE" ].append( "Makefile" ); - if ( project->variables() [ "QMAKE_QMAKE" ].isEmpty() ) - project->variables() [ "QMAKE_QMAKE" ].append( "qmake" ); + if ( project->values ( "MAKEFILE" ).isEmpty() ) + project->values ( "MAKEFILE" ).append( "Makefile" ); + if ( project->values ( "QMAKE_QMAKE" ).isEmpty() ) + project->values ( "QMAKE_QMAKE" ).append( "qmake" ); return ; } - project->variables() [ "TARGET_PRL" ].append( project->first( "TARGET" ) ); + project->values ( "TARGET_PRL" ).append( project->first( "TARGET" ) ); processVars(); #ifdef MSVC_USE_MSC_VER // otherwise we'll get Compiler errors with MSVC 2003.net and above in some cases switch ( getCurrentMsvcVersion( project->first( "MAKEFILE_GENERATOR" ) ) ) { case 80: - project->variables() [ "DEFINES" ] += "_MSC_VER=1400"; + project->values ( "DEFINES" ) += "_MSC_VER=1400"; break; case 71: - project->variables() [ "DEFINES" ] += "_MSC_VER=1310"; + project->values ( "DEFINES" ) += "_MSC_VER=1310"; break; case 70: default: - project->variables() [ "DEFINES" ] += "_MSC_VER=1300"; + project->values ( "DEFINES" ) += "_MSC_VER=1300"; break; case 60: - project->variables() [ "DEFINES" ] += "_MSC_VER=1200"; + project->values ( "DEFINES" ) += "_MSC_VER=1200"; break; } #endif - if ( !project->variables() [ "RES_FILE" ].isEmpty() ) { - project->variables() [ "QMAKE_LIBS" ] += project->variables() [ "RES_FILE" ]; + if ( !project->values ( "RES_FILE" ).isEmpty() ) { + project->values ( "QMAKE_LIBS" ) += escapeFilePaths(project->values("RES_FILE")); } // LIBS defined in Profile comes first for msvc - project->variables() [ "QMAKE_LIBS" ] += project->variables() [ "LIBS" ]; + project->values ( "QMAKE_LIBS" ) += escapeFilePaths(project->values ( "LIBS" )); - QString targetfilename = project->variables() [ "TARGET" ].first(); + QString targetfilename = project->values ( "TARGET" ).first(); if ( project->isActiveConfig( "dll" ) ) { QString destDir = ""; if ( !project->first( "DESTDIR" ).isEmpty() ) destDir = project->first( "DESTDIR" ) + Option::dir_sep; QString preTarget = destDir + project->first( "TARGET" ) + project->first( "TARGET_VERSION_EXT" ); - project->variables() [ "MSVC_IMPORT_LIB" ] += Option::fixPathToTargetOS( preTarget + ".lib", false, false ); - project->variables() [ "MSVC_EXTRA_LIBS" ] += Option::fixPathToTargetOS( preTarget + ".exp", false, false ); - project->variables() [ "MSVC_EXTRA_LIBS" ] += Option::fixPathToTargetOS( preTarget + ".pdb", false, false ); + project->values ( "MSVC_IMPORT_LIB" ) += Option::fixPathToTargetOS( preTarget + ".lib", false, false ); + project->values ( "MSVC_EXTRA_LIBS" ) += Option::fixPathToTargetOS( preTarget + ".exp", false, false ); + project->values ( "MSVC_EXTRA_LIBS" ) += Option::fixPathToTargetOS( preTarget + ".pdb", false, false ); } - if ( !project->variables() [ "DEF_FILE" ].isEmpty() ) - project->variables() [ "QMAKE_LFLAGS" ].append( QString( "/DEF:" ) + project->first( "DEF_FILE" ) ); + if ( !project->values ( "DEF_FILE" ).isEmpty() ) + project->values ( "QMAKE_LFLAGS" ).append( QString( "/DEF:" ) + project->first( "DEF_FILE" ) ); // Base class init! MakefileGenerator::init(); @@ -138,25 +137,20 @@ precompObj = var( "OBJECTS_DIR" ) + project->first( "TARGET" ) + "_pch" + Option::obj_ext; precompPch = var( "OBJECTS_DIR" ) + project->first( "TARGET" ) + "_pch.pch"; // Add linking of precompObj (required for whole precompiled classes) - project->variables() [ "OBJECTS" ] += precompObj; + project->values ( "OBJECTS" ) += precompObj; // Add pch file to cleanup - project->variables() [ "QMAKE_CLEAN" ] += precompPch; + project->values ( "QMAKE_CLEAN" ) += precompPch; } if ( project->isActiveConfig( "dll" ) ) { - project->variables() [ "QMAKE_CLEAN" ] += project->first( "MSVC_IMPORT_LIB" ); - project->variables() [ "QMAKE_CLEAN" ] += project->variables() [ "MSVC_EXTRA_LIBS" ]; + project->values ( "QMAKE_CLEAN" ) += project->first( "MSVC_IMPORT_LIB" ); + project->values ( "QMAKE_CLEAN" ) += project->values ( "MSVC_EXTRA_LIBS" ); } if ( project->isActiveConfig( "incremental" ) && !project->isActiveConfig( "incremental_off" ) ) - project->variables() [ "QMAKE_LFLAGS" ].append( QString( "/incremental:yes" ) ); + project->values ( "QMAKE_LFLAGS" ).append( QString( "/incremental:yes" ) ); else - project->variables() [ "QMAKE_LFLAGS" ].append( QString( "/incremental:no" ) ); - - // fix QMAKE_LFLAGS and QMAKE_CFLAGS/QMAKE_CXXFLAGS (qmake bug, still there?) - removeDuplicates( project->variables() [ "QMAKE_LFLAGS" ] ); - removeDuplicates( project->variables() [ "QMAKE_CFLAGS" ] ); - removeDuplicates( project->variables() [ "QMAKE_CXXFLAGS" ] ); + project->values ( "QMAKE_LFLAGS" ).append( QString( "/incremental:no" ) ); } void NmakeMakefileGenerator::writeLibDirPart( QTextStream &t ) @@ -175,18 +169,18 @@ QString directories[] = { QString( "MOC_DIR" ), QString( "UI_SOURCES_DIR" ), QString( "UI_DIR" ), QString( "RCC_DIR" ), QString::null }; for ( int y = 0; !directories[ y ].isNull(); y++ ) { QString dirTemp = project->first( directories[ y ] ); - if ( dirTemp.endsWith( "\\" ) ) + if ( dirTemp.endsWith( '\\' ) ) dirTemp.truncate( dirTemp.length() - 1 ); if ( !dirTemp.isEmpty() ) source_directories += dirTemp; } QString srcs[] = { QString( "SOURCES" ), QString( "UICIMPLS" ), QString( "SRCMOC" ), QString::null }; for ( int x = 0; !srcs[ x ].isNull(); x++ ) { - QStringList &l = project->variables() [ srcs[ x ] ]; + QStringList &l = project->values ( srcs[ x ] ); for ( QStringList::Iterator sit = l.begin(); sit != l.end(); ++sit ) { - QString sep = "\\"; + char sep = '\\'; if ( ( *sit ).indexOf( sep ) == -1 ) - sep = "/"; + sep = '/'; QString dir = ( *sit ).section( sep, 0, -2 ); if ( !dir.isEmpty() && !source_directories.contains( dir ) ) source_directories += dir; @@ -196,8 +190,6 @@ // behind all others... if first, you'll get incorrect uic3.exe // because nmake uses wrong main.cpp !? source_directories.removeAll( "." ); - removeDuplicates( source_directories ); - removeDuplicates( Option::cpp_ext ); source_directories += "."; QStringList::const_iterator it; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |