mxe-octave: src/msvc-qt-1.patch annotate

annotate src/msvc-qt-1.patch @ 5534:372ea4c0afb2

Move of-ocs PKG_XXXX to inst dir and add break patch * src/of-ocs-3-break-fixes.patch, src/of-ocs-4-pkgadd-fixes.patch: new files * dist-files.mk: add ref to files

author	John Donoghue <john.donoghue@ieee.org>
date	Sun, 13 Sep 2020 08:15:14 -0400
parents	75c25cc8e6b6
children

rev	line source
3129 d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	1 diff -ur qt-everywhere-opensource-src-4.8.3-orig/mkspecs/win32-msvc2010/qmake.conf qt-everywhere-opensource-src-4.8.3/mkspecs/win32-msvc2010/qmake.conf
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	2 --- qt-everywhere-opensource-src-4.8.3-orig/mkspecs/win32-msvc2010/qmake.conf 2012-09-10 21:36:35 -0400
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	3 +++ qt-everywhere-opensource-src-4.8.3/mkspecs/win32-msvc2010/qmake.conf 2013-07-10 11:31:41 -0400
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	4 @@ -73,6 +73,9 @@
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	5
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	6 QMAKE_LIBS_QT_ENTRY = -lqtmain
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	7
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	8 +QMAKE_DLL_PREFIX = @@LIBRARY_PREFIX@@
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	9 +QMAKE_DLL_SUFFIX = @@LIBRARY_SUFFIX@@
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	10 +
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	11 QMAKE_MOC = $$[QT_INSTALL_BINS]\\moc.exe
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	12 QMAKE_UIC = $$[QT_INSTALL_BINS]\\uic.exe
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	13 QMAKE_IDC = $$[QT_INSTALL_BINS]\\idc.exe
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	14 diff -ur qt-everywhere-opensource-src-4.8.3-orig/qmake/generators/makefile.cpp qt-everywhere-opensource-src-4.8.3/qmake/generators/makefile.cpp
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	15 --- qt-everywhere-opensource-src-4.8.3-orig/qmake/generators/makefile.cpp 2012-09-10 21:36:36 -0400
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	16 +++ qt-everywhere-opensource-src-4.8.3/qmake/generators/makefile.cpp 2013-07-10 11:05:47 -0400
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	17 @@ -3148,16 +3148,20 @@
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	18 MakefileGenerator::pkgConfigPrefix() const
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	19 {
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	20 if(!project->isEmpty("QMAKE_PKGCONFIG_PREFIX"))
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	21 - return project->first("QMAKE_PKGCONFIG_PREFIX");
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	22 - return QLibraryInfo::location(QLibraryInfo::PrefixPath);
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	23 + return project->first("QMAKE_PKGCONFIG_PREFIX").replace('\\', '/');
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	24 + return QLibraryInfo::location(QLibraryInfo::PrefixPath).replace('\\', '/');
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	25 }
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	26
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	27 QString
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	28 -MakefileGenerator::pkgConfigFixPath(QString path) const
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	29 +MakefileGenerator::pkgConfigFixPath(QString path)
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	30 {
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	31 QString prefix = pkgConfigPrefix();
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	32 + path.replace('\\', '/');
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	33 if(path.startsWith(prefix))
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	34 path = path.replace(prefix, "${prefix}");
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	35 + QString buildTree = var("QT_BUILD_TREE").replace('\\', '/');
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	36 + if (!buildTree.isEmpty() && path.startsWith(buildTree))
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	37 + path = path.replace(buildTree, "${prefix}");
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	38 return path;
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	39 }
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	40
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	41 @@ -3273,7 +3277,7 @@
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	42 libs << "QMAKE_LFLAGS_THREAD"; //not sure about this one, but what about things like -pthread?
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	43 t << "Libs.private: ";
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	44 for(QStringList::ConstIterator it = libs.begin(); it != libs.end(); ++it) {
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	45 - t << project->values((*it)).join(" ") << " ";
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	46 + t << project->values((*it)).join(" ").replace('\\', '/').replace(prefix, "${prefix}") << " ";
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	47 }
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	48 t << endl;
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	49
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	50 @@ -3281,9 +3285,9 @@
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	51 // ### too many
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	52 t << "Cflags: "
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	53 // << var("QMAKE_CXXFLAGS") << " "
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	54 - << varGlue("PRL_EXPORT_DEFINES","-D"," -D"," ")
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	55 - << project->values("PRL_EXPORT_CXXFLAGS").join(" ")
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	56 - << project->values("QMAKE_PKGCONFIG_CFLAGS").join(" ")
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	57 + << varGlue("PRL_EXPORT_DEFINES","-D"," -D"," ").replace('\\', '/').replace(prefix, "${prefix}")
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	58 + << project->values("PRL_EXPORT_CXXFLAGS").join(" ").replace('\\', '/').replace(prefix, "${prefix}")
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	59 + << project->values("QMAKE_PKGCONFIG_CFLAGS").join(" ").replace('\\', '/').replace(prefix, "${prefix}")
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	60 // << varGlue("DEFINES","-D"," -D"," ")
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	61 << " -I${includedir}" << endl;
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	62
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	63 diff -ur qt-everywhere-opensource-src-4.8.3-orig/qmake/generators/makefile.h qt-everywhere-opensource-src-4.8.3/qmake/generators/makefile.h
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	64 --- qt-everywhere-opensource-src-4.8.3-orig/qmake/generators/makefile.h 2012-09-10 21:36:36 -0400
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	65 +++ qt-everywhere-opensource-src-4.8.3/qmake/generators/makefile.h 2013-07-10 10:47:08 -0400
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	66 @@ -107,7 +107,7 @@
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	67
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	68 QString pkgConfigPrefix() const;
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	69 QString pkgConfigFileName(bool fixify=true);
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	70 - QString pkgConfigFixPath(QString) const;
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	71 + QString pkgConfigFixPath(QString);
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	72 void writePkgConfigFile(); // for pkg-config
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	73
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	74 //generating subtarget makefiles
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	75 diff -ur qt-everywhere-opensource-src-4.8.3-orig/qmake/generators/win32/msvc_nmake.cpp qt-everywhere-opensource-src-4.8.3/qmake/generators/win32/msvc_nmake.cpp
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	76 --- qt-everywhere-opensource-src-4.8.3-orig/qmake/generators/win32/msvc_nmake.cpp 2012-09-10 21:36:36 -0400
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	77 +++ qt-everywhere-opensource-src-4.8.3/qmake/generators/win32/msvc_nmake.cpp 2013-07-09 22:41:22 -0400
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	78 @@ -72,6 +72,8 @@
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	79 if(project->first("TEMPLATE") == "app" \|\|
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	80 project->first("TEMPLATE") == "lib" \|\|
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	81 project->first("TEMPLATE") == "aux") {
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	82 + if(project->isActiveConfig("create_pc") && project->first("TEMPLATE") == "lib")
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	83 + writePkgConfigFile();
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	84 #if 0
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	85 if(Option::mkfile::do_stub_makefile)
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	86 return MakefileGenerator::writeStubMakefile(t);
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	87 @@ -158,7 +160,7 @@
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	88 // precompiled header
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	89 if(usePCH) {
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	90 QString precompRule = QString("-c -Yc -Fp%1 -Fo%2").arg(precompPch).arg(precompObj);
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	91 - t << precompObj << ": " << precompH << " " << findDependencies(precompH).join(" \\\n\t\t")
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	92 + t << precompObj << ": " << precompH << " " << escapeDependencyPaths(findDependencies(precompH)).join(" \\\n\t\t")
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	93 << "\n\t" << "$(CXX) " + precompRule +" $(CXXFLAGS) $(INCPATH) -TP " << precompH << endl << endl;
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	94 }
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	95 }
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	96 @@ -356,6 +358,9 @@
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	97 if(project->isActiveConfig("staticlib")) {
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	98 t << "\n\t" << "$(LIBAPP) $(LIBFLAGS) /OUT:$(DESTDIR_TARGET) @<<" << "\n\t "
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	99 << "$(OBJECTS)";
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	100 + } else if (project->isActiveConfig("shared") && project->first("TEMPLATE") == "lib") {
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	101 + t << "\n\t" << "$(LINK) $(LFLAGS) /OUT:$(DESTDIR_TARGET) /IMPLIB:$(DESTDIR)" << getLibTarget() << " @<< " << "\n\t "
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	102 + << "$(OBJECTS) $(LIBS)";
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	103 } else {
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	104 t << "\n\t" << "$(LINK) $(LFLAGS) /OUT:$(DESTDIR_TARGET) @<< " << "\n\t "
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	105 << "$(OBJECTS) $(LIBS)";
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	106 diff -ur qt-everywhere-opensource-src-4.8.3-orig/qmake/generators/win32/winmakefile.cpp qt-everywhere-opensource-src-4.8.3/qmake/generators/win32/winmakefile.cpp
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	107 --- qt-everywhere-opensource-src-4.8.3-orig/qmake/generators/win32/winmakefile.cpp 2012-09-10 21:36:36 -0400
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	108 +++ qt-everywhere-opensource-src-4.8.3/qmake/generators/win32/winmakefile.cpp 2013-07-10 09:54:14 -0400
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	109 @@ -373,7 +373,8 @@
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	110 if (!project->values("QMAKE_APP_FLAG").isEmpty()) {
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	111 project->values("TARGET_EXT").append(".exe");
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	112 } else if (project->isActiveConfig("shared")) {
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	113 - project->values("TARGET_EXT").append(project->first("TARGET_VERSION_EXT") + "."
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	114 + project->values("TARGET_EXT").append(project->first("TARGET_VERSION_EXT")
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	115 + + (project->first("TEMPLATE") == "lib" ? var("QMAKE_DLL_SUFFIX") : QString()) + "."
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	116 + project->first("QMAKE_EXTENSION_SHLIB"));
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	117 project->values("TARGET").first() = project->first("QMAKE_PREFIX_SHLIB") + project->first("TARGET");
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	118 } else {
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	119 @@ -421,6 +422,8 @@
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	120 productName = project->values("TARGET").first();
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	121
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	122 QString originalName = project->values("TARGET").first() + project->values("TARGET_EXT").first();
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	123 + if (project->isActiveConfig("shared") && project->first("TEMPLATE") == "lib")
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	124 + originalName.prepend(var("QMAKE_DLL_PREFIX"));
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	125 int rcLang = project->intValue("RC_LANG", 1033); // default: English(USA)
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	126 int rcCodePage = project->intValue("RC_CODEPAGE", 1200); // default: Unicode
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	127
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	128 @@ -690,6 +693,8 @@
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	129 if (!destDir.isEmpty() && (orgDestDir.endsWith('/') \|\| orgDestDir.endsWith(Option::dir_sep)))
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	130 destDir += Option::dir_sep;
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	131 QString target = QString(project->first("TARGET")+project->first("TARGET_EXT"));
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	132 + if (project->isActiveConfig("shared") && project->first("TEMPLATE") == "lib")
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	133 + target.prepend(var("QMAKE_DLL_PREFIX"));
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	134 target.remove("\"");
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	135 project->values("DEST_TARGET").prepend(destDir + target);
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	136
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	137 @@ -860,7 +865,7 @@
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	138 if (!dst_pc_dir.isEmpty()) {
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	139 if (!ret.isEmpty())
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	140 ret += "\n\t";
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	141 - ret += mkdir_p_asstring(dst_pc_dir, true);
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	142 + ret += mkdir_p_asstring(Option::fixPathToTargetOS(dst_pc_dir, false), true);
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	143 }
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	144 if(!ret.isEmpty())
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	145 ret += "\n\t";
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	146 diff -ur qt-everywhere-opensource-src-4.8.3-orig/src/3rdparty/webkit/Source/WebCore/WebCore.pri qt-everywhere-opensource-src-4.8.3/src/3rdparty/webkit/Source/WebCore/WebCore.pri
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	147 --- qt-everywhere-opensource-src-4.8.3-orig/src/3rdparty/webkit/Source/WebCore/WebCore.pri 2013-07-06 20:05:40 -0400
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	148 +++ qt-everywhere-opensource-src-4.8.3/src/3rdparty/webkit/Source/WebCore/WebCore.pri 2013-07-08 20:37:56 -0400
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	149 @@ -329,7 +329,7 @@
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	150 unix:!mac:-g++:QMAKE_LFLAGS += -Wl,--gc-sections
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	151 linux-g++:QMAKE_LFLAGS += $$QMAKE_LFLAGS_NOUNDEF
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	152
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	153 -unix\|win32-g++*:QMAKE_PKGCONFIG_REQUIRES = QtCore QtGui QtNetwork
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	154 +unix\|win32-g++\|win32-msvc:QMAKE_PKGCONFIG_REQUIRES = QtCore QtGui QtNetwork
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	155 unix:!mac:!symbian:CONFIG += link_pkgconfig
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	156
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	157 # Disable C++0x mode in WebCore for those who enabled it in their Qt's mkspec
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	158 diff -ur qt-everywhere-opensource-src-4.8.3-orig/src/3rdparty/zlib_dependency.pri qt-everywhere-opensource-src-4.8.3/src/3rdparty/zlib_dependency.pri
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	159 --- qt-everywhere-opensource-src-4.8.3-orig/src/3rdparty/zlib_dependency.pri 2012-09-10 21:36:50 -0400
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	160 +++ qt-everywhere-opensource-src-4.8.3/src/3rdparty/zlib_dependency.pri 2013-07-06 19:02:53 -0400
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	161 @@ -1,7 +1,7 @@
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	162 # zlib dependency satisfied by bundled 3rd party zlib or system zlib
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	163 contains(QT_CONFIG, system-zlib) {
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	164 symbian: LIBS_PRIVATE += -llibz
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	165 - else:if(unix\|win32-g++*):LIBS_PRIVATE += -lz
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	166 + else:if(unix\|win32-g++\|win32-msvc):LIBS_PRIVATE += -lz
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	167 else: LIBS += zdll.lib
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	168 } else {
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	169 INCLUDEPATH += $$PWD/zlib
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	170 diff -ur qt-everywhere-opensource-src-4.8.3-orig/src/dbus/dbus.pro qt-everywhere-opensource-src-4.8.3/src/dbus/dbus.pro
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	171 --- qt-everywhere-opensource-src-4.8.3-orig/src/dbus/dbus.pro 2012-09-10 21:36:52 -0400
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	172 +++ qt-everywhere-opensource-src-4.8.3/src/dbus/dbus.pro 2013-07-08 20:27:21 -0400
3145 fae248a5b181 Qt: generalize the use of pkg-config to get dbus compilation flags Michael Goffioul <michael.goffioul@gmail.com> parents: 3129 diff changeset	173 @@ -12,7 +12,7 @@
3129 d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	174 }
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	175
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	176 # INCLUDEPATH += .
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	177 -unix\|win32-g++* {
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	178 +unix\|win32-g++\|win32-msvc {
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	179 QMAKE_PKGCONFIG_DESCRIPTION = Qt \
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	180 DBus \
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	181 module
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	182 diff -ur qt-everywhere-opensource-src-4.8.3-orig/src/declarative/declarative.pro qt-everywhere-opensource-src-4.8.3/src/declarative/declarative.pro
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	183 --- qt-everywhere-opensource-src-4.8.3-orig/src/declarative/declarative.pro 2012-09-10 21:36:52 -0400
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	184 +++ qt-everywhere-opensource-src-4.8.3/src/declarative/declarative.pro 2013-07-08 20:28:02 -0400
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	185 @@ -6,7 +6,7 @@
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	186 win32-msvc*\|win32-icc:QMAKE_LFLAGS += /BASE:0x66000000
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	187 solaris-cc*:QMAKE_CXXFLAGS_RELEASE -= -O2
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	188
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	189 -unix\|win32-g++*:QMAKE_PKGCONFIG_REQUIRES = QtCore QtGui
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	190 +unix\|win32-g++\|win32-msvc:QMAKE_PKGCONFIG_REQUIRES = QtCore QtGui
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	191
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	192 exists("qdeclarative_enable_gcov") {
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	193 QMAKE_CXXFLAGS = -fprofile-arcs -ftest-coverage -fno-elide-constructors
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	194 diff -ur qt-everywhere-opensource-src-4.8.3-orig/src/gui/gui.pro qt-everywhere-opensource-src-4.8.3/src/gui/gui.pro
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	195 --- qt-everywhere-opensource-src-4.8.3-orig/src/gui/gui.pro 2012-09-10 21:36:51 -0400
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	196 +++ qt-everywhere-opensource-src-4.8.3/src/gui/gui.pro 2013-07-08 20:29:11 -0400
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	197 @@ -7,7 +7,7 @@
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	198
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	199 !win32:!embedded:!qpa:!mac:!symbian:CONFIG += x11
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	200
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	201 -unix\|win32-g++*:QMAKE_PKGCONFIG_REQUIRES = QtCore
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	202 +unix\|win32-g++\|win32-msvc:QMAKE_PKGCONFIG_REQUIRES = QtCore
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	203
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	204 include(../qbase.pri)
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	205
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	206 diff -ur qt-everywhere-opensource-src-4.8.3-orig/src/gui/image/qjpeghandler.pri qt-everywhere-opensource-src-4.8.3/src/gui/image/qjpeghandler.pri
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	207 --- qt-everywhere-opensource-src-4.8.3-orig/src/gui/image/qjpeghandler.pri 2012-09-10 21:36:51 -0400
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	208 +++ qt-everywhere-opensource-src-4.8.3/src/gui/image/qjpeghandler.pri 2013-07-07 12:02:46 -0400
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	209 @@ -3,7 +3,7 @@
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	210 HEADERS += $$PWD/qjpeghandler_p.h
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	211 SOURCES += $$PWD/qjpeghandler.cpp
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	212 contains(QT_CONFIG, system-jpeg) {
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	213 - if(unix\|win32-g++*): LIBS += -ljpeg
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	214 + if(unix\|win32-g++\|win32-msvc): LIBS += -ljpeg
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	215 else:win32: LIBS += libjpeg.lib
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	216 } else {
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	217 include($$PWD/../../3rdparty/libjpeg.pri)
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	218 diff -ur qt-everywhere-opensource-src-4.8.3-orig/src/gui/image/qmnghandler.pri qt-everywhere-opensource-src-4.8.3/src/gui/image/qmnghandler.pri
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	219 --- qt-everywhere-opensource-src-4.8.3-orig/src/gui/image/qmnghandler.pri 2013-07-06 20:05:40 -0400
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	220 +++ qt-everywhere-opensource-src-4.8.3/src/gui/image/qmnghandler.pri 2013-07-07 12:04:15 -0400
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	221 @@ -5,7 +5,7 @@
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	222 contains(QT_CONFIG, system-mng) {
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	223 CONFIG += link_pkgconfig
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	224 PKGCONFIG += libmng
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	225 - if(unix\|win32-g++):LIBS = -lmng
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	226 + if(unix\|win32-g++\|win32-msvc):LIBS *= -lmng
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	227 else:win32: LIBS += libmng.lib
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	228 } else {
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	229 include($$PWD/../../3rdparty/libmng.pri)
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	230 diff -ur qt-everywhere-opensource-src-4.8.3-orig/src/gui/image/qpnghandler.pri qt-everywhere-opensource-src-4.8.3/src/gui/image/qpnghandler.pri
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	231 --- qt-everywhere-opensource-src-4.8.3-orig/src/gui/image/qpnghandler.pri 2012-09-10 21:36:51 -0400
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	232 +++ qt-everywhere-opensource-src-4.8.3/src/gui/image/qpnghandler.pri 2013-07-06 23:22:58 -0400
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	233 @@ -2,7 +2,7 @@
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	234 HEADERS += $$PWD/qpnghandler_p.h
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	235 SOURCES += $$PWD/qpnghandler.cpp
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	236 contains(QT_CONFIG, system-png) {
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	237 - if(unix\|win32-g++*): LIBS_PRIVATE += -lpng
3300 75c25cc8e6b6 [MSVC] Update FLTK and Qt patches to allow compilation with libpng16. Michael Goffioul <michael.goffioul@gmail.com> parents: 3145 diff changeset	238 + if(unix\|win32-g++\|win32-msvc): LIBS_PRIVATE += -lpng16
3129 d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	239 else:win32: LIBS += libpng.lib
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	240
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	241 } else {
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	242 diff -ur qt-everywhere-opensource-src-4.8.3-orig/src/gui/image/qtiffhandler.pri qt-everywhere-opensource-src-4.8.3/src/gui/image/qtiffhandler.pri
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	243 --- qt-everywhere-opensource-src-4.8.3-orig/src/gui/image/qtiffhandler.pri 2013-07-06 20:05:40 -0400
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	244 +++ qt-everywhere-opensource-src-4.8.3/src/gui/image/qtiffhandler.pri 2013-07-07 12:04:54 -0400
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	245 @@ -5,7 +5,7 @@
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	246 contains(QT_CONFIG, system-tiff) {
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	247 CONFIG += link_pkgconfig
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	248 PKGCONFIG += libtiff-4
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	249 - if(unix\|win32-g++):LIBS = -ltiff
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	250 + if(unix\|win32-g++\|win32-msvc):LIBS *= -ltiff
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	251 else:win32: LIBS += libtiff.lib
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	252 } else {
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	253 include($$PWD/../../3rdparty/libtiff.pri)
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	254 diff -ur qt-everywhere-opensource-src-4.8.3-orig/src/multimedia/multimedia.pro qt-everywhere-opensource-src-4.8.3/src/multimedia/multimedia.pro
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	255 --- qt-everywhere-opensource-src-4.8.3-orig/src/multimedia/multimedia.pro 2012-09-10 21:36:50 -0400
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	256 +++ qt-everywhere-opensource-src-4.8.3/src/multimedia/multimedia.pro 2013-07-08 20:29:46 -0400
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	257 @@ -4,7 +4,7 @@
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	258
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	259 DEFINES += QT_BUILD_MULTIMEDIA_LIB QT_NO_USING_NAMESPACE
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	260
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	261 -unix\|win32-g++*:QMAKE_PKGCONFIG_REQUIRES = QtCore QtGui
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	262 +unix\|win32-g++\|win32-msvc:QMAKE_PKGCONFIG_REQUIRES = QtCore QtGui
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	263
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	264 include(../qbase.pri)
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	265
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	266 diff -ur qt-everywhere-opensource-src-4.8.3-orig/src/network/network.pro qt-everywhere-opensource-src-4.8.3/src/network/network.pro
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	267 --- qt-everywhere-opensource-src-4.8.3-orig/src/network/network.pro 2012-09-10 21:36:51 -0400
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	268 +++ qt-everywhere-opensource-src-4.8.3/src/network/network.pro 2013-07-08 20:30:10 -0400
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	269 @@ -13,7 +13,7 @@
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	270 QT = core
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	271 win32-msvc*\|win32-icc:QMAKE_LFLAGS += /BASE:0x64000000
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	272
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	273 -unix\|win32-g++*:QMAKE_PKGCONFIG_REQUIRES = QtCore
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	274 +unix\|win32-g++\|win32-msvc:QMAKE_PKGCONFIG_REQUIRES = QtCore
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	275
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	276 include(../qbase.pri)
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	277 include(access/access.pri)
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	278 diff -ur qt-everywhere-opensource-src-4.8.3-orig/src/network/ssl/qsslsocket_p.h qt-everywhere-opensource-src-4.8.3/src/network/ssl/qsslsocket_p.h
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	279 --- qt-everywhere-opensource-src-4.8.3-orig/src/network/ssl/qsslsocket_p.h 2012-09-10 21:36:51 -0400
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	280 +++ qt-everywhere-opensource-src-4.8.3/src/network/ssl/qsslsocket_p.h 2013-07-06 19:04:03 -0400
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	281 @@ -75,6 +75,7 @@
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	282 typedef OSStatus (PtrSecTrustCopyAnchorCertificates)(CFArrayRef);
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	283 #endif
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	284 #elif defined(Q_OS_WIN)
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	285 +#define WIN32_LEAN_AND_MEAN
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	286 #include <windows.h>
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	287 #include <wincrypt.h>
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	288 #ifndef HCRYPTPROV_LEGACY
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	289 diff -ur qt-everywhere-opensource-src-4.8.3-orig/src/opengl/opengl.pro qt-everywhere-opensource-src-4.8.3/src/opengl/opengl.pro
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	290 --- qt-everywhere-opensource-src-4.8.3-orig/src/opengl/opengl.pro 2012-09-10 21:36:52 -0400
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	291 +++ qt-everywhere-opensource-src-4.8.3/src/opengl/opengl.pro 2013-07-08 20:30:47 -0400
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	292 @@ -7,7 +7,7 @@
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	293 solaris-cc*:QMAKE_CXXFLAGS_RELEASE -= -O2
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	294 irix-cc*:QMAKE_CXXFLAGS += -no_prelink -ptused
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	295
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	296 -unix\|win32-g++*:QMAKE_PKGCONFIG_REQUIRES = QtCore QtGui
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	297 +unix\|win32-g++\|win32-msvc:QMAKE_PKGCONFIG_REQUIRES = QtCore QtGui
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	298
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	299 include(../qbase.pri)
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	300
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	301 diff -ur qt-everywhere-opensource-src-4.8.3-orig/src/openvg/openvg.pro qt-everywhere-opensource-src-4.8.3/src/openvg/openvg.pro
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	302 --- qt-everywhere-opensource-src-4.8.3-orig/src/openvg/openvg.pro 2012-09-10 21:36:50 -0400
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	303 +++ qt-everywhere-opensource-src-4.8.3/src/openvg/openvg.pro 2013-07-08 20:31:31 -0400
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	304 @@ -49,7 +49,7 @@
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	305
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	306 include(../qbase.pri)
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	307
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	308 -unix\|win32-g++*:QMAKE_PKGCONFIG_REQUIRES = QtCore QtGui
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	309 +unix\|win32-g++\|win32-msvc:QMAKE_PKGCONFIG_REQUIRES = QtCore QtGui
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	310 symbian:TARGET.UID3 = 0x2001E62F
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	311
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	312 !isEmpty(QMAKE_INCDIR_OPENVG): INCLUDEPATH += $$QMAKE_INCDIR_OPENVG
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	313 diff -ur qt-everywhere-opensource-src-4.8.3-orig/src/phonon/phonon.pro qt-everywhere-opensource-src-4.8.3/src/phonon/phonon.pro
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	314 --- qt-everywhere-opensource-src-4.8.3-orig/src/phonon/phonon.pro 2012-09-10 21:36:50 -0400
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	315 +++ qt-everywhere-opensource-src-4.8.3/src/phonon/phonon.pro 2013-07-08 20:31:37 -0400
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	316 @@ -11,7 +11,7 @@
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	317
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	318 PHONON_DIR = $$QT_SOURCE_TREE/src/3rdparty/phonon/phonon
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	319
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	320 -unix\|win32-g++*:QMAKE_PKGCONFIG_REQUIRES = QtCore QtGui QtNetwork
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	321 +unix\|win32-g++\|win32-msvc:QMAKE_PKGCONFIG_REQUIRES = QtCore QtGui QtNetwork
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	322
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	323 # Input
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	324 HEADERS += $$PHONON_DIR/abstractaudiooutput.h \
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	325 diff -ur qt-everywhere-opensource-src-4.8.3-orig/src/qbase.pri qt-everywhere-opensource-src-4.8.3/src/qbase.pri
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	326 --- qt-everywhere-opensource-src-4.8.3-orig/src/qbase.pri 2012-09-10 21:36:44 -0400
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	327 +++ qt-everywhere-opensource-src-4.8.3/src/qbase.pri 2013-07-08 18:58:07 -0400
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	328 @@ -135,7 +135,7 @@
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	329 #install directives
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	330 include(qt_install.pri)
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	331
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	332 -unix\|win32-g++*:!symbian {
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	333 +unix\|win32-g++\|win32-msvc:!symbian {
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	334 CONFIG += create_pc
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	335 QMAKE_PKGCONFIG_LIBDIR = $$[QT_INSTALL_LIBS]
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	336 QMAKE_PKGCONFIG_INCDIR = $$[QT_INSTALL_HEADERS]/$$TARGET
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	337 diff -ur qt-everywhere-opensource-src-4.8.3-orig/src/qt3support/qt3support.pro qt-everywhere-opensource-src-4.8.3/src/qt3support/qt3support.pro
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	338 --- qt-everywhere-opensource-src-4.8.3-orig/src/qt3support/qt3support.pro 2012-09-10 21:36:52 -0400
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	339 +++ qt-everywhere-opensource-src-4.8.3/src/qt3support/qt3support.pro 2013-07-08 20:32:28 -0400
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	340 @@ -21,7 +21,7 @@
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	341 include(network/network.pri)
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	342 include(painting/painting.pri)
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	343
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	344 -unix\|win32-g++* {
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	345 +unix\|win32-g++\|win32-msvc {
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	346 QMAKE_PKGCONFIG_CFLAGS += -DQT3_SUPPORT
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	347 QMAKE_PKGCONFIG_REQUIRES = QtCore QtGui QtNetwork QtSql
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	348 }
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	349 diff -ur qt-everywhere-opensource-src-4.8.3-orig/src/script/script.pro qt-everywhere-opensource-src-4.8.3/src/script/script.pro
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	350 --- qt-everywhere-opensource-src-4.8.3-orig/src/script/script.pro 2012-09-10 21:36:52 -0400
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	351 +++ qt-everywhere-opensource-src-4.8.3/src/script/script.pro 2013-07-08 20:33:15 -0400
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	352 @@ -7,7 +7,7 @@
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	353 DEFINES += QLALR_NO_QSCRIPTGRAMMAR_DEBUG_INFO
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	354 #win32-msvc*\|win32-icc:QMAKE_LFLAGS += /BASE:0x66000000 ### FIXME
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	355
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	356 -unix\|win32-g++*:QMAKE_PKGCONFIG_REQUIRES = QtCore
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	357 +unix\|win32-g++\|win32-msvc:QMAKE_PKGCONFIG_REQUIRES = QtCore
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	358
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	359 include(../qbase.pri)
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	360
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	361 diff -ur qt-everywhere-opensource-src-4.8.3-orig/src/scripttools/scripttools.pro qt-everywhere-opensource-src-4.8.3/src/scripttools/scripttools.pro
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	362 --- qt-everywhere-opensource-src-4.8.3-orig/src/scripttools/scripttools.pro 2012-09-10 21:36:50 -0400
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	363 +++ qt-everywhere-opensource-src-4.8.3/src/scripttools/scripttools.pro 2013-07-08 20:33:23 -0400
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	364 @@ -5,7 +5,7 @@
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	365 DEFINES += QT_NO_USING_NAMESPACE
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	366 #win32-msvc*\|win32-icc:QMAKE_LFLAGS += /BASE:0x66000000
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	367
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	368 -unix\|win32-g++*:QMAKE_PKGCONFIG_REQUIRES = QtCore QtGui QtScript
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	369 +unix\|win32-g++\|win32-msvc:QMAKE_PKGCONFIG_REQUIRES = QtCore QtGui QtScript
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	370
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	371 include(../qbase.pri)
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	372
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	373 diff -ur qt-everywhere-opensource-src-4.8.3-orig/src/sql/sql.pro qt-everywhere-opensource-src-4.8.3/src/sql/sql.pro
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	374 --- qt-everywhere-opensource-src-4.8.3-orig/src/sql/sql.pro 2012-09-10 21:36:44 -0400
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	375 +++ qt-everywhere-opensource-src-4.8.3/src/sql/sql.pro 2013-07-08 20:34:34 -0400
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	376 @@ -5,7 +5,7 @@
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	377 DEFINES += QT_NO_USING_NAMESPACE
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	378 win32-msvc*\|win32-icc:QMAKE_LFLAGS += /BASE:0x62000000
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	379
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	380 -unix\|win32-g++*:QMAKE_PKGCONFIG_REQUIRES = QtCore
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	381 +unix\|win32-g++\|win32-msvc:QMAKE_PKGCONFIG_REQUIRES = QtCore
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	382
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	383 include(../qbase.pri)
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	384
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	385 diff -ur qt-everywhere-opensource-src-4.8.3-orig/src/svg/svg.pro qt-everywhere-opensource-src-4.8.3/src/svg/svg.pro
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	386 --- qt-everywhere-opensource-src-4.8.3-orig/src/svg/svg.pro 2012-09-10 21:36:50 -0400
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	387 +++ qt-everywhere-opensource-src-4.8.3/src/svg/svg.pro 2013-07-08 20:34:58 -0400
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	388 @@ -6,7 +6,7 @@
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	389 win32-msvc*\|win32-icc:QMAKE_LFLAGS += /BASE:0x66000000
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	390 solaris-cc*:QMAKE_CXXFLAGS_RELEASE -= -O2
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	391
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	392 -unix\|win32-g++*:QMAKE_PKGCONFIG_REQUIRES = QtCore QtGui
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	393 +unix\|win32-g++\|win32-msvc:QMAKE_PKGCONFIG_REQUIRES = QtCore QtGui
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	394
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	395 include(../qbase.pri)
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	396
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	397 diff -ur qt-everywhere-opensource-src-4.8.3-orig/src/tools/bootstrap/bootstrap.pri qt-everywhere-opensource-src-4.8.3/src/tools/bootstrap/bootstrap.pri
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	398 --- qt-everywhere-opensource-src-4.8.3-orig/src/tools/bootstrap/bootstrap.pri 2012-09-10 21:36:52 -0400
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	399 +++ qt-everywhere-opensource-src-4.8.3/src/tools/bootstrap/bootstrap.pri 2013-07-06 19:03:11 -0400
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	400 @@ -55,7 +55,7 @@
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	401 }
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	402 !contains(QT_CONFIG, zlib):!contains(QT_CONFIG, no-zlib):!cross_compile {
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	403 symbian:LIBS_PRIVATE += -llibz
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	404 - else:if(unix\|win32-g++*):LIBS_PRIVATE += -lz
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	405 + else:if(unix\|win32-g++\|win32-msvc):LIBS_PRIVATE += -lz
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	406 else:LIBS += zdll.lib
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	407 }
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	408 win32:LIBS += -luser32
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	409 diff -ur qt-everywhere-opensource-src-4.8.3-orig/src/xml/xml.pro qt-everywhere-opensource-src-4.8.3/src/xml/xml.pro
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	410 --- qt-everywhere-opensource-src-4.8.3-orig/src/xml/xml.pro 2012-09-10 21:36:50 -0400
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	411 +++ qt-everywhere-opensource-src-4.8.3/src/xml/xml.pro 2013-07-08 20:36:31 -0400
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	412 @@ -4,7 +4,7 @@
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	413 DEFINES += QT_BUILD_XML_LIB QT_NO_USING_NAMESPACE
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	414 win32-msvc*\|win32-icc:QMAKE_LFLAGS += /BASE:0x61000000
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	415
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	416 -unix\|win32-g++*:QMAKE_PKGCONFIG_REQUIRES = QtCore
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	417 +unix\|win32-g++\|win32-msvc:QMAKE_PKGCONFIG_REQUIRES = QtCore
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	418
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	419 include(../qbase.pri)
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	420
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	421 diff -ur qt-everywhere-opensource-src-4.8.3-orig/src/xmlpatterns/xmlpatterns.pro qt-everywhere-opensource-src-4.8.3/src/xmlpatterns/xmlpatterns.pro
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	422 --- qt-everywhere-opensource-src-4.8.3-orig/src/xmlpatterns/xmlpatterns.pro 2012-09-10 21:36:50 -0400
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	423 +++ qt-everywhere-opensource-src-4.8.3/src/xmlpatterns/xmlpatterns.pro 2013-07-08 20:36:38 -0400
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	424 @@ -5,7 +5,7 @@
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	425 DEFINES += QT_BUILD_XMLPATTERNS_LIB \
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	426 QT_NO_USING_NAMESPACE
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	427 win32-msvc*\|win32-icc:QMAKE_LFLAGS += /BASE:0x61000000
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	428 -unix\|win32-g++*:QMAKE_PKGCONFIG_REQUIRES = QtCore \
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	429 +unix\|win32-g++\|win32-msvc:QMAKE_PKGCONFIG_REQUIRES = QtCore \
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	430 QtNetwork
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	431 include(../qbase.pri)
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	432 PRECOMPILED_HEADER = ../corelib/global/qt_pch.h
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	433 diff -ur qt-everywhere-opensource-src-4.8.3-orig/tools/assistant/lib/fulltextsearch/fulltextsearch.pro qt-everywhere-opensource-src-4.8.3/tools/assistant/lib/fulltextsearch/fulltextsearch.pro
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	434 --- qt-everywhere-opensource-src-4.8.3-orig/tools/assistant/lib/fulltextsearch/fulltextsearch.pro 2012-09-10 21:36:54 -0400
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	435 +++ qt-everywhere-opensource-src-4.8.3/tools/assistant/lib/fulltextsearch/fulltextsearch.pro 2013-07-08 20:47:43 -0400
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	436 @@ -23,7 +23,7 @@
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	437 linux-g++:DEFINES += _GLIBCXX_EXTERN_TEMPLATE=0
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	438 }
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	439
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	440 -unix\|win32-g++*:QMAKE_PKGCONFIG_REQUIRES = QtCore
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	441 +unix\|win32-g++\|win32-msvc:QMAKE_PKGCONFIG_REQUIRES = QtCore
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	442
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	443 # impossible to disable exceptions in clucene atm
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	444 CONFIG(exceptions_off) {
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	445 diff -ur qt-everywhere-opensource-src-4.8.3-orig/tools/assistant/lib/lib.pro qt-everywhere-opensource-src-4.8.3/tools/assistant/lib/lib.pro
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	446 --- qt-everywhere-opensource-src-4.8.3-orig/tools/assistant/lib/lib.pro 2012-09-10 21:36:54 -0400
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	447 +++ qt-everywhere-opensource-src-4.8.3/tools/assistant/lib/lib.pro 2013-07-08 20:44:40 -0400
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	448 @@ -18,7 +18,7 @@
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	449 win32:qclucene = $${qclucene}d
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	450 }
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	451 linux-lsb-g++:LIBS_PRIVATE += --lsb-shared-libs=$$qclucene
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	452 -unix\|win32-g++*:QMAKE_PKGCONFIG_REQUIRES += QtNetwork \
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	453 +unix\|win32-g++\|win32-msvc:QMAKE_PKGCONFIG_REQUIRES += QtNetwork \
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	454 QtSql \
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	455 QtXml
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	456 LIBS_PRIVATE += -l$$qclucene
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	457 diff -ur qt-everywhere-opensource-src-4.8.3-orig/tools/designer/src/components/lib/lib.pro qt-everywhere-opensource-src-4.8.3/tools/designer/src/components/lib/lib.pro
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	458 --- qt-everywhere-opensource-src-4.8.3-orig/tools/designer/src/components/lib/lib.pro 2012-09-10 21:36:54 -0400
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	459 +++ qt-everywhere-opensource-src-4.8.3/tools/designer/src/components/lib/lib.pro 2013-07-08 20:42:01 -0400
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	460 @@ -64,7 +64,7 @@
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	461 include(../../sharedcomponents.pri)
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	462 include(../component.pri)
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	463
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	464 -unix\|win32-g++* {
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	465 +unix\|win32-g++\|win32-msvc {
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	466 QMAKE_PKGCONFIG_REQUIRES = QtCore QtDesigner QtGui QtXml
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	467 contains(QT_CONFIG, script): QMAKE_PKGCONFIG_REQUIRES += QtScript
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	468 }
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	469 diff -ur qt-everywhere-opensource-src-4.8.3-orig/tools/designer/src/lib/lib.pro qt-everywhere-opensource-src-4.8.3/tools/designer/src/lib/lib.pro
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	470 --- qt-everywhere-opensource-src-4.8.3-orig/tools/designer/src/lib/lib.pro 2012-09-10 21:36:54 -0400
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	471 +++ qt-everywhere-opensource-src-4.8.3/tools/designer/src/lib/lib.pro 2013-07-08 20:41:16 -0400
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	472 @@ -13,7 +13,7 @@
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	473 VERSION=$${QT_MAJOR_VERSION}.$${QT_MINOR_VERSION}.$${QT_PATCH_VERSION}
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	474 }
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	475
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	476 -unix\|win32-g++*:QMAKE_PKGCONFIG_REQUIRES += QtXml
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	477 +unix\|win32-g++\|win32-msvc:QMAKE_PKGCONFIG_REQUIRES += QtXml
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	478
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	479 include(../../../../src/qt_targets.pri)
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	480 QMAKE_TARGET_PRODUCT = Designer
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	481 diff -ur qt-everywhere-opensource-src-4.8.3-orig/tools/designer/src/uitools/uitools.pro qt-everywhere-opensource-src-4.8.3/tools/designer/src/uitools/uitools.pro
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	482 --- qt-everywhere-opensource-src-4.8.3-orig/tools/designer/src/uitools/uitools.pro 2012-09-10 21:36:54 -0400
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	483 +++ qt-everywhere-opensource-src-4.8.3/tools/designer/src/uitools/uitools.pro 2013-07-08 20:51:10 -0400
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	484 @@ -35,7 +35,7 @@
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	485 target.path=$$[QT_INSTALL_LIBS]
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	486 INSTALLS += target
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	487
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	488 -unix\|win32-g++* {
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	489 +unix\|win32-g++\|win32-msvc {
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	490 CONFIG += create_pc
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	491 QMAKE_PKGCONFIG_LIBDIR = $$[QT_INSTALL_LIBS]
d24828818d36 [MSVC] enable Qt compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	492 QMAKE_PKGCONFIG_INCDIR = $$[QT_INSTALL_HEADERS]/$$TARGET

Mercurial > mxe-octave

annotate src/msvc-qt-1.patch @ 5534:372ea4c0afb2